NussNougate/nhentai
4
0
Fork 0
mirror of https://github.com/RicterZ/nhentai.git synced 2025-11-04 02:50:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix process continuing despite cbz download request skipped

Browse Source
This commit is contained in:
normalizedwater546
2024-09-22 00:43:10 +00:00
parent b51e812449
commit 12364e980c
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nhentai/command.py
View File

@@ -87,7 +87,9 @@ def main():
if not options.dryrun: if not options.dryrun:
doujinshi.downloader = downloader doujinshi.downloader = downloader
doujinshi.download(regenerate_cbz=options.regenerate_cbz) result = doujinshi.download(regenerate_cbz=options.regenerate_cbz)
# Already downloaded; continue on with the other doujins.
if not result: continue
if options.generate_metadata: if options.generate_metadata:
table = doujinshi.table table = doujinshi.table

10
nhentai/downloader.py
View File

@@ -115,7 +115,8 @@ class Downloader(Singleton):
return 1, url return 1, url
def start_download(self, queue, folder='', regenerate_cbz=False):
def start_download(self, queue, folder='', regenerate_cbz=False) -> bool:
if not isinstance(folder, (str, )): if not isinstance(folder, (str, )):
folder = str(folder) folder = str(folder)
@@ -125,7 +126,7 @@ class Downloader(Singleton):
if os.path.exists(folder + '.cbz'): if os.path.exists(folder + '.cbz'):
if not regenerate_cbz: if not regenerate_cbz:
logger.warning(f'CBZ file "{folder}.cbz" exists, ignored download request') logger.warning(f'CBZ file "{folder}.cbz" exists, ignored download request')
return return False
logger.info(f'Doujinshi will be saved at "{folder}"') logger.info(f'Doujinshi will be saved at "{folder}"')
if not os.path.exists(folder): if not os.path.exists(folder):
@@ -138,7 +139,8 @@ class Downloader(Singleton):
logger.warning(f'Path "{folder}" already exist.') logger.warning(f'Path "{folder}" already exist.')
if os.getenv('DEBUG', None) == 'NODOWNLOAD': if os.getenv('DEBUG', None) == 'NODOWNLOAD':
return # Assuming we want to continue with rest of process?
return True
queue = [(self, url, folder, constant.CONFIG['proxy']) for url in queue] queue = [(self, url, folder, constant.CONFIG['proxy']) for url in queue]
pool = multiprocessing.Pool(self.size, init_worker) pool = multiprocessing.Pool(self.size, init_worker)
@@ -147,6 +149,8 @@ class Downloader(Singleton):
pool.close() pool.close()
pool.join() pool.join()
return True
def download_wrapper(obj, url, folder='', proxy=None): def download_wrapper(obj, url, folder='', proxy=None):
if sys.platform == 'darwin' or semaphore.get_value(): if sys.platform == 'darwin' or semaphore.get_value():