lordwelch/comicapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add pytest

Browse Source
This commit is contained in:
Davide Romanini 2019-10-19 23:57:49 +02:00
parent c813126fa2
commit 62897a15cf
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
comicapi/comicarchive.py
View File

@ -24,7 +24,7 @@ import platform
import time import time
import io import io
from natsort import natsorted from natsort import natsorted, ns
from PyPDF2 import PdfFileReader from PyPDF2 import PdfFileReader
from unrar.cffi import rarfile from unrar.cffi import rarfile
try: try:
@ -597,7 +597,6 @@ class ComicArchive:
self.archiver = PdfArchiver(self.path) self.archiver = PdfArchiver(self.path)
if ComicArchive.logo_data is None: if ComicArchive.logo_data is None:
#fname = ComicTaggerSettings.getGraphic('nocover.png')
fname = self.default_image_path fname = self.default_image_path
with open(fname, 'rb') as fd: with open(fname, 'rb') as fd:
ComicArchive.logo_data = fd.read() ComicArchive.logo_data = fd.read()
@ -804,7 +803,6 @@ class ComicArchive:
if self.page_list is None: if self.page_list is None:
# get the list file names in the archive, and sort # get the list file names in the archive, and sort
files = self.archiver.getArchiveFilenameList() files = self.archiver.getArchiveFilenameList()
# seems like some archive creators are on Windows, and don't know # seems like some archive creators are on Windows, and don't know
# about case-sensitivity! # about case-sensitivity!
if sort_list: if sort_list:
@ -815,7 +813,7 @@ class ComicArchive:
# k = os.path.join(os.path.split(k)[0], "z" + basename) # k = os.path.join(os.path.split(k)[0], "z" + basename)
return k.lower() return k.lower()
files = natsorted(files, key=keyfunc, signed=False) files = natsorted(files, key=keyfunc, alg=ns.UNSIGNED)
# make a sub-list of image files # make a sub-list of image files
self.page_list = [] self.page_list = []