From 218295a4c6de1207ca250db7f2a807a6ba17eb6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 27 Oct 2023 17:58:02 +0200 Subject: [PATCH] [twitter] fix avatars without 'date' information (#4696) --- gallery_dl/extractor/twitter.py | 7 +++++-- test/results/twitter.py | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py index 52d962eb..63653c1f 100644 --- a/gallery_dl/extractor/twitter.py +++ b/gallery_dl/extractor/twitter.py @@ -287,8 +287,11 @@ class TwitterExtractor(Extractor): date = text.parse_timestamp( ((tweet_id >> 22) + 1288834974657) // 1000) else: - date = text.parse_datetime( - tweet["created_at"], "%a %b %d %H:%M:%S %z %Y") + try: + date = text.parse_datetime( + tweet["created_at"], "%a %b %d %H:%M:%S %z %Y") + except Exception: + date = util.NONE tget = tweet.get tdata = { diff --git a/test/results/twitter.py b/test/results/twitter.py index fa95a046..6f9efbba 100644 --- a/test/results/twitter.py +++ b/test/results/twitter.py @@ -5,7 +5,7 @@ # published by the Free Software Foundation. from gallery_dl.extractor import twitter -from gallery_dl import exception +from gallery_dl import util, exception __tests__ = ( @@ -522,7 +522,7 @@ The Washington Post writes, "Three weeks after the toxic train derailment in Ohi "#url" : "https://twitter.com/supernaturepics/photo", "#category": ("", "twitter", "avatar"), "#class" : twitter.TwitterAvatarExtractor, - "#pattern" : r"https://pbs\.twimg\.com/profile_images/554585280938659841/FLVAlX18\.jpeg", + "#urls" : "https://pbs.twimg.com/profile_images/554585280938659841/FLVAlX18.jpeg", "date" : "dt:2015-01-12 10:26:49", "extension": "jpeg", @@ -537,6 +537,17 @@ The Washington Post writes, "Three weeks after the toxic train derailment in Ohi "#count" : 0, }, +{ + "#url" : "https://twitter.com/i_n_u/photo", + "#comment" : "old avatar with small ID and no valid 'date' (#4696)", + "#category": ("", "twitter", "avatar"), + "#class" : twitter.TwitterAvatarExtractor, + "#urls" : "https://pbs.twimg.com/profile_images/2946444489/32028c6affdab425e037ff5a6bf77c1d.jpeg", + + "date" : util.NONE, + "tweet_id" : 2946444489, +}, + { "#url" : "https://twitter.com/supernaturepics/header_photo", "#category": ("", "twitter", "background"),