New upstream version 1.14.0.upstream/1.14.0

1 files changed, 66 insertions, 10 deletions

diff --git a/PKG-INFO b/PKG-INFO
index 085159b..e520fc1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gallery_dl
-Version: 1.13.6
+Version: 1.14.0
 Summary: Command-line program to download image-galleries and -collections from several image hosting sites
 Home-page: https://github.com/mikf/gallery-dl
 Author: Mike Fährmann
@@ -94,8 +94,8 @@ Description: ==========
         put it into your `PATH <https://en.wikipedia.org/wiki/PATH_(variable)>`__,
         and run it inside a command prompt (like ``cmd.exe``).
         
-        - `Windows <https://github.com/mikf/gallery-dl/releases/download/v1.13.6/gallery-dl.exe>`__
-        - `Linux   <https://github.com/mikf/gallery-dl/releases/download/v1.13.6/gallery-dl.bin>`__
+        - `Windows <https://github.com/mikf/gallery-dl/releases/download/v1.14.0/gallery-dl.exe>`__
+        - `Linux   <https://github.com/mikf/gallery-dl/releases/download/v1.14.0/gallery-dl.bin>`__
         
         These executables include a Python 3.8 interpreter
         and all required Python packages.
@@ -110,6 +110,15 @@ Description: ==========
         
             $ snap install gallery-dl
         
+        Chocolatey
+        ----------
+        
+        Windows users that have Chocolatey_ installed can install *gallery-dl* from the Chocolatey Community Packages repository:
+        
+        .. code:: powershell
+        
+            $ choco install gallery-dl
+        
         
         Usage
         =====
@@ -173,7 +182,7 @@ Description: ==========
         +--------------------------------------------+------------------------------------------+
         | Linux                                      | Windows                                  |
         +--------------------------------------------+------------------------------------------+
-        |* ``/etc/gallery-dl.conf``                  |*                                         |
+        |* ``/etc/gallery-dl.conf``                  |* ``%APPDATA%\gallery-dl\config.json``    |
         |* ``${HOME}/.config/gallery-dl/config.json``|* ``%USERPROFILE%\gallery-dl\config.json``|
         |* ``${HOME}/.gallery-dl.conf``              |* ``%USERPROFILE%\gallery-dl.conf``       |
         +--------------------------------------------+------------------------------------------+
@@ -183,6 +192,11 @@ Description: ==========
         
         Values in later configuration files will override previous ones.
         
+        Command line options will override all related settings in the configuration file(s),
+        e.g. using ``--write-metadata`` will enable writing metadata using the default values
+        for all ``postprocessors.metadata.*`` settings, overriding any specific settings in
+        configuration files.
+        
         
         Authentication
         ==============
@@ -190,7 +204,7 @@ Description: ==========
         Username & Password
         -------------------
         
-        Some extractors require you to provide valid login-credentials in the form of
+        Some extractors require you to provide valid login credentials in the form of
         a username & password pair. This is necessary for
         ``pixiv``, ``nijie``, and ``seiga``
         and optional for
@@ -200,16 +214,14 @@ Description: ==========
         You can set the necessary information in your configuration file
         (cf. gallery-dl.conf_)
         
-        .. code::
+        .. code:: json
         
             {
                 "extractor": {
-                    ...
                     "pixiv": {
                         "username": "<username>",
                         "password": "<password>"
                     }
-                    ...
                 }
             }
         
@@ -222,6 +234,49 @@ Description: ==========
             $ gallery-dl -u <username> -p <password> URL
             $ gallery-dl -o username=<username> -o password=<password> URL
         
+        Cookies
+        -------
+        
+        For sites where login with username & password is not possible due to
+        CAPTCHA or similar, or has not been implemented yet, you can use the
+        cookies from a browser login session and input them into *gallery-dl*.
+        
+        This can be done via the
+        `cookies <https://github.com/mikf/gallery-dl/blob/master/docs/configuration.rst#extractorcookies>`__
+        option in your configuration file by specifying
+        
+        - | the path to a Mozilla/Netscape format cookies.txt file exported by a browser addon
+          | (e.g. `cookies.txt <https://chrome.google.com/webstore/detail/cookiestxt/njabckikapfpffapmjgojcnbfjonfjfg>`__ for Chrome,
+            `Export Cookies <https://addons.mozilla.org/en-US/firefox/addon/export-cookies-txt/?src=search>`__ for Firefox)
+        
+        - | a list of name-value pairs gathered from your browser's web developer tools
+          | (in `Chrome <https://developers.google.com/web/tools/chrome-devtools/storage/cookies>`__,
+             in `Firefox <https://developer.mozilla.org/en-US/docs/Tools/Storage_Inspector>`__)
+        
+        For example:
+        
+        .. code:: json
+        
+            {
+                "extractor": {
+                    "instagram": {
+                        "cookies": "$HOME/path/to/cookies.txt"
+                    },
+                    "patreon": {
+                        "cookies": {
+                            "session_id": "K1T57EKu19TR49C51CDjOJoXNQLF7VbdVOiBrC9ye0a"
+                        }
+                    }
+                }
+            }
+        
+        You can also specify a cookies.txt file with
+        the :code:`--cookies` command-line option:
+        
+        .. code:: bash
+        
+            $ gallery-dl --cookies "$HOME/path/to/cookies.txt" URL
+        
         OAuth
         -----
         
@@ -232,7 +287,7 @@ Description: ==========
         which would otherwise be unavailable to a public user.
         
         To link your account to *gallery-dl*, start by invoking it with
-        ``oauth:<site-name>`` as an argument. For example:
+        ``oauth:<sitename>`` as an argument. For example:
         
         .. code:: bash
         
@@ -247,7 +302,7 @@ Description: ==========
         .. _gallery-dl-example.conf: https://github.com/mikf/gallery-dl/blob/master/docs/gallery-dl-example.conf
         .. _configuration.rst:       https://github.com/mikf/gallery-dl/blob/master/docs/configuration.rst
         .. _Supported Sites:         https://github.com/mikf/gallery-dl/blob/master/docs/supportedsites.rst
-        .. _stable:                  https://github.com/mikf/gallery-dl/archive/v1.13.6.tar.gz
+        .. _stable:                  https://github.com/mikf/gallery-dl/archive/v1.14.0.tar.gz
         .. _dev:                     https://github.com/mikf/gallery-dl/archive/master.tar.gz
         
         .. _Python:     https://www.python.org/downloads/
@@ -259,6 +314,7 @@ Description: ==========
         .. _pyOpenSSL:  https://pyopenssl.org/
         .. _Snapd:      https://docs.snapcraft.io/installing-snapd
         .. _OAuth:      https://en.wikipedia.org/wiki/OAuth
+        .. _Chocolatey: https://chocolatey.org/install
         
         .. |pypi| image:: https://img.shields.io/pypi/v/gallery-dl.svg
             :target: https://pypi.org/project/gallery-dl/