diff --git a/CHANGELOG.md b/CHANGELOG.md index c72f9717..a28964cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## Unreleased + ## 1.10.5 - 2019-09-28 ### Additions - `instagram.highlights` option to include highlighted stories when downloading user profiles ([#329](https://github.com/mikf/gallery-dl/issues/329)) diff --git a/README.rst b/README.rst index 27a99caa..29ac4843 100644 --- a/README.rst +++ b/README.rst @@ -230,7 +230,7 @@ access to *gallery-dl*. Authorize it and you will be shown one or more .. _Python: https://www.python.org/downloads/ .. _PyPI: https://pypi.org/ .. _pip: https://pip.pypa.io/en/stable/ -.. _Requests: https://2.python-requests.org/en/master/#requests-http-for-humans +.. _Requests: https://requests.readthedocs.io/en/master/ .. _FFmpeg: https://www.ffmpeg.org/ .. _youtube-dl: https://ytdl-org.github.io/youtube-dl/ .. _pyOpenSSL: https://pyopenssl.org/ diff --git a/docs/configuration.rst b/docs/configuration.rst index 6b4055ea..08243901 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -1574,7 +1574,7 @@ cache.file ---------- =========== ===== Type |Path|_ -Default * |tempfile.gettempdir()|_ + ``".gallery-dl.cache"`` on Windows +Default * |tempfile.gettempdir()|__ + ``".gallery-dl.cache"`` on Windows * (``$XDG_CACHE_HOME`` or ``"~/.cache"``) + ``"/gallery-dl/cache.sqlite3"`` on all other platforms Description Path of the SQLite3 database used to cache login sessions, cookies and API tokens across `gallery-dl` invocations. @@ -1583,6 +1583,8 @@ Description Path of the SQLite3 database used to cache login sessions, this cache. =========== ===== +__ gettempdir_ + ciphers ------- @@ -1848,20 +1850,20 @@ Description An object with the ``name`` of a post-processor and its options. .. _date-format: `extractor.*.date-format`_ .. _deviantart.metadata: extractor.deviantart.metadata_ -.. _.netrc: https://stackoverflow.com/tags/.netrc/info -.. _tempfile.gettempdir(): https://docs.python.org/3/library/tempfile.html#tempfile.gettempdir -.. _requests.request(): https://docs.python-requests.org/en/master/api/#requests.request -.. _timeout: https://docs.python-requests.org/en/latest/user/advanced/#timeouts -.. _verify: https://docs.python-requests.org/en/master/user/advanced/#ssl-cert-verification -.. _Last-Modified: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.29 -.. _`Requests' proxy documentation`: https://2.python-requests.org/en/master/user/advanced/#proxies -.. _format string: https://docs.python.org/3/library/string.html#formatstrings -.. _format strings: https://docs.python.org/3/library/string.html#formatstrings -.. _strptime: https://docs.python.org/3/library/datetime.html#strftime-strptime-behavior -.. _mature_content: https://www.deviantart.com/developers/http/v1/20160316/object/deviation -.. _webbrowser.open(): https://docs.python.org/3/library/webbrowser.html -.. _datetime: https://docs.python.org/3/library/datetime.html#datetime-objects -.. _datetime.max: https://docs.python.org/3/library/datetime.html#datetime.datetime.max -.. _Authentication: https://github.com/mikf/gallery-dl#authentication -.. _OAuth: https://github.com/mikf/gallery-dl#oauth -.. _youtube-dl: https://github.com/ytdl-org/youtube-dl +.. _.netrc: https://stackoverflow.com/tags/.netrc/info +.. _Last-Modified: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.29 +.. _datetime: https://docs.python.org/3/library/datetime.html#datetime-objects +.. _datetime.max: https://docs.python.org/3/library/datetime.html#datetime.datetime.max +.. _format string: https://docs.python.org/3/library/string.html#formatstrings +.. _format strings: https://docs.python.org/3/library/string.html#formatstrings +.. _gettempdir: https://docs.python.org/3/library/tempfile.html#tempfile.gettempdir +.. _strptime: https://docs.python.org/3/library/datetime.html#strftime-strptime-behavior +.. _webbrowser.open(): https://docs.python.org/3/library/webbrowser.html +.. _mature_content: https://www.deviantart.com/developers/http/v1/20160316/object/deviation +.. _Authentication: https://github.com/mikf/gallery-dl#authentication +.. _OAuth: https://github.com/mikf/gallery-dl#oauth +.. _youtube-dl: https://github.com/ytdl-org/youtube-dl +.. _requests.request(): https://requests.readthedocs.io/en/master/api/#requests.request +.. _timeout: https://requests.readthedocs.io/en/master/user/advanced/#timeouts +.. _verify: https://requests.readthedocs.io/en/master/user/advanced/#ssl-cert-verification +.. _`Requests' proxy documentation`: https://requests.readthedocs.io/en/master/user/advanced/#proxies diff --git a/gallery_dl/option.py b/gallery_dl/option.py index 2194e9e4..d3119b70 100644 --- a/gallery_dl/option.py +++ b/gallery_dl/option.py @@ -316,7 +316,8 @@ def build_parser(): "--exec", dest="postprocessors", metavar="CMD", action=AppendCommandAction, const={"name": "exec"}, - help="Execute CMD for each downloaded file", + help=("Execute CMD for each downloaded file. " + "Example: --exec 'magick convert {} {}.png && rm {}'"), ) postprocessor.add_argument( "--ugoira-conv", diff --git a/gallery_dl/version.py b/gallery_dl/version.py index 6303fab9..c579d44f 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,4 +6,4 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "1.10.5" +__version__ = "1.10.6-dev"