ouczbs/anki-sync-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed bug in 'find_cards'.

Browse Source 
* Seperated CSS and HTML on the cards.
This commit is contained in:
David Snopek 2013-07-26 14:09:25 +01:00
parent dbed1ef303
commit 0798415076
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AnkiServer/apps/rest_app.py
View File

@ -390,9 +390,9 @@ class CollectionHandler(RestHandlerBase):
ids = col.findCards(query)
if req.data.get('preload', False):
cards = [CardHandler._serialize(col.getCard(id), req.data) for id in req.ids]
cards = [CardHandler._serialize(col.getCard(id), req.data) for id in ids]
else:
cards = [{'id': id} for id in req.ids]
cards = [{'id': id} for id in ids]
return cards
@ -645,8 +645,9 @@ class CardHandler(RestHandlerBase):
d = {
'id': card.id,
'isEmpty': card.isEmpty(),
'question': card.q(),
'answer': card.a(),
'css': card.css(),
'question': card._getQA()['q'],
'answer': card._getQA()['a'],
'did': card.did,
'due': card.due,
'factor': card.factor,

5
tests/test_rest_app.py
View File

@ -316,8 +316,9 @@ class CollectionHandlerTest(CollectionTestBase):
ret = self.execute('next_card', {})
self.assertEqual(ret['id'], card_id)
self.assertEqual(ret['nid'], note_id)
self.assertEqual(ret['question'], '<style>.card {\n font-family: arial;\n font-size: 20px;\n text-align: center;\n color: black;\n background-color: white;\n}\n</style>The front')
self.assertEqual(ret['answer'], '<style>.card {\n font-family: arial;\n font-size: 20px;\n text-align: center;\n color: black;\n background-color: white;\n}\n</style>The front\n\n<hr id=answer>\n\nThe back')
self.assertEqual(ret['css'], '<style>.card {\n font-family: arial;\n font-size: 20px;\n text-align: center;\n color: black;\n background-color: white;\n}\n</style>')
self.assertEqual(ret['question'], 'The front')
self.assertEqual(ret['answer'], 'The front\n\n<hr id=answer>\n\nThe back')
self.assertEqual(ret['answer_buttons'], [
{'ease': 1,
'label': 'Again',