From 3443143744bc2792832fbc80c5ce5b13e7be1674 Mon Sep 17 00:00:00 2001 From: KnugiHK <24708955+KnugiHK@users.noreply.github.com> Date: Thu, 15 Jun 2023 02:16:53 +0800 Subject: [PATCH] Restore code for downloading media from whatsapp server --- Whatsapp_Chat_Exporter/extract.py | 21 +++++++++++---------- Whatsapp_Chat_Exporter/extract_iphone.py | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Whatsapp_Chat_Exporter/extract.py b/Whatsapp_Chat_Exporter/extract.py index 1ed72b6..ed67227 100644 --- a/Whatsapp_Chat_Exporter/extract.py +++ b/Whatsapp_Chat_Exporter/extract.py @@ -451,16 +451,17 @@ def media(db, data, media_folder): else: message.mime = content["mime_type"] else: - # if "https://mmg" in content[4]: - # try: - # r = requests.get(content[3]) - # if r.status_code != 200: - # raise RuntimeError() - # except: - # data[content[0]]["messages"][content[1]]["data"] = "{The media is missing}" - # data[content[0]]["messages"][content[1]]["media"] = True - # data[content[0]]["messages"][content[1]]["mime"] = "media" - # else: + if False: # Block execution + try: + r = requests.get(content["message_url"]) + if r.status_code != 200: + raise RuntimeError() + except: + message.data = "The media is missing" + message.mime = "media" + message.meta = True + else: + ... message.data = "The media is missing" message.mime = "media" message.meta = True diff --git a/Whatsapp_Chat_Exporter/extract_iphone.py b/Whatsapp_Chat_Exporter/extract_iphone.py index ddc2185..917acb8 100644 --- a/Whatsapp_Chat_Exporter/extract_iphone.py +++ b/Whatsapp_Chat_Exporter/extract_iphone.py @@ -201,15 +201,17 @@ def media(db, data, media_folder): else: message.mime = content["ZVCARDSTRING"] else: - # if "https://mmg" in content["ZVCARDSTRING"]: - # try: - # r = requests.get(content["ZMEDIAURL"]) - # if r.status_code != 200: - # raise RuntimeError() - # except: - # message.data"] = "{The media is missing}" - # message.mime"] = "media" - # else: + if False: # Block execution + try: + r = requests.get(content["ZMEDIAURL"]) + if r.status_code != 200: + raise RuntimeError() + except: + message.data = "The media is missing" + message.mime = "media" + message.meta = True + else: + ... message.data = "The media is missing" message.mime = "media" message.meta = True