erjemin/instaloader
erjemin/instaloader
1
0
Fork 0
Code Issues Wiki Activity

--skip-videos -> --no-videos; no --shorter-output

Browse Source
This commit is contained in:
Alexander Graf 2017-08-24 16:03:24 +02:00
parent 43bfd6b5ab
commit bbdd3873e2
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.rst
View File

@ -143,7 +143,7 @@ Instead of a *profile* or a *#hashtag*, the special targets
``:stories`` (stories of your followees) can be specified. ``:stories`` (stories of your followees) can be specified.
--profile-pic-only Only download profile picture. --profile-pic-only Only download profile picture.
--skip-videos Do not download videos. --no-videos Do not download videos.
--geotags **Download geotags** when available. Geotags are stored as --geotags **Download geotags** when available. Geotags are stored as
a text file with the location's name and a Google Maps a text file with the location's name and a Google Maps
link. This requires an additional request to the link. This requires an additional request to the
@ -222,7 +222,6 @@ How to Download
Miscellaneous Options Miscellaneous Options
^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
--shorter-output Do not display captions while downloading.
--quiet Disable user interaction, i.e. do not print messages --quiet Disable user interaction, i.e. do not print messages
(except errors) and fail if login credentials are (except errors) and fail if login credentials are
needed but not given. This makes Instaloader needed but not given. This makes Instaloader

14
instaloader.py
View File

@ -334,7 +334,7 @@ class Tristate(Enum):
class Instaloader: class Instaloader:
def __init__(self, def __init__(self,
sleep: bool = True, quiet: bool = False, shorter_output: bool = False, sleep: bool = True, quiet: bool = False,
user_agent: Optional[str] = None, user_agent: Optional[str] = None,
dirname_pattern: Optional[str] = None, dirname_pattern: Optional[str] = None,
filename_pattern: Optional[str] = None, filename_pattern: Optional[str] = None,
@ -349,7 +349,6 @@ class Instaloader:
self.username = None self.username = None
self.sleep = sleep self.sleep = sleep
self.quiet = quiet self.quiet = quiet
self.shorter_output = shorter_output
self.dirname_pattern = dirname_pattern if dirname_pattern is not None else '{target}' self.dirname_pattern = dirname_pattern if dirname_pattern is not None else '{target}'
self.filename_pattern = filename_pattern.replace('{date}', '{date:%Y-%m-%d_%H-%M-%S}') \ self.filename_pattern = filename_pattern.replace('{date}', '{date:%Y-%m-%d_%H-%M-%S}') \
if filename_pattern is not None else '{date:%Y-%m-%d_%H-%M-%S}' if filename_pattern is not None else '{date:%Y-%m-%d_%H-%M-%S}'
@ -372,7 +371,7 @@ class Instaloader:
@contextmanager @contextmanager
def anonymous_copy(self): def anonymous_copy(self):
"""Yield an anonymous, otherwise equally-configured copy of an Instaloader instance; Then copy its error log.""" """Yield an anonymous, otherwise equally-configured copy of an Instaloader instance; Then copy its error log."""
new_loader = Instaloader(self.sleep, self.quiet, self.shorter_output, self.user_agent, new_loader = Instaloader(self.sleep, self.quiet, self.user_agent,
self.dirname_pattern, self.filename_pattern, self.dirname_pattern, self.filename_pattern,
self.download_videos, self.download_geotags, self.download_videos, self.download_geotags,
self.download_captions, self.download_comments) self.download_captions, self.download_comments)
@ -648,9 +647,6 @@ class Instaloader:
filename += '.txt' filename += '.txt'
pcaption = caption.replace('\n', ' ').strip() pcaption = caption.replace('\n', ' ').strip()
caption = caption.encode("UTF-8") caption = caption.encode("UTF-8")
if self.shorter_output:
pcaption = "txt"
else:
pcaption = '[' + ((pcaption[:29] + u"\u2026") if len(pcaption) > 31 else pcaption) + ']' pcaption = '[' + ((pcaption[:29] + u"\u2026") if len(pcaption) > 31 else pcaption) + ']'
with suppress(FileNotFoundError): with suppress(FileNotFoundError):
with open(filename, 'rb') as file: with open(filename, 'rb') as file:
@ -1299,7 +1295,7 @@ def main():
'followees.') 'followees.')
g_what.add_argument('-P', '--profile-pic-only', action='store_true', g_what.add_argument('-P', '--profile-pic-only', action='store_true',
help='Only download profile picture.') help='Only download profile picture.')
g_what.add_argument('-V', '--skip-videos', action='store_true', g_what.add_argument('-V', '--no-videos', action='store_true',
help='Do not download videos.') help='Do not download videos.')
g_what.add_argument('-G', '--geotags', action='store_true', g_what.add_argument('-G', '--geotags', action='store_true',
help='Download geotags when available. Geotags are stored as a ' help='Download geotags when available. Geotags are stored as a '
@ -1387,7 +1383,7 @@ def main():
raise SystemExit(":feed-all and :feed-liked were removed. Use :feed as target and " raise SystemExit(":feed-all and :feed-liked were removed. Use :feed as target and "
"eventually --only-if=viewer_has_liked.") "eventually --only-if=viewer_has_liked.")
download_videos = Tristate.always if not args.skip_videos else Tristate.no_extra_query download_videos = Tristate.always if not args.no_videos else Tristate.no_extra_query
download_comments = Tristate.always if args.comments else Tristate.no_extra_query download_comments = Tristate.always if args.comments else Tristate.no_extra_query
download_captions = Tristate.no_extra_query if not args.no_captions else Tristate.never download_captions = Tristate.no_extra_query if not args.no_captions else Tristate.never
@ -1400,7 +1396,7 @@ def main():
else: else:
download_geotags = Tristate.no_extra_query download_geotags = Tristate.no_extra_query
loader = Instaloader(sleep=not args.no_sleep, quiet=args.quiet, shorter_output=args.shorter_output, loader = Instaloader(sleep=not args.no_sleep, quiet=args.quiet,
user_agent=args.user_agent, user_agent=args.user_agent,
dirname_pattern=args.dirname_pattern, filename_pattern=args.filename_pattern, dirname_pattern=args.dirname_pattern, filename_pattern=args.filename_pattern,
download_videos=download_videos, download_geotags=download_geotags, download_videos=download_videos, download_geotags=download_geotags,