From 4fb8fd52100228788b6464b019b0307ca0b243ab Mon Sep 17 00:00:00 2001 From: KnugiHK <24708955+KnugiHK@users.noreply.github.com> Date: Mon, 18 Jan 2021 16:06:45 +0800 Subject: [PATCH] Fix the MIME type for vCards --- extract.py | 2 +- extract_iphone.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/extract.py b/extract.py index 01f1301..2d672f3 100644 --- a/extract.py +++ b/extract.py @@ -249,7 +249,7 @@ def vcard(db, data): data[row[1]]["messages"][row[0]]["data"] = row[3] + \ "{ The vCard file cannot be displayed here, however it " \ "should be located at " + file_path + "}" - data[row[1]]["messages"][row[0]]["mime"] = "x-vcard" + data[row[1]]["messages"][row[0]]["mime"] = "text/x-vcard" print(f"Gathering vCards...({index + 1}/{total_row_number})", end="\r") diff --git a/extract_iphone.py b/extract_iphone.py index e365adf..8c4b10c 100644 --- a/extract_iphone.py +++ b/extract_iphone.py @@ -74,8 +74,7 @@ def messages(db, data): fallback = None else: fallback = None - data[content[0]]["messages"][content[1] - ]["sender"] = name or fallback + data[content[0]]["messages"][content[1]]["sender"] = name or fallback else: data[content[0]]["messages"][content[1]]["sender"] = None if content[5] == 6: @@ -161,8 +160,7 @@ def media(db, data, media_folder): # data[content[0]]["messages"][content[1]]["data"] = "{The media is missing}" # data[content[0]]["messages"][content[1]]["mime"] = "media" # else: - data[content[0]]["messages"][content[1] - ]["data"] = "{The media is missing}" + data[content[0]]["messages"][content[1]]["data"] = "{The media is missing}" data[content[0]]["messages"][content[1]]["mime"] = "media" if content[6] is not None: data[content[0]]["messages"][content[1]]["caption"] = content[6] @@ -202,7 +200,7 @@ def vcard(db, data): data[row[2]]["messages"][row[1]]["data"] = row[3] + \ "{ The vCard file cannot be displayed here, however it " \ "should be located at " + file_path + "}" - data[row[2]]["messages"][row[1]]["mime"] = "x-vcard" + data[row[2]]["messages"][row[1]]["mime"] = "text/x-vcard" data[row[2]]["messages"][row[1]]["media"] = True print(f"Gathering vCards...({index + 1}/{total_row_number})", end="\r")