diff --git a/CHANGELOG.md b/CHANGELOG.md index 61e343d0..49e6d2f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,8 +14,8 @@ - [sexcom] add fallback for empty files ([#2485](https://github.com/mikf/gallery-dl/issues/2485)) - [twitter] improve syndication video selection ([#2354](https://github.com/mikf/gallery-dl/issues/2354)) - [twitter] fix various syndication issues ([#2499](https://github.com/mikf/gallery-dl/issues/2499), [#2354](https://github.com/mikf/gallery-dl/issues/2354)) -- [weibo] fix infinite retries for deleted accounts ([#2521](https://github.com/mikf/gallery-dl/issues/2521)) - [vk] fix extraction ([#2512](https://github.com/mikf/gallery-dl/issues/2512)) +- [weibo] fix infinite retries for deleted accounts ([#2521](https://github.com/mikf/gallery-dl/issues/2521)) - [postprocessor:ugoira] use compatible paths with mkvmerge ([#2487](https://github.com/mikf/gallery-dl/issues/2487)) - [postprocessor:ugoira] do not auto-select the `image2` demuxer ([#2492](https://github.com/mikf/gallery-dl/issues/2492)) diff --git a/docs/configuration.rst b/docs/configuration.rst index afeba881..16e7192e 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -613,9 +613,7 @@ Type Example ``"{id}_{offset}"`` Description - An alternative `format string`__ to build archive IDs with. - -.. __: https://docs.python.org/3/library/string.html#format-string-syntax + An alternative `format string`_ to build archive IDs with. extractor.*.archive-prefix diff --git a/gallery_dl/util.py b/gallery_dl/util.py index 4bb220a0..55491975 100644 --- a/gallery_dl/util.py +++ b/gallery_dl/util.py @@ -22,7 +22,7 @@ import itertools import urllib.parse from http.cookiejar import Cookie from email.utils import mktime_tz, parsedate_tz -from . import text, exception +from . import text, formatter, exception def bencode(num, alphabet="0123456789"): @@ -700,7 +700,7 @@ class DownloadArchive(): self.close = con.close self.cursor = con.cursor() - self.keygen = format_string.format_map + self.keygen = formatter.parse(format_string).format_map self._cache_key = cache_key try: diff --git a/gallery_dl/version.py b/gallery_dl/version.py index 624f2888..cfe5fd99 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.21.2" +__version__ = "1.22.0-dev"