Change some variables' name

This commit is contained in:
KnugiHK
2021-01-18 16:03:55 +08:00
parent 1d614eafb7
commit 8ee07ef65b
2 changed files with 34 additions and 26 deletions

View File

@@ -84,15 +84,13 @@ def messages(db, data):
else: else:
fallback = None fallback = None
data[content[0]]["messages"][content[1] data[content[0]]["messages"][content[1]]["sender"] = name or fallback
]["sender"] = name or fallback
else: else:
data[content[0]]["messages"][content[1]]["sender"] = None data[content[0]]["messages"][content[1]]["sender"] = None
if content[12] is not None: if content[12] is not None:
data[content[0]]["messages"][content[1]]["reply"] = content[12] data[content[0]]["messages"][content[1]]["reply"] = content[12]
data[content[0]]["messages"][content[1] data[content[0]]["messages"][content[1]]["quoted_data"] = content[14]
]["quoted_data"] = content[14]
else: else:
data[content[0]]["messages"][content[1]]["reply"] = None data[content[0]]["messages"][content[1]]["reply"] = None
@@ -216,8 +214,7 @@ def media(db, data, media_folder):
# data[content[0]]["messages"][content[1]]["media"] = True # data[content[0]]["messages"][content[1]]["media"] = True
# data[content[0]]["messages"][content[1]]["mime"] = "media" # data[content[0]]["messages"][content[1]]["mime"] = "media"
# else: # else:
data[content[0]]["messages"][content[1] data[content[0]]["messages"][content[1]]["data"] = "{The media is missing}"
]["data"] = "{The media is missing}"
data[content[0]]["messages"][content[1]]["mime"] = "media" data[content[0]]["messages"][content[1]]["mime"] = "media"
i += 1 i += 1
if i % 100 == 0: if i % 100 == 0:
@@ -269,28 +266,33 @@ def create_html(data, output_folder):
if not os.path.isdir(output_folder): if not os.path.isdir(output_folder):
os.mkdir(output_folder) os.mkdir(output_folder)
for current, i in enumerate(data): for current, contact in enumerate(data):
if len(data[i]["messages"]) == 0: if len(data[contact]["messages"]) == 0:
continue continue
phone_number = i.split('@')[0] phone_number = contact.split('@')[0]
if "-" in i: if "-" in contact:
file_name = "" file_name = ""
else: else:
file_name = phone_number file_name = phone_number
if data[i]["name"] is not None: if data[contact]["name"] is not None:
if file_name != "": if file_name != "":
file_name += "-" file_name += "-"
file_name += data[i]["name"].replace("/", "-") file_name += data[contact]["name"].replace("/", "-")
name = data[i]["name"] name = data[contact]["name"]
else: else:
name = phone_number name = phone_number
safe_file_name = '' safe_file_name = ''
safe_file_name = "".join( safe_file_name = "".join(x for x in file_name if x.isalnum() or x in "- ")
x for x in file_name if x.isalnum() or x in "- ")
with open(f"{output_folder}/{safe_file_name}.html", "w", encoding="utf-8") as f: with open(f"{output_folder}/{safe_file_name}.html", "w", encoding="utf-8") as f:
f.write(template.render(name=name, msgs=data[i]["messages"].values( f.write(
), my_avatar=None, their_avatar=f"WhatsApp/Avatars/{i}.j")) template.render(
name=name,
msgs=data[contact]["messages"].values(),
my_avatar=None,
their_avatar=f"WhatsApp/Avatars/{contact}.j"
)
)
if current % 10 == 0: if current % 10 == 0:
print(f"Creating HTML...({current}/{total_row_number})", end="\r") print(f"Creating HTML...({current}/{total_row_number})", end="\r")

View File

@@ -220,28 +220,34 @@ def create_html(data, output_folder):
if not os.path.isdir(output_folder): if not os.path.isdir(output_folder):
os.mkdir(output_folder) os.mkdir(output_folder)
for current, i in enumerate(data): for current, contact in enumerate(data):
if len(data[i]["messages"]) == 0: if len(data[contact]["messages"]) == 0:
continue continue
phone_number = i.split('@')[0] phone_number = contact.split('@')[0]
if "-" in i: if "-" in contact:
file_name = "" file_name = ""
else: else:
file_name = phone_number file_name = phone_number
if data[i]["name"] is not None: if data[contact]["name"] is not None:
if file_name != "": if file_name != "":
file_name += "-" file_name += "-"
file_name += data[i]["name"].replace("/", "-") file_name += data[contact]["name"].replace("/", "-")
name = data[i]["name"] name = data[contact]["name"]
else: else:
name = phone_number name = phone_number
safe_file_name = '' safe_file_name = ''
safe_file_name = "".join(x for x in file_name if x.isalnum() or x in "- ") safe_file_name = "".join(x for x in file_name if x.isalnum() or x in "- ")
with open(f"{output_folder}/{safe_file_name}.html", "w", encoding="utf-8") as f: with open(f"{output_folder}/{safe_file_name}.html", "w", encoding="utf-8") as f:
f.write(template.render(name=name, msgs=data[i]["messages"].values( f.write(
), my_avatar=None, their_avatar=f"WhatsApp/Avatars/{i}.j")) template.render(
name=name,
msgs=data[contact]["messages"].values(),
my_avatar=None,
their_avatar=f"WhatsApp/Avatars/{contact}.j"
)
)
if current % 10 == 0: if current % 10 == 0:
print(f"Creating HTML...({current}/{total_row_number})", end="\r") print(f"Creating HTML...({current}/{total_row_number})", end="\r")