Skip to content

Add --write-metadata feature #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
infinity0 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add --write-metadata feature #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53078cf
Fix --update, the outer block already catches all Exception (closes #13)
infinity0 Oct 24, 2017
9b5b00b
Add --write-metadata feature
infinity0 Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions redditdownload/redditdownload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from __future__ import print_function

import json
import os
import re
import StringIO
Expand Down Expand Up @@ -49,7 +50,6 @@ def request(url, *ar, **kwa):
def _log_wrongtype(_logfile=_WRONGDATA_LOGFILE, **kwa):
if not _logfile:
return
import json
data = json.dumps(kwa) + "\n"
with open(_logfile, 'a', 1) as f:
f.write(data)
Expand Down Expand Up @@ -261,6 +261,8 @@ def parse_args(args):
help='Download NSFW images only.')
PARSER.add_argument('--filename-format', default='reddit', required=False,
help='Specify filename format: reddit (default), title or url')
PARSER.add_argument('--write-metadata', default=False, action='store_true', required=False,
help='Write metadata in <filename>.json.')
PARSER.add_argument('--title-contain', metavar='TEXT', required=False,
help='Download only if title contain text (case insensitive)')
PARSER.add_argument('--regex', default=None, action='store', required=False,
Expand Down Expand Up @@ -432,6 +434,14 @@ def main():
FILENAME = '%s%s%s' % (ITEM['id'], FILENUM, FILEEXT)
# join file with directory
FILEPATH = pathjoin(ARGS.dir, FILENAME)
# write metadata if we were asked for it
if ARGS.write_metadata:
METAPATH = os.path.splitext(FILEPATH)[0] + ".json"
with open(METAPATH, 'w') as fp:
json.dump({
"url": URL,
"item": ITEM,
}, fp, indent=4, separators=(',', ': '))

# Improve debuggability list URL before download too.
# url may be wrong so skip that
Expand All @@ -442,16 +452,11 @@ def main():
print(text_templ.format(URL.encode('utf-8'), FILENAME.encode('utf-8')))

# Download the image
try:
download_from_url(URL, FILEPATH)
# Image downloaded successfully!
print(' Sucessfully downloaded URL [%s] as [%s].' % (URL, FILENAME))
DOWNLOADED += 1
FILECOUNT += 1

except Exception as exc:
print(' %s' % (exc,))
ERRORS += 1
download_from_url(URL, FILEPATH)
# Image downloaded successfully!
print(' Sucessfully downloaded URL [%s] as [%s].' % (URL, FILENAME))
DOWNLOADED += 1
FILECOUNT += 1

if ARGS.num and DOWNLOADED >= ARGS.num:
FINISHED = True
Expand Down