From 48053cf3ec596b3bde16d5e5808827fb1f03a716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 14 Apr 2025 20:23:52 +0200 Subject: [PATCH] [util] update auto Chrome version --- docs/configuration.rst | 2 +- gallery_dl/util.py | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index 50425c89..93872509 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -664,7 +664,7 @@ Default * ``"gallery-dl/VERSION"``: ``[Danbooru]``, ``mangadex`` * ``"gallery-dl/VERSION (by mikf)"``: ``[E621]`` * ``"Patreon/72.2.28 (Android; Android 14; Scale/2.10)"``: ``patreon`` - * ``"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36"``: ``instagram`` + * ``"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/LATEST.0.0.0 Safari/537.36"``: ``instagram`` * ``"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:LATEST) Gecko/20100101 Firefox/LATEST"``: otherwise Description User-Agent header value used for HTTP requests. diff --git a/gallery_dl/util.py b/gallery_dl/util.py index 857486cc..ba31ea74 100644 --- a/gallery_dl/util.py +++ b/gallery_dl/util.py @@ -690,11 +690,16 @@ class CustomNone(): __repr__ = __str__ -# v128.0 release on 2024-07-09 has ordinal 739076 -# v137.0 release on 2025-04-01 has ordinal 739342 -# 735492 == 739076 - 128 * 28 +# v137.0 release of Firefox on 2025-04-01 has ordinal 739342 # 735506 == 739342 - 137 * 28 +# v135.0 release of Chrome on 2025-04-01 has ordinal 739342 +# 735562 == 739342 - 135 * 28 +# _ord_today = datetime.date.today().toordinal() +# _ff_ver = (_ord_today - 735506) // 28 +# _ch_ver = (_ord_today - 735562) // 28 + _ff_ver = (datetime.date.today().toordinal() - 735506) // 28 +# _ch_ver = _ff_ver - 2 NONE = CustomNone() EPOCH = datetime.datetime(1970, 1, 1) @@ -706,8 +711,8 @@ USERAGENT = "gallery-dl/" + version.__version__ USERAGENT_FIREFOX = ("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:{}.0) " "Gecko/20100101 Firefox/{}.0").format(_ff_ver, _ff_ver) USERAGENT_CHROME = ("Mozilla/5.0 (Windows NT 10.0; Win64; x64) " - "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 " - "Safari/537.36") + "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{}.0.0.0 " + "Safari/537.36").format(_ff_ver - 2) SPECIAL_EXTRACTORS = {"oauth", "recursive", "generic"} GLOBALS = { "contains" : contains,