From 0efa20309550935cd2c1f669e57fa56e045d5a06 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sat, 31 Mar 2018 14:40:01 -0700 Subject: [PATCH] cleanup --- AnkiConnect.py | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/AnkiConnect.py b/AnkiConnect.py index f0ac191..5699e22 100644 --- a/AnkiConnect.py +++ b/AnkiConnect.py @@ -117,7 +117,6 @@ def verifyStringList(strings): return True - # # AjaxRequest # @@ -337,7 +336,8 @@ class AnkiNoteParams: type(self.fields) == dict and verifyStringList(list(self.fields.keys())) and verifyStringList(list(self.fields.values())) and type(self.tags) == list and verifyStringList(self.tags) ) - + + def __str__(self): return 'DeckName: ' + self.deckName + '. ModelName: ' + self.modelName + '. Fields: ' + str(self.fields) + '. Tags: ' + str(self.tags) + '.' @@ -437,6 +437,7 @@ class AnkiBridge: elif duplicateOrEmpty == False: return note + def updateNoteFields(self, params): collection = self.collection() if collection is None: @@ -450,6 +451,7 @@ class AnkiBridge: note[name] = value note.flush() + def addTags(self, notes, tags, add=True): self.startEditing() self.collection().tags.bulkAdd(notes, tags, add) @@ -479,6 +481,7 @@ class AnkiBridge: return False + def isSuspended(self, card): card = self.collection().getCard(card) if card.queue == -1: @@ -486,6 +489,7 @@ class AnkiBridge: else: return False + def areSuspended(self, cards): suspended = [] for card in cards: @@ -725,6 +729,7 @@ class AnkiBridge: else: return [] + def cardsInfo(self,cards): result = [] for cid in cards: @@ -737,7 +742,7 @@ class AnkiBridge: order = info['ord'] name = info['name'] fields[name] = {'value': note.fields[order], 'order': order} - + result.append({ 'cardId': card.id, 'fields': fields, @@ -747,8 +752,8 @@ class AnkiBridge: 'modelName': model['name'], 'deckName': self.deckNameFromId(card.did), 'css': model['css'], - 'factor': card.factor, - #This factor is 10 times the ease percentage, + 'factor': card.factor, + #This factor is 10 times the ease percentage, # so an ease of 310% would be reported as 3100 'interval': card.ivl, 'note': card.nid @@ -762,6 +767,7 @@ class AnkiBridge: return result + def notesInfo(self,notes): result = [] for nid in notes: @@ -774,7 +780,7 @@ class AnkiBridge: order = info['ord'] name = info['name'] fields[name] = {'value': note.fields[order], 'order': order} - + result.append({ 'noteId': note.id, 'tags' : note.tags, @@ -813,6 +819,7 @@ class AnkiBridge: return deckId + def changeDeck(self, cards, deck): self.startEditing() @@ -906,6 +913,7 @@ class AnkiBridge: else: return False + def guiShowQuestion(self): if self.guiReviewActive(): self.reviewer()._showQuestion() @@ -959,6 +967,7 @@ class AnkiBridge: else: return False + def guiExitAnki(self): timer = QTimer() def exitAnki(): @@ -967,9 +976,11 @@ class AnkiBridge: timer.timeout.connect(exitAnki) timer.start(1000) # 1s should be enough to allow the response to be sent. + def sync(self): self.window().onSync() + # # AnkiConnect # @@ -1134,10 +1145,12 @@ class AnkiConnect: return results + @webApi() def updateNoteFields(self, note): return self.anki.updateNoteFields(note) + @webApi() def canAddNotes(self, notes): results = [] @@ -1230,10 +1243,12 @@ class AnkiConnect: def getDecks(self, cards): return self.anki.getDecks(cards) + @webApi() def createDeck(self, deck): return self.anki.createDeck(deck) + @webApi() def changeDeck(self, cards, deck): return self.anki.changeDeck(cards, deck) @@ -1303,14 +1318,17 @@ class AnkiConnect: def guiExitAnki(self): return self.anki.guiExitAnki() + @webApi() def cardsInfo(self, cards): return self.anki.cardsInfo(cards) + @webApi() def notesInfo(self, notes): return self.anki.notesInfo(notes) + @webApi() def sync(self): return self.anki.sync()