Renabled cbrimage extraction (via unrar and rarfile)

cps/admin.py

@@ -50,11 +50,11 @@ feature_support = {
         'kobo':  bool(services.kobo)
     }
 
-# try:
-#     import rarfile
-#     feature_support['rar'] = True
-# except ImportError:
-#     feature_support['rar'] = False
+try:
+    import rarfile
+    feature_support['rar'] = True
+except ImportError:
+    feature_support['rar'] = False
 
 try:
     from .oauth_bb import oauth_check, oauthblueprints

cps/comic.py

@@ -33,10 +33,16 @@ except ImportError as e:
     log.debug('cannot import comicapi, extracting comic metadata will not work: %s', e)
     import zipfile
     import tarfile
+    try:
+        import rarfile
+        use_rarfile = True
+    except ImportError as e:
+        log.debug('cannot import rarfile, extracting cover files from rar files will not work: %s', e)
+        use_rarfile = False
     use_comic_meta = False
 
 
-def extractCover(tmp_file_name, original_file_extension):
+def _extractCover(tmp_file_name, original_file_extension, rarExceutable):
     cover_data = extension = None
     if use_comic_meta:
         archive = ComicArchive(tmp_file_name)
@@ -66,6 +72,20 @@ def extractCover(tmp_file_name, original_file_extension):
                     if extension == '.jpg' or extension == '.jpeg':
                         cover_data = cf.extractfile(name).read()
                         break
+        elif original_file_extension.upper() == '.CBR' and use_rarfile:
+            try:
+                rarfile.UNRAR_TOOL = rarExceutable
+                cf = rarfile.RarFile(tmp_file_name)
+                for name in cf.getnames():
+                    ext = os.path.splitext(name)
+                    if len(ext) > 1:
+                        extension = ext[1].lower()
+                        if extension == '.jpg' or extension == '.jpeg':
+                            cover_data = cf.read(name)
+                            break
+            except Exception as e:
+                log.debug('Rarfile failed with error: %s', e)
+
     prefix = os.path.dirname(tmp_file_name)
     if cover_data:
         tmp_cover_name = prefix + '/cover' + extension
@@ -77,9 +97,9 @@ def extractCover(tmp_file_name, original_file_extension):
     return tmp_cover_name
 
 
-def get_comic_info(tmp_file_path, original_file_name, original_file_extension):
+def get_comic_info(tmp_file_path, original_file_name, original_file_extension, rarExceutable):
     if use_comic_meta:
-        archive = ComicArchive(tmp_file_path)
+        archive = ComicArchive(tmp_file_path, rar_exe_path=rarExceutable)
         if archive.seemsToBeAComicArchive():
             if archive.hasMetadata(MetaDataStyle.CIX):
                 style = MetaDataStyle.CIX
@@ -100,27 +120,26 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension):
             else:
                  loadedMetadata.language = ""
 
-        return BookMeta(
+            return BookMeta(
                 file_path=tmp_file_path,
                 extension=original_file_extension,
                 title=loadedMetadata.title or original_file_name,
                 author=" & ".join([credit["person"] for credit in loadedMetadata.credits if credit["role"] == "Writer"]) or u'Unknown',
-                cover=extractCover(tmp_file_path, original_file_extension),
+                cover=_extractCover(tmp_file_path, original_file_extension, rarExceutable),
                 description=loadedMetadata.comments or "",
                 tags="",
                 series=loadedMetadata.series or "",
                 series_id=loadedMetadata.issue or "",
                 languages=loadedMetadata.language)
-    else:
 
-        return BookMeta(
-            file_path=tmp_file_path,
-            extension=original_file_extension,
-            title=original_file_name,
-            author=u'Unknown',
-            cover=extractCover(tmp_file_path, original_file_extension),
-            description="",
-            tags="",
-            series="",
-            series_id="",
-            languages="")
+    return BookMeta(
+        file_path=tmp_file_path,
+        extension=original_file_extension,
+        title=original_file_name,
+        author=u'Unknown',
+        cover=_extractCover(tmp_file_path, original_file_extension, rarExceutable),
+        description="",
+        tags="",
+        series="",
+        series_id="",
+        languages="")

cps/editbooks.py

@@ -588,7 +588,7 @@ def upload():
 
             # extract metadata from file
             try:
-                meta = uploader.upload(requested_file)
+                meta = uploader.upload(requested_file, config.config_rarfile_location)
             except (IOError, OSError):
                 log.error("File %s could not saved to temp dir", requested_file.filename)
                 flash(_(u"File %(filename)s could not saved to temp dir",

cps/helper.py

@@ -583,7 +583,7 @@ def check_unrar(unrarLocation):
         return
 
     if not os.path.exists(unrarLocation):
-        return 'Unrar binary file not found'
+        return _('Unrar binary file not found')
 
     try:
         if sys.version_info < (3, 0):
@@ -596,7 +596,7 @@ def check_unrar(unrarLocation):
                 log.debug("unrar version %s", version)
     except OSError as err:
         log.exception(err)
-        return 'Error excecuting UnRar'
+        return _('Error excecuting UnRar')
 
 
 

cps/templates/config_edit.html

@@ -344,7 +344,7 @@
                 <input type="text" class="form-control" id="config_converterpath" name="config_converterpath" value="{% if config.config_converterpath != None %}{{ config.config_converterpath }}{% endif %}" autocomplete="off">
             </div>
           </div>
-          {% if rarfile_support %}
+          {% if feature_support['rar'] %}
             <div class="form-group">
                 <label for="config_rarfile_location">{{_('Location of Unrar binary')}}</label>
                 <input type="text" class="form-control" name="config_rarfile_location" id="config_rarfile_location" value="{% if config.config_rarfile_location != None %}{{ config.config_rarfile_location }}{% endif %}" autocomplete="off">

cps/uploader.py

@@ -76,7 +76,7 @@ except ImportError as e:
 __author__ = 'lemmsh'
 
 
-def process(tmp_file_path, original_file_name, original_file_extension):
+def process(tmp_file_path, original_file_name, original_file_extension, rarExcecutable):
     meta = None
     try:
         if ".PDF" == original_file_extension.upper():
@@ -85,8 +85,11 @@ def process(tmp_file_path, original_file_name, original_file_extension):
             meta = epub.get_epub_info(tmp_file_path, original_file_name, original_file_extension)
         if ".FB2" == original_file_extension.upper() and use_fb2_meta is True:
             meta = fb2.get_fb2_info(tmp_file_path, original_file_extension)
-        if original_file_extension.upper() in ['.CBZ', '.CBT']:
-            meta = comic.get_comic_info(tmp_file_path, original_file_name, original_file_extension)
+        if original_file_extension.upper() in ['.CBZ', '.CBT', '.CBR']:
+            meta = comic.get_comic_info(tmp_file_path,
+                                        original_file_name,
+                                        original_file_extension,
+                                        rarExcecutable)
 
     except Exception as ex:
         log.warning('cannot parse metadata, using default: %s', ex)
@@ -194,7 +197,7 @@ def get_versions():
             'Comic_API': ComicVersion}
 
 
-def upload(uploadfile):
+def upload(uploadfile, rarExcecutable):
     tmp_dir = os.path.join(gettempdir(), 'calibre_web')
 
     if not os.path.isdir(tmp_dir):
@@ -206,5 +209,5 @@ def upload(uploadfile):
     tmp_file_path = os.path.join(tmp_dir, md5.hexdigest())
     log.debug("Temporary file: %s", tmp_file_path)
     uploadfile.save(tmp_file_path)
-    meta = process(tmp_file_path, filename_root, file_extension)
+    meta = process(tmp_file_path, filename_root, file_extension, rarExcecutable)
     return meta

cps/web.py

@@ -72,11 +72,11 @@ try:
 except ImportError:
     pass  # We're not using Python 3
 
-# try:
-#     import rarfile
-#     feature_support['rar'] = True
-# except ImportError:
-#     feature_support['rar'] = False
+#try:
+#    import rarfile
+#    feature_support['rar'] = True
+#except ImportError:
+#    feature_support['rar'] = False
 
 try:
     from natsort import natsorted as sort