Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 18:53:21 +01:00
Code Issues Releases Wiki Activity

reorder config access in Job constructor

Browse Source 
(#1111)
This commit is contained in:
Mike Fährmann 2021-04-27 15:08:51 +02:00
parent 221015e586
commit 5b4da4b4bf
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gallery_dl/job.py
View File

@ -27,8 +27,11 @@ class Job():
extr = extractor.find(extr)
if not extr:
raise exception.NoExtractorError()
self.extractor = extr
self.pathfmt = None
self.kwdict = {}
self.status = 0
self._logger_extra = {
"job" : self,
@ -39,25 +42,15 @@ class Job():
extr.log = self._wrap_logger(extr.log)
extr.log.debug("Using %s for '%s'", extr.__class__.__name__, extr.url)
self.status = 0
self.pred_url = self._prepare_predicates("image", True)
self.pred_queue = self._prepare_predicates("chapter", False)
self.kwdict = {}
# user-supplied metadata
kwdict = self.extractor.config("keywords")
if kwdict:
self.kwdict.update(kwdict)
# data from parent job
if parent:
pextr = parent.extractor
# transfer (sub)category
if pextr.config("category-transfer", pextr.categorytransfer):
extr._cfgpath = pextr._cfgpath
extr.category = pextr.category
extr.subcategory = pextr.subcategory
extr._cfgpath = pextr._cfgpath
# transfer parent directory
extr._parentdir = pextr._parentdir
@ -65,6 +58,15 @@ class Job():
# reuse connection adapters
extr.session.adapters = pextr.session.adapters
# user-supplied metadata
kwdict = self.extractor.config("keywords")
if kwdict:
self.kwdict.update(kwdict)
# predicates
self.pred_url = self._prepare_predicates("image", True)
self.pred_queue = self._prepare_predicates("chapter", False)
def run(self):
"""Execute or run the job"""
sleep = self.extractor.config("sleep-extractor")