Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-24 19:52:32 +01:00
Code Issues Releases Wiki Activity

allow user-specified formats for filenames

Browse Source
This commit is contained in:
Mike Fährmann 2015-04-09 16:40:54 +02:00
parent 652d60a5cd
commit ce2fab9c7e
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gallery_dl/download.py
View File

@ -15,11 +15,11 @@ from .extractor.common import Message
class DownloadManager(): class DownloadManager():
def __init__(self, opts, conf): def __init__(self, opts, config):
self.opts = opts self.opts = opts
self.conf = conf self.config = config
self.modules = {} self.modules = {}
self.extractors = ExtractorFinder(conf) self.extractors = ExtractorFinder(config)
def add(self, url): def add(self, url):
job = DownloadJob(self, url) job = DownloadJob(self, url)
@ -37,7 +37,7 @@ class DownloadManager():
if self.opts.dest: if self.opts.dest:
return self.opts.dest return self.opts.dest
else: else:
return self.conf["general"].get("destination", "/tmp/") return self.config.get("general", "destination", fallback="/tmp/")
class DownloadJob(): class DownloadJob():
@ -47,6 +47,17 @@ class DownloadJob():
self.extractor, self.info = mngr.extractors.get_for_url(url) self.extractor, self.info = mngr.extractors.get_for_url(url)
self.directory = mngr.get_base_directory() self.directory = mngr.get_base_directory()
self.downloaders = {} self.downloaders = {}
self.filename_fmt = mngr.config.get(
self.info["category"], "filename",
fallback=self.info["filename"]
)
try:
segments = mngr.config.get(
self.info["category"], "directory"
).split("/")
except Exception:
segments = self.info["directory"]
self.directory_fmt = os.path.join(*segments)
def run(self): def run(self):
"""Execute/Run the downlaod job""" """Execute/Run the downlaod job"""
@ -76,7 +87,7 @@ class DownloadJob():
def download(self, msg): def download(self, msg):
"""Download the resource specified in 'msg'""" """Download the resource specified in 'msg'"""
_, url, metadata = msg _, url, metadata = msg
filename = self.info["filename"].format(**metadata) filename = self.filename_fmt.format(**metadata)
path = os.path.join(self.directory, filename) path = os.path.join(self.directory, filename)
if os.path.exists(path): if os.path.exists(path):
self.print_skip(path) self.print_skip(path)
@ -88,12 +99,9 @@ class DownloadJob():
def set_directory(self, msg): def set_directory(self, msg):
"""Set and create the target directory for downloads""" """Set and create the target directory for downloads"""
path = []
for segment in self.info["directory"]:
path.append(segment.format(**msg[1]))
self.directory = os.path.join( self.directory = os.path.join(
self.mngr.get_base_directory(), self.mngr.get_base_directory(),
*path self.directory_fmt.format(**msg[1])
) )
os.makedirs(self.directory, exist_ok=True) os.makedirs(self.directory, exist_ok=True)