github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow comments after input file URLs (#2808)

Browse Source 
everything after the first " #" (space + hash) gets ignored
This commit is contained in:
Mike Fährmann
2022-08-09 23:26:02 +02:00
parent a69f198ac9
commit d0adc13e23
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gallery_dl/__init__.py
View File

@@ -38,11 +38,11 @@ def parse_inputfile(file, log):
Lines starting with '#' and empty lines will be ignored. Lines starting with '#' and empty lines will be ignored.
Lines starting with '-' will be interpreted as a key-value pair separated Lines starting with '-' will be interpreted as a key-value pair separated
by an '='. where 'key' is a dot-separated option name and 'value' is a by an '='. where 'key' is a dot-separated option name and 'value' is a
JSON-parsable value for it. These config options will be applied while JSON-parsable value. These configuration options will be applied while
processing the next URL. processing the next URL.
Lines starting with '-G' are the same as above, except these options will Lines starting with '-G' are the same as above, except these options will
be valid for all following URLs, i.e. they are Global. be applied for *all* following URLs, i.e. they are Global.
Everything else will be used as potential URL. Everything else will be used as a potential URL.
Example input file: Example input file:
@@ -57,7 +57,8 @@ def parse_inputfile(file, log):
https://example.org/ https://example.org/
# next URL uses default filename and 'skip' is false. # next URL uses default filename and 'skip' is false.
https://example.com/index.htm https://example.com/index.htm # comment1
https://example.com/404.htm # comment2
""" """
gconf = [] gconf = []
lconf = [] lconf = []
@@ -94,6 +95,8 @@ def parse_inputfile(file, log):
else: else:
# url # url
if " #" in line:
line = line.partition(" #")[0]
if gconf or lconf: if gconf or lconf:
yield util.ExtendedUrl(line, gconf, lconf) yield util.ExtendedUrl(line, gconf, lconf)
gconf = [] gconf = []