Udpate travis and setup.py to support python version 3.3and up. Updat…

…e tests and parsers so that multi question are handled correctly

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"

exampleOrgFiles/flatTopics.org

@@ -0,0 +1,15 @@
+# This will result in only a single deck being produced
+# The topics (e.g => Capital cities) is added to the top of each question in the finished card
+#fileType = flatTopics
+
+* Capital cites
+** What is the capital of Ireland
+*** Dublin
+* Languages of countries
+** What are the main languages in Ireland
+*** English
+*** Irish
+* Definitions of words
+#type=Basic (and reversed card)
+** Definition of a box
+*** A container with a flat base and sides, typically square or rectangular and having a lid.

org_to_anki/ankiConnectWrapper/AnkiConnector.py

@@ -87,6 +87,7 @@ def _buildNote(self, ankiQuestion: AnkiQuestion):
         else:
             deckName = self._getFullDeckPath(ankiQuestion.deckName)
 
+        # TODO: Verify model name correctly and use parameters
         if ankiQuestion.getParameter("type") is not None:
             modelName = ankiQuestion.getParameter("type")
         else:
@@ -104,12 +105,16 @@ def _buildNote(self, ankiQuestion: AnkiQuestion):
         return note
 
     def _createQuestionString(self, questions:[str]):
+
         if len(questions) == 1:
-            return questions[0]
+            question =  questions[0].replace("\n", "<br>")
+            return question
         else:
             questionString = ""
             for q in questions:
+                q = q.strip().replace("\n", "<br>")
                 questionString += q + " <br>"
+            return questionString
 
 
     def _createAnswerString(self, answers: [str], bulletPoints: bool=True):

org_to_anki/org_parser/DeckBuilder.py

@@ -18,6 +18,7 @@ def buildDeck(self, questions: [str], deckName: str, filePath: str, fileType: st
             deck = self._buildNewDeck(questions, deckName, filePath)
         elif fileType == 'topics':
             deck = self._buildTopics(questions, deckName, filePath)
+        # TODO: Remove lower
         elif fileType.lower() == 'flattopics':
             deck = self._buildFlatTopics(questions, deckName, filePath)
         else:

org_to_anki/org_parser/ParserUtils.py

@@ -17,6 +17,7 @@ def convertLineToParamters(line: str):
         if "=" in item:
             item = item.strip()
             parts = item.split("=")
+            # TODO: Make lowercase parameters
             parameters[parts[0].strip()] = parts[1].strip()
 
     return parameters

setup.py

@@ -6,7 +6,7 @@
       author='Conor OKelly',
       author_email='okellyconor@gmail.com',
       url='https://github.com/c-okelly/org_to_anki',
-      python_requires='>3.3',
+      python_requires='>3.4',
       install_requires=['requests'],
       tests_require=['responses', 'nose', 'coverage'],
       test_suite="nose.collector",

tests/testAnkiConnector.py

@@ -50,3 +50,29 @@ def testBuildNoteForSublists():
 
     expectedString = "<ul style='list-style-position: inside;'><li>first answer</li><ul style='list-style-position: inside;'><li>sublist 1</li><ul style='list-style-position: inside;'><li>sublist2</li></ul><li>back to sublist1</li></ul><li>second answer</li></ul>"
     assert(answerString == expectedString)
+
+### Next two tests ensure that questions that have an internal multiline string are correctly html formatted ###
+def testMultiLineQuestionLine():
+
+    q = AnkiQuestion("Capital Cities\nCapital of dublin")
+    q.addAnswer("Dublin")
+    deck = AnkiDeck("Capitals")
+    deck.addQuestion(q)
+
+    a = AnkiConnector()
+    noteData = a._buildNote(deck.getQuestions()[0])
+
+    assert(noteData["fields"]["Front"] == "Capital Cities<br>Capital of dublin")
+
+def testManyMultiLineQuestionLines():
+
+    q = AnkiQuestion("Capital Cities\nCapital of dublin")
+    q.addQuestion("Second line")
+    q.addAnswer("Dublin")
+    deck = AnkiDeck("Capitals")
+    deck.addQuestion(q)
+
+    a = AnkiConnector()
+    noteData = a._buildNote(deck.getQuestions()[0])
+
+    assert(noteData["fields"]["Front"] == "Capital Cities<br>Capital of dublin <br>Second line <br>")

tests/testData/longBasic.org

@@ -279,8 +279,6 @@
 ** union file system
 * Create volume from dockerFile
 ** VOLUME
-* How to use -v flag for mount directory from host
-** -v /home/cokelly/path:/file/from/volume
 * How to share data between docker images
 ** Use flag => --volumes-from vol-name
 * Create docker containers for data storage? Best practices?