Merge pull request #517 from nikkuAg/bloom

Allow uploading of bloom format files

Author: rtibbles

ricecooker/classes/files.py

@@ -95,9 +95,10 @@ def extract_ext_from_header(res):
         content_dis = res.headers.get("content-disposition")
         if content_dis:
             filename = get_filename_from_content_disposition_header(content_dis)
-            ext = filename.split(".")
-            if len(ext) > 1:
-                return ext[-1]
+            if filename:
+                ext = filename.split(".")
+                if len(ext) > 1:
+                    return ext[-1]
     return None
 
 
@@ -769,6 +770,15 @@ def get_preset(self):
         return self.preset or format_presets.EPUB
 
 
+class BloomPubFile(DownloadFile):
+    default_ext = file_formats.BLOOMPUB
+    allowed_formats = [file_formats.BLOOMPUB, file_formats.BLOOMD]
+    is_primary = True
+
+    def get_preset(self):
+        return self.preset or format_presets.BLOOMPUB
+
+
 class HTMLZipFile(DownloadFile):
     default_ext = file_formats.HTML5
     allowed_formats = [file_formats.HTML5]

ricecooker/classes/nodes.py

@@ -1042,7 +1042,7 @@ def validate(self):
         Args: None
         Returns: boolean indicating if document is valid
         """
-        from .files import DocumentFile, EPubFile, StudioFile
+        from .files import DocumentFile, EPubFile, StudioFile, BloomPubFile
 
         try:
             assert (
@@ -1063,6 +1063,7 @@ def validate(self):
                     isinstance(f, StudioFile)
                     and f.preset in (format_presets.DOCUMENT, format_presets.EPUB)
                 )
+                or isinstance(f, BloomPubFile)
             ], "Assumption Failed: Document should have at least one document file"
             return super(DocumentNode, self).validate()
         except AssertionError as ae: