projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'jaimeMF/yt-playlists'
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index fd5a30a0c889b1986a795684b13bece086efac66..2700051cf32309e5ba93397d0cf1f6ccb70be9db 100644
(file)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-5,6
+5,7
@@
from __future__ import absolute_import
import errno
import io
import errno
import io
+import json
import os
import re
import shutil
import os
import re
import shutil
@@
-84,6
+85,7
@@
class YoutubeDL(object):
forcethumbnail: Force printing thumbnail URL.
forcedescription: Force printing description.
forcefilename: Force printing final filename.
forcethumbnail: Force printing thumbnail URL.
forcedescription: Force printing description.
forcefilename: Force printing final filename.
+ forcejson: Force printing info_dict as JSON.
simulate: Do not download the video files.
format: Video format code.
format_limit: Highest quality format to try.
simulate: Do not download the video files.
format: Video format code.
format_limit: Highest quality format to try.
@@
-637,7
+639,7
@@
class YoutubeDL(object):
# Forced printings
if self.params.get('forcetitle', False):
# Forced printings
if self.params.get('forcetitle', False):
- compat_print(info_dict['title'])
+ compat_print(info_dict['
full
title'])
if self.params.get('forceid', False):
compat_print(info_dict['id'])
if self.params.get('forceurl', False):
if self.params.get('forceid', False):
compat_print(info_dict['id'])
if self.params.get('forceurl', False):
@@
-651,6
+653,8
@@
class YoutubeDL(object):
compat_print(filename)
if self.params.get('forceformat', False):
compat_print(info_dict['format'])
compat_print(filename)
if self.params.get('forceformat', False):
compat_print(info_dict['format'])
+ if self.params.get('forcejson', False):
+ compat_print(json.dumps(info_dict))
# Do nothing else if in simulate mode
if self.params.get('simulate', False):
# Do nothing else if in simulate mode
if self.params.get('simulate', False):
@@
-713,7
+717,7
@@
class YoutubeDL(object):
return
if self.params.get('writeinfojson', False):
return
if self.params.get('writeinfojson', False):
- infofn =
filename
+ u'.info.json'
+ infofn =
os.path.splitext(filename)[0]
+ u'.info.json'
self.report_writeinfojson(infofn)
try:
json_info_dict = dict((k, v) for k, v in info_dict.items() if not k in ['urlhandle'])
self.report_writeinfojson(infofn)
try:
json_info_dict = dict((k, v) for k, v in info_dict.items() if not k in ['urlhandle'])