Updated sample

ricecooker/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = 'Learning Equality'
 __email__ = '[email protected]'
-__version__ = '0.3.13'
+__version__ = '0.3.14'

ricecooker/classes/questions.py

@@ -119,7 +119,7 @@ def parse_html(self, text):
                 text (str): text to parse
             Returns: string with properly formatted images
         """
-        bs = BeautifulSoup(text, "html.parser")
+        bs = BeautifulSoup(text, "html5lib")
         file_reg = re.compile(FILE_REGEX, flags=re.IGNORECASE)
         tags = bs.findAll('img')
 

ricecooker/commands.py

@@ -262,6 +262,7 @@ def upload_files(tree, file_diff):
     """
     # Upload new files to CC
     tree.upload_files(file_diff)
+    tree.reattempt_upload_fails()
     if config.VERBOSE:
         sys.stderr.write("\n")
     return file_diff

ricecooker/managers/tree.py

@@ -17,6 +17,7 @@ def __init__(self, channel):
         self.channel = channel # Channel to process
         self.uploaded_files=[]
         self.failed_node_builds=[]
+        self.failed_uploads=[]
 
     def validate(self):
         """ validate: checks if tree structure is valid
@@ -149,16 +150,26 @@ def upload_files(self, file_list):
             for f in files_to_upload:
                 with  open(config.get_storage_path(f), 'rb') as file_obj:
                     response = requests.post(config.file_upload_url(), headers={"Authorization": "Token {0}".format(config.TOKEN)},  files={'file': file_obj})
-                    response.raise_for_status()
-                    self.uploaded_files += [f]
-                    counter += 1
-                    if config.VERBOSE:
-                        sys.stderr.write("\n\tUploaded {0} ({count}/{total}) ".format(f, count=counter, total=len(files_to_upload)))
+                    if response.status_code == 200:
+                        response.raise_for_status()
+                        self.uploaded_files += [f]
+                        counter += 1
+                        if config.VERBOSE:
+                            sys.stderr.write("\n\tUploaded {0} ({count}/{total}) ".format(f, count=counter, total=len(files_to_upload)))
+                    else:
+                        self.failed_uploads += [f]
         finally:
             config.PROGRESS_MANAGER.set_uploading(self.uploaded_files)
 
+    def reattempt_upload_fails(self):
+        """ reattempt_upload_fails: uploads failed files to server
+            Args: None
+            Returns: None
+        """
+        self.upload_files(self.failed_uploads)
+
     def upload_tree(self):
-        """ upload_files: sends processed channel data to server to create tree
+        """ upload_tree: sends processed channel data to server to create tree
             Args: None
             Returns: link to uploadedchannel
         """

ricecooker/sample_program.py

@@ -148,7 +148,7 @@
                 "questions": [
                     {
                         "id": "ccccc",
-                        "question": "<h1>Why? <img src='http://agrointel.ro/wp-content/uploads/2015/04/orezul-auriu.jpg' alt='alternative-text'></h1>",
+                        "question": "<p><img align=\"middle\" alt=\"C o n s i d e r space t h e space f o l l o w i n g space f i g u r e space o f space l i n e space top enclose M N end enclose. space S a y space w h e t h e r space f o l l o w i n g space\r\ns t a t e m e n t s space a r e space t r u e space o r space f a l s e space i n space c o n t e x t space o f space t h e space g i v e n space f i g u r e.\r\n\" class=\"Wirisformula\" data-mathml=\"«math xmlns=¨http://www.w3.org/1998/Math/MathML¨»«mi»C«/mi»«mi»o«/mi»«mi»n«/mi»«mi»s«/mi»«mi»i«/mi»«mi»d«/mi»«mi»e«/mi»«mi»r«/mi»«mo»§#160;«/mo»«mi»t«/mi»«mi»h«/mi»«mi»e«/mi»«mo»§#160;«/mo»«mi»f«/mi»«mi»o«/mi»«mi»l«/mi»«mi»l«/mi»«mi»o«/mi»«mi»w«/mi»«mi»i«/mi»«mi»n«/mi»«mi»g«/mi»«mo»§#160;«/mo»«mi»f«/mi»«mi»i«/mi»«mi»g«/mi»«mi»u«/mi»«mi»r«/mi»«mi»e«/mi»«mo»§#160;«/mo»«mi»o«/mi»«mi»f«/mi»«mo»§#160;«/mo»«mi»l«/mi»«mi»i«/mi»«mi»n«/mi»«mi»e«/mi»«mo»§#160;«/mo»«menclose notation=¨top¨»«mi»M«/mi»«mi»N«/mi»«/menclose»«mo».«/mo»«mo»§#160;«/mo»«mi»S«/mi»«mi»a«/mi»«mi»y«/mi»«mo»§#160;«/mo»«mi»w«/mi»«mi»h«/mi»«mi»e«/mi»«mi»t«/mi»«mi»h«/mi»«mi»e«/mi»«mi»r«/mi»«mo»§#160;«/mo»«mi»f«/mi»«mi»o«/mi»«mi»l«/mi»«mi»l«/mi»«mi»o«/mi»«mi»w«/mi»«mi»i«/mi»«mi»n«/mi»«mi»g«/mi»«mo»§#160;«/mo»«mspace linebreak=¨newline¨/»«mi»s«/mi»«mi»t«/mi»«mi»a«/mi»«mi»t«/mi»«mi»e«/mi»«mi»m«/mi»«mi»e«/mi»«mi»n«/mi»«mi»t«/mi»«mi»s«/mi»«mo»§#160;«/mo»«mi»a«/mi»«mi»r«/mi»«mi»e«/mi»«mo»§#160;«/mo»«mi»t«/mi»«mi»r«/mi»«mi»u«/mi»«mi»e«/mi»«mo»§#160;«/mo»«mi»o«/mi»«mi»r«/mi»«mo»§#160;«/mo»«mi»f«/mi»«mi»a«/mi»«mi»l«/mi»«mi»s«/mi»«mi»e«/mi»«mo»§#160;«/mo»«mi»i«/mi»«mi»n«/mi»«mo»§#160;«/mo»«mi»c«/mi»«mi»o«/mi»«mi»n«/mi»«mi»t«/mi»«mi»e«/mi»«mi»x«/mi»«mi»t«/mi»«mo»§#160;«/mo»«mi»o«/mi»«mi»f«/mi»«mo»§#160;«/mo»«mi»t«/mi»«mi»h«/mi»«mi»e«/mi»«mo»§#160;«/mo»«mi»g«/mi»«mi»i«/mi»«mi»v«/mi»«mi»e«/mi»«mi»n«/mi»«mo»§#160;«/mo»«mi»f«/mi»«mi»i«/mi»«mi»g«/mi»«mi»u«/mi»«mi»r«/mi»«mi»e«/mi»«mo».«/mo»«mspace linebreak=¨newline¨/»«/math»\" src=\"http://www.magogenie.com/assets/tinymce/jscripts/tiny_mce/plugins/tiny_mce_wiris/integration/showimage.php?formula=5ae94c3870f7867b485830ce79504b42.png\"><img src=\"data:image/jpeg;base64,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\"></p><p><img src=\"http://www.magogenie.com/assets/tinymce/jscripts/tiny_mce/plugins/tiny_mce_wiris/integration/showimage.php?formula=f56752af6b14e80159ccc7de1100cb5b.png\" data-mathml=\"«math xmlns=¨http://www.w3.org/1998/Math/MathML¨»«mi»M«/mi»«mo»§#160;«/mo»«mi»i«/mi»«mi»s«/mi»«mo»§#160;«/mo»«mi»p«/mi»«mi»o«/mi»«mi»i«/mi»«mi»n«/mi»«mi»t«/mi»«mo»§#160;«/mo»«mi»o«/mi»«mi»n«/mi»«mo»§#160;«/mo»«mi»r«/mi»«mi»a«/mi»«mi»y«/mi»«mo»§#160;«/mo»«menclose notation=¨top¨»«mi»O«/mi»«mi»P«/mi»«/menclose»«/math»\" class=\"Wirisformula\" alt=\"M space i s space p o i n t space o n space r a y space top enclose O P end enclose\" align=\"middle\"><br></p>",
                         "type":exercises.SINGLE_SELECTION,
                         "all_answers": ["Yes", "No", "Rice!"],
                         "correct_answer": "Rice!",

setup.py

@@ -23,6 +23,7 @@
     "pressurecooker==0.0.7",
     "selenium==3.0.1",
     "youtube-dl",
+    "html5lib",
 ]
 
 test_requirements = [