Merge branch 'v4.1-dev'

docs/_static/style.css

@@ -18,3 +18,11 @@ a {
 a:hover {
     color: #f48400;
 }
+
+body {
+    font-size: 16px;
+}
+
+.versionmodified {
+    font-size: 14px;
+}

docs/as-module.rst

@@ -135,6 +135,17 @@ User Stories
 .. autoclass:: StoryItem
    :no-show-inheritance:
 
+Highlights
+""""""""""
+
+.. autoclass:: Highlight
+   :no-show-inheritance:
+   :inherited-members:
+
+   Bases: :class:`Story`
+
+   .. versionadded:: 4.1
+
 Profiles
 """"""""
 

docs/basic-usage.rst

@@ -60,12 +60,27 @@ already have a valid session cookie file.
 What to Download
 ^^^^^^^^^^^^^^^^
 
+.. targets-start
+
 Instaloader supports the following targets:
 
 - ``profile``
-   Public profile, or private profile with :option:`--login`. For each profile
-   you download, :option:`--stories` instructs Instaloader to also
-   **download the user's stories**.
+   Public profile, or private profile with :option:`--login`.
+
+   If an already-downloaded profile has been renamed, Instaloader automatically
+   finds it by its unique ID and renames the folder accordingly.
+
+   Besides the profile's posts, its current profile picture is downloaded. For
+   each profile you download,
+
+   - :option:`--stories`
+      instructs Instaloader to also **download the user's stories**,
+
+   - :option:`--highlights`
+      to **download highlights of each profile that is downloaded**, and
+
+   - :option:`--tagged`
+      to **download posts where the user is tagged**.
 
 - ``"#hashtag"``
    Posts with a certain **hashtag** (the quotes are usually necessary),
@@ -84,6 +99,14 @@ Instaloader supports the following targets:
    All profiles that are followed by ``profile``, i.e. the *followees* of
    ``profile`` (requires :option:`--login`).
 
+- ``-post``
+   The single **post** with the given shortcode. Must be preceeded by ``--`` in
+   the argument list to not be mistaken as an option flag.
+
+   .. versionadded:: 4.1
+
+.. targets-end
+
 Instaloader goes through all media matching the specified targets and
 downloads the pictures and videos and their captions. You can specify
 

docs/cli-options.rst

@@ -13,27 +13,41 @@ feed), ``:stories`` (stories of your followees) or ``:saved`` (collection of
 posts marked as saved).
 
 Here we explain the additional options that can be given to Instaloader to
-customize its behavior.  To get a list of all flags, their abbreviations and
-their descriptions, you may also run ``instaloader --help``.  For an
+customize its behavior.  For an
 introduction on how to use Instaloader, see
 :ref:`download-pictures-from-instagram`.
 
-What to Download
-^^^^^^^^^^^^^^^^
+To get a list of all flags, their abbreviations and
+their descriptions, you may also run::
 
-Specify a list of targets (profiles, #hashtags, ``:feed``, ``:stories`` or
-``:saved``). For each of these, Instaloader creates a folder and stores all
-posts along with the pictures's captions and the current **profile picture**
-there. If an already-downloaded profile has been renamed, Instaloader
-automatically **finds it by its unique ID** and renames the folder likewise.
+   instaloader --help
 
-.. option:: --profile-pic-only, -P
+Targets
+^^^^^^^
 
-   Only download profile picture.
+Specify a list of targets. For each of these, Instaloader creates a folder and
+stores all posts along with the pictures's captions there.
 
-.. option:: --no-profile-pic
+.. include:: basic-usage.rst
+   :start-after: targets-start
+   :end-before: targets-end
 
-   Do not download profile picture.
+- ``filename.json[.xz]``
+   Re-Download the given object
+
+- ``+args.txt``
+   Read targets (and options) from given textfile. See :option:`+args.txt`.
+
+What to Download of each Post
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. option:: --no-pictures
+
+   Do not download post pictures. Cannot be used together with
+   :option:`--fast-update`. Implies :option:`--no-video-thumbnails`, does not
+   imply :option:`--no-videos`.
+
+   .. versionadded:: 4.1
 
 .. option:: --no-videos, -V
 
@@ -69,11 +83,6 @@ automatically **finds it by its unique ID** and renames the folder likewise.
    Template to write in txt file for each StoryItem. See
    :ref:`metadata-text-files`.
 
-.. option:: --stories, -s
-
-   Also **download stories** of each profile that is downloaded. Requires
-   :option:`--login`.
-
 .. option:: --no-metadata-json
 
    Do not create a JSON file containing the metadata of each post.
@@ -82,8 +91,50 @@ automatically **finds it by its unique ID** and renames the folder likewise.
 
    Do not xz compress JSON files, rather create pretty formatted JSONs.
 
+
+What to Download of each Profile
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. option:: --profile-pic-only, -P
+
+   .. deprecated:: 4.1
+      Use :option:`--no-posts`.
+
+   Only download profile picture.
+
+.. option:: --no-posts
+
+   Do not download regular posts.
+
+   .. versionadded:: 4.1
+
+.. option:: --no-profile-pic
+
+   Do not download profile picture.
+
+.. option:: --stories, -s
+
+   Also **download stories** of each profile that is downloaded. Requires
+   :option:`--login`.
+
+.. option:: --highlights
+
+   Also **download highlights** of each profile that is downloaded. Requires
+   :option:`--login`.
+
+   .. versionadded:: 4.1
+
+.. option:: --tagged
+
+   Also download posts where each profile is tagged.
+
+   .. versionadded:: 4.1
+
 .. option:: --stories-only
 
+   .. deprecated:: 4.1
+      Use :option:`--stories` :option:`--no-posts`.
+
    Rather than downloading regular posts of each specified profile, only
    download stories.  Requires :option:`--login`. Does not imply
    :option:`--no-profile-pic`.
@@ -93,6 +144,15 @@ automatically **finds it by its unique ID** and renames the folder likewise.
       If possible, use ``:stories`` target rather than :option:`--stories-only`
       with all your followees. ``:stories`` uses fewer API requests.
 
+Which Posts to Download
+^^^^^^^^^^^^^^^^^^^^^^^
+
+.. option:: --fast-update, -F
+
+   For each target, stop when encountering the first already-downloaded picture.
+   This flag is recommended when you use Instaloader to update your personal
+   Instagram archive.
+
 .. option:: --post-filter filter, --only-if filter
 
    Expression that, if given, must evaluate to True for each post to be
@@ -108,20 +168,6 @@ automatically **finds it by its unique ID** and renames the folder likewise.
    evaluated to :class:`instaloader.StoryItem` attributes.
    See :ref:`filter-posts` for more examples.
 
-
-
-When to Stop Downloading
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-If none of these options are given, Instaloader goes through all pictures
-matching the specified targets.
-
-.. option:: --fast-update, -F
-
-   For each target, stop when encountering the first already-downloaded picture.
-   This flag is recommended when you use Instaloader to update your personal
-   Instagram archive.
-
 .. option:: --count COUNT, -c
 
    Do not attempt to download more than COUNT posts.  Applies only to
@@ -192,3 +238,21 @@ Miscellaneous Options
    Disable user interaction, i.e. do not print messages (except errors) and fail
    if login credentials are needed but not given.
    This is handy for running :ref:`instaloader-as-cronjob`.
+
+.. option:: +args.txt
+
+   Read arguments from file `args.txt`, a shortcut to provide argument from
+   file rather than command-line. This provide a convient way to hide login
+   info from CLI. and also can use for simplify managment of long arguments.
+
+   .. note::
+
+      text file should separate arg with line break.
+
+      args.txt example::
+
+         --login MYUSENAME
+         --password MYPASSWORD
+         --fast-update
+
+   .. versionadded:: 4.1

docs/index.rst

@@ -41,7 +41,7 @@ See :ref:`install` for more options on how to install Instaloader.
 
 ::
 
-    instaloader [--comments] [--geotags] [--stories]
+    instaloader [--comments] [--geotags] [--stories] [--highlights] [--tagged]
                 [--login YOUR-USERNAME] [--fast-update]
                 profile | "#hashtag" |
                 :stories | :feed | :saved