gadict: comparison py/gadict_srs

equal deleted inserted replaced

-:f1c74335f4ba
+:5fc9bc68fb9c
 import sys
 import tempfile
 import shutil
 import signal
 import regex
+import hashlib
+import anki
+from anki.exporting import AnkiPackageExporter
 import gadict
 import gadict_freq
 if FONAME is None:
 raise Exception("Output file name is not passed...")
 # Looks like anki libs change working directory to media directory of current deck
 # Therefore absolute path should be stored before creating temporary deck
 FONAME = os.path.abspath(FONAME)
-TMPDIR = tempfile.mkdtemp(dir = os.path.dirname(FONAME))
+TMPDIR = tempfile.mkdtemp(dir=os.path.dirname(FONAME))
 if not NAME:
 NAME, _ = os.path.splitext(os.path.basename(FINAME))
 if FDELNAME:
 FDEL = io.open(FDELNAME, mode='r', buffering=1, encoding="utf-8")
 else:
 FDEL = None
-import hashlib
+################################################################
-import anki
-from anki.exporting import AnkiPackageExporter
 MODEL_CSS = """
 .card {
 font-family: arial;
 font-size: 20px;
 self.collection = collection = anki.Collection(os.path.join(self.tmpdir, 'collection.anki2'))
 deck_id = collection.decks.id(self.name)
 # It is essential to keep model['id'] unchanged between upgrades!!
-MODEL_ID = int(hashlib.sha1(self.name).hexdigest(), 16) % (2**63)
+model_id = int(hashlib.sha1(self.name).hexdigest(), 16) % (2**63)
 ################################################################
 # Regular card model. SafeBack doesn't include examples to not spoil
 # word spelling.
 model = collection.models.new(self.name + "_frontback")
 collection.models.addTemplate(model, tmpl)
 # Equivalent of ``collection.models.add(model)`` without setting
 # auto-generated ID.
 # Increment +1 is for keeping model['id'] unique from previous v0.9 release.
-model['id'] = MODEL_ID + 1
+model['id'] = model_id + 1
 collection.models.update(model)
 collection.models.save(model)
 self.model = model
 # collection.models.setCurrent(model)
 tmpl = collection.models.newTemplate('V3alt -> Back')
 tmpl['qfmt'] = question + '<div class="front">{{V3alt}}</div>'
 tmpl['afmt'] = '{{FrontSide}}<hr id=answer><div class="back">{{Front}}</div><div class="freq">{{Freq}}</div><div class="back">{{Back}}</div>'
 collection.models.addTemplate(model, tmpl)
-model['id'] = MODEL_ID + 2          # Keep model['id'] unique.
+model['id'] = model_id + 2          # Keep model['id'] unique.
 collection.models.update(model)
 collection.models.save(model)
 self.model_irr = model
 ################################################################
 tmpl = collection.models.newTemplate('Plural -> Back')
 tmpl['qfmt'] = question + '<div class="front">{{Plural}}</div>'
 tmpl['afmt'] = '{{FrontSide}}<hr id=answer><div class="back">{{Front}}</div><div class="freq">{{Freq}}</div><div class="back">{{Back}}</div>'
 collection.models.addTemplate(model, tmpl)
-model['id'] = MODEL_ID + 3          # Keep model['id'] unique.
+model['id'] = model_id + 3          # Keep model['id'] unique.
 collection.models.update(model)
 collection.models.save(model)
 self.model_pl = model
 :nodetype  used to generate different notes from same headword
 """
 h = hashlib.md5(":".join((self.name, nodetype, headword)))
 return h.hexdigest()
-def add_note(self, headword, front, back, safeback, freq, tags = None):
+def add_note(self, headword, front, back, safeback, freq, tags=None):
 note = anki.notes.Note(self.collection, self.model)
 note['Front'] = front
 note['Back'] = back
 note['SafeBack'] = safeback
 note['Freq'] = freq
 note_add_tags(note, tags)
 note.guid = self.guid("front/back", headword)
 self.collection.addNote(note)
-def add_note_irr(self, headword, v1, v2, v2alt, v3, v3alt, front, back, freq, tags = None):
+def add_note_irr(self, headword, v1, v2, v2alt, v3, v3alt, front, back, freq, tags=None):
 note = anki.notes.Note(self.collection, self.model_irr)
 note['V1'] = v1
 note['V2'] = v2
 note['V3'] = v3
 note['V2alt'] = v2alt
 note['Freq'] = freq
 note_add_tags(note, tags)
 note.guid = self.guid("irregular verb", headword)
 self.collection.addNote(note)
-def add_note_pl(self, headword, singular, plural, front, back, freq, tags = None):
+def add_note_pl(self, headword, singular, plural, front, back, freq, tags=None):
 note = anki.notes.Note(self.collection, self.model_pl)
 note['Singular'] = singular
 note['Plural'] = plural
 note['Front'] = front
 note['Back'] = back
 export.exportInto(fname)
 def close(self):
 self.collection.close()
-def write_sense(buf, sense, with_examples = True):
+def write_sense(buf, sense, with_examples=True):
 buf.append("<div class='sense'>")
 if sense.pos:
 buf.append("<span class='pos'>")
 buf.append(sense.pos)
 buf.append("</span>")
 buf.append(tr)
 buf.append("</span>")
 buf.append("</div>")
 try:
-builder = AnkiDbBuilder(TMPDIR, NAME)
+BUILDER = AnkiDbBuilder(TMPDIR, NAME)
 for identity in FDEL or []:
 identity = identity.strip()
 warnmsg = "<div class='del'>Please delete this note ({})</div>".format(identity)
-builder.add_note(identity, warnmsg, warnmsg, warnmsg, "del")
+BUILDER.add_note(identity, warnmsg, warnmsg, warnmsg, "del")
-builder.add_note_irr(identity, warnmsg, warnmsg, warnmsg, warnmsg, warnmsg, warnmsg, warnmsg, "del")
+BUILDER.add_note_irr(identity, warnmsg, warnmsg, warnmsg, warnmsg, warnmsg, warnmsg, warnmsg, "del")
-builder.add_note_pl(identity, warnmsg, warnmsg, warnmsg, warnmsg, "del")
+BUILDER.add_note_pl(identity, warnmsg, warnmsg, warnmsg, warnmsg, "del")
 for (headwords, translations) in DOM[1:]:
 identity = headwords[0].headword
 if 'rare' in headwords[0].attrs:
 continue
 plural = (hw.headword, hw.pron)
 buf.append("</div>")
 direct_from = "".join(buf)
 buf = []
 for sense in translations:
-write_sense(buf, sense, with_examples = True)
+write_sense(buf, sense, with_examples=True)
 direct_to = "".join(buf)
 buf = []
 for sense in translations:
-write_sense(buf, sense, with_examples = False)
+write_sense(buf, sense, with_examples=False)
 reverse_from = "".join(buf)         # without examples!!
-builder.add_note(identity, direct_from, direct_to, reverse_from, freqmsg, freqtags)
+BUILDER.add_note(identity, direct_from, direct_to, reverse_from, freqmsg, freqtags)
 if v1 and v2 and v3 and RICH_MODE:
 riddle1 = u"<span class='headword'>{}</span> <span class='pron'>[{}]</span> <span class='attrs'>v1</span>".format(v1[0], v1[1])
 riddle2 = u"<span class='headword'>{}</span> <span class='pron'>[{}]</span> <span class='attrs'>v2</span>".format(v2[0], v2[1])
 riddle3 = u"<span class='headword'>{}</span> <span class='pron'>[{}]</span> <span class='attrs'>v3</span>".format(v3[0], v3[1])
 if v2alt:
 riddle2alt = u"<span class='headword'>{}</span> <span class='pron'>[{}]</span> <span class='attrs'>v2</span>".format(v2alt[0], v2alt[1])
 else:
-riddle2alt = ""
+riddle2alt = u""
 if v3alt:
 riddle3alt = u"<span class='headword'>{}</span> <span class='pron'>[{}]</span> <span class='attrs'>v2</span>".format(v3alt[0], v3alt[1])
 else:
-riddle3alt = ""
+riddle3alt = u""
-builder.add_note_irr(identity, riddle1, riddle2, riddle2alt, riddle3, riddle3alt, direct_from, direct_to, freqmsg)
+BUILDER.add_note_irr(identity, riddle1, riddle2, riddle2alt, riddle3, riddle3alt, direct_from, direct_to, freqmsg)
 if singular and plural and RICH_MODE:
 riddle_s = u"<span class='headword'>{}</span> <span class='pron'>[{}]</span> <span class='attrs'>s</span>".format(singular[0], singular[1])
 riddle_pl = u"<span class='headword'>{}</span> <span class='pron'>[{}]</span> <span class='attrs'>pl</span>".format(plural[0], plural[1])
-builder.add_note_pl(identity, riddle_s, riddle_pl, direct_from, direct_to, freqmsg)
+BUILDER.add_note_pl(identity, riddle_s, riddle_pl, direct_from, direct_to, freqmsg)
-builder.export(FONAME)
+BUILDER.export(FONAME)
 finally:
-builder.close()
+BUILDER.close()
 shutil.rmtree(TMPDIR, ignore_errors=True)

changeset 698	5fc9bc68fb9c
parent 697	f1c74335f4ba
child 699	38ff2e2ffd5c