FrederikBaerentsen/ComicOPDS
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

Cleanup of files

Browse Source
This commit is contained in:
FrederikBaerentsen 2023-01-20 11:45:09 +01:00
parent 6cea6852ea
commit 18377b474a
2 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.py
View File

@ -10,11 +10,21 @@ elif platform == "win32":
CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/Comics/ComicRack") #windows CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/Comics/ComicRack") #windows
#CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "testlibrary") #windows test library #CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "testlibrary") #windows test library
# Added folder for thumbnails. These are loaded as covers for the files.
THUMBNAIL_DIR = os.getenv("THUMBNAIL_DIR",'thumbnails') THUMBNAIL_DIR = os.getenv("THUMBNAIL_DIR",'thumbnails')
# If using Windows, insert the drive letter of your comics here.
# Both the script and comics needs to be on the same drive.
WIN_DRIVE_LETTER = 'B' WIN_DRIVE_LETTER = 'B'
# If using custom searches, then insert the default amout of results here.
# It is also possible to override this in the json file.
DEFAULT_SEARCH_NUMBER = 10 DEFAULT_SEARCH_NUMBER = 10
# Debug output
# False: no print out in terminal
# True: logs are printet to terminal
DEBUG = True DEBUG = True
def _print(arg): def _print(arg):

36
main.py
View File

@ -55,7 +55,6 @@ def generate():
for root, dirs, files in os.walk(os.path.abspath(config.CONTENT_BASE_DIR)): for root, dirs, files in os.walk(os.path.abspath(config.CONTENT_BASE_DIR)):
for file in files: for file in files:
f = os.path.join(root, file) f = os.path.join(root, file)
#try:
if f.endswith('.cbz'): if f.endswith('.cbz'):
try: try:
comiccount = comiccount + 1 comiccount = comiccount + 1
@ -100,7 +99,6 @@ def import2sql():
for root, dirs, files in os.walk(os.path.abspath(config.CONTENT_BASE_DIR)): for root, dirs, files in os.walk(os.path.abspath(config.CONTENT_BASE_DIR)):
for file in files: for file in files:
f = os.path.join(root, file) f = os.path.join(root, file)
#try:
if f.endswith('.cbz'): if f.endswith('.cbz'):
try: try:
comiccount = comiccount + 1 comiccount = comiccount + 1
@ -108,19 +106,8 @@ def import2sql():
filelist = zipfile.ZipFile.namelist(s) filelist = zipfile.ZipFile.namelist(s)
if filelist[0] == 'ComicInfo.xml': if filelist[0] == 'ComicInfo.xml':
filemodtime = os.path.getmtime(f) filemodtime = os.path.getmtime(f)
#s = gzip.GzipFile(f)
Bs_data = BeautifulSoup(s.open('ComicInfo.xml').read(), "xml") Bs_data = BeautifulSoup(s.open('ComicInfo.xml').read(), "xml")
#print(Bs_data.select('Series')[0].text, file=sys.stderr)
#print(Bs_data.select('Title')[0].text, file=sys.stderr)
CVDB=extras.get_cvdb(Bs_data.select('Notes')) CVDB=extras.get_cvdb(Bs_data.select('Notes'))
#list.append('CVDB'+CVDB + ': ' + Bs_data.select('Series')[0].text + "(" + Bs_data.select('Volume')[0].text + ") : " + Bs_data.select('Number')[0].text )
#print(list, file=sys.stdout)
ISSUE=Bs_data.select('Number')[0].text ISSUE=Bs_data.select('Number')[0].text
SERIES=Bs_data.select('Series')[0].text SERIES=Bs_data.select('Series')[0].text
VOLUME=Bs_data.select('Volume')[0].text VOLUME=Bs_data.select('Volume')[0].text
@ -143,40 +130,25 @@ def import2sql():
savedmodtime = conn.execute(query).fetchone()[0] savedmodtime = conn.execute(query).fetchone()[0]
except: except:
savedmodtime = 0 savedmodtime = 0
#print(savedmodtime)
#print(float(savedmodtime))
#print(type(savedmodtime))
#print(type(filemodtime))
if savedmodtime < filemodtime: if savedmodtime < filemodtime:
#print(str(savedmodtime) + " is less than " + str(filemodtime))
#print(str(CVDB) + " - s: " + str(savedmodtime))
#print(str(CVDB) + " - f: " + str(filemodtime))
conn.execute("INSERT OR REPLACE INTO COMICS (CVDB,ISSUE,SERIES,VOLUME, PUBLISHER, TITLE, FILE,PATH,UPDATED) VALUES (?,?,?,?,?,?,?,?,?)", (CVDB, ISSUE, SERIES, VOLUME, PUBLISHER, TITLE, file, f, UPDATED)) conn.execute("INSERT OR REPLACE INTO COMICS (CVDB,ISSUE,SERIES,VOLUME, PUBLISHER, TITLE, FILE,PATH,UPDATED) VALUES (?,?,?,?,?,?,?,?,?)", (CVDB, ISSUE, SERIES, VOLUME, PUBLISHER, TITLE, file, f, UPDATED))
conn.commit() conn.commit()
print("Adding: " + str(CVDB)) config._print("Adding: " + str(CVDB))
importcount = importcount + 1 importcount = importcount + 1
elif Path(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg").exists() == False: elif Path(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg").exists() == False:
#print(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg")
cover = s.open(filelist[1]).read() cover = s.open(filelist[1]).read()
c = open(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg", 'wb+') c = open(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg", 'wb+')
c.write(cover) c.write(cover)
c.close() c.close()
coverscount = coverscount + 1 coverscount = coverscount + 1
else: else:
config._print("Skipping: " + f)
print("Skipping: " + f)
skippedcount = skippedcount + 1 skippedcount = skippedcount + 1
except Exception as e: except Exception as e:
errorcount = errorcount + 1 errorcount = errorcount + 1
comics_with_errors.append(f) comics_with_errors.append(f)
print(e) config._print(e)
#print(f,file=sys.stdout) config._print(comics_with_errors)
print(comics_with_errors)
conn.close() conn.close()
elapsed = timeit.default_timer() - start_time elapsed = timeit.default_timer() - start_time
elapsed_time = "IMPORTED IN: " + str(round(elapsed,2)) + "s" elapsed_time = "IMPORTED IN: " + str(round(elapsed,2)) + "s"