From 1dcca367721847e15bc2fdba9db8b3411ae9207d Mon Sep 17 00:00:00 2001 From: Timmy Welch Date: Mon, 21 Feb 2022 20:05:07 -0800 Subject: [PATCH] Bug fixes Closes #65,#59,#154,#180,#187,#209 --- comicapi/comicarchive.py | 34 +--------------------------------- comicapi/issuestring.py | 3 +-- 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/comicapi/comicarchive.py b/comicapi/comicarchive.py index 02ee666..9aa80c9 100644 --- a/comicapi/comicarchive.py +++ b/comicapi/comicarchive.py @@ -25,7 +25,6 @@ import time import io import natsort -from PyPDF2 import PdfFileReader try: from unrar.cffi import rarfile except: @@ -528,34 +527,6 @@ class UnknownArchiver: def getArchiveFilenameList(self): return [] -class PdfArchiver: - - def __init__(self, path): - self.path = path - - def getArchiveComment(self): - return "" - - def setArchiveComment(self, comment): - return False - - def readArchiveFile(self, page_num): - return subprocess.check_output( - ['mudraw', '-o', '-', self.path, str(int(os.path.basename(page_num)[:-4]))]) - - def writeArchiveFile(self, archive_file, data): - return False - - def removeArchiveFile(self, archive_file): - return False - - def getArchiveFilenameList(self): - out = [] - pdf = PdfFileReader(open(self.path, 'rb')) - for page in range(1, pdf.getNumPages() + 1): - out.append("/%04d.jpg" % (page)) - return out - class ComicArchive: logo_data = None class ArchiveType: @@ -596,9 +567,6 @@ class ComicArchive: self.archiver = RarArchiver( self.path, rar_exe_path=self.rar_exe_path) - elif os.path.basename(self.path)[-3:] == 'pdf': - self.archive_type = self.ArchiveType.Pdf - self.archiver = PdfArchiver(self.path) if ComicArchive.logo_data is None: #fname = ComicTaggerSettings.getGraphic('nocover.png') @@ -677,7 +645,7 @@ class ComicArchive: if ( # or self.isFolder() ) - (self.isZip() or self.isRar() or self.isPdf()) + (self.isZip() or self.isRar()) and (self.getNumberOfPages() > 0) diff --git a/comicapi/issuestring.py b/comicapi/issuestring.py index 2f441c1..62732a8 100644 --- a/comicapi/issuestring.py +++ b/comicapi/issuestring.py @@ -38,8 +38,7 @@ class IssueString: if text is None: return - if isinstance(text, int): - text = str(text) + text = str(text) if len(text) == 0: return