From 6825b77cd24d60f374265a5d6c80c74cfec8a8a2 Mon Sep 17 00:00:00 2001
From: KnugiHK <24708955+KnugiHK@users.noreply.github.com>
Date: Wed, 13 Jan 2021 23:33:40 +0800
Subject: [PATCH] Add a notification of other file type and avatar placeholder

---
 extract.py        |  9 ++++++---
 extract_iphone.py |  9 ++++++---
 whatsapp.html     | 12 ++++++------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/extract.py b/extract.py
index c471ab3..9f02bd9 100644
--- a/extract.py
+++ b/extract.py
@@ -80,7 +80,7 @@ while content is not None:
             if guess is not None:
                 data[content[0]]["messages"][content[1]]["mime"] = guess
             else:
-                data[content[0]]["messages"][content[1]]["mime"] = "image/jpeg"
+                data[content[0]]["messages"][content[1]]["mime"] = "data/data"
         else:
             data[content[0]]["messages"][content[1]]["mime"] = content[4]
     else:
@@ -97,7 +97,7 @@ while content is not None:
         data[content[0]]["messages"][content[1]]["data"] = "{The media is missing}"
         data[content[0]]["messages"][content[1]]["mime"] = "media"
     i += 1
-    if i % 1000 == 0:
+    if i % 100 == 0:
         print(f"Gathering media...({i}/{total_row_number})", end="\r")
     content = c.fetchone()
 print(f"Gathering media...({total_row_number}/{total_row_number})", end="\r")
@@ -132,9 +132,12 @@ for current, i in enumerate(data):
         if file_name != "":
             file_name += "-"
         file_name += data[i]["name"].replace("/", "-")
+        name = data[i]["name"]
+    else:
+        name = phone_number
 
     with open(f"{output_folder}/{file_name}.html", "w", encoding="utf-8") as f:
-        f.write(template.render(name=data[i]["name"] if data[i]["name"] is not None else phone_number, msgs=data[i]["messages"].values()))
+        f.write(template.render(name=name, msgs=data[i]["messages"].values(), my_avatar=None, their_avatar=f"WhatsApp/Avatars/{i}.j"))
     if current % 10 == 0:
         print(f"Creating HTML...({current}/{total_row_number})", end="\r")
     
diff --git a/extract_iphone.py b/extract_iphone.py
index 009797d..489f85d 100644
--- a/extract_iphone.py
+++ b/extract_iphone.py
@@ -79,7 +79,7 @@ while content is not None:
             if guess is not None:
                 data[content[0]]["messages"][content[1]]["mime"] = guess
             else:
-                data[content[0]]["messages"][content[1]]["mime"] = "image/jpeg"
+                data[content[0]]["messages"][content[1]]["mime"] = "data/data"
         else:
             data[content[0]]["messages"][content[1]]["mime"] = content[4]
     else:
@@ -95,7 +95,7 @@ while content is not None:
         data[content[0]]["messages"][content[1]]["data"] = "{The media is missing}"
         data[content[0]]["messages"][content[1]]["mime"] = "media"
     i += 1
-    if i % 1000 == 0:
+    if i % 100 == 0:
         print(f"Gathering media...({i}/{total_row_number})", end="\r")
     content = c.fetchone()
 print(f"Gathering media...({total_row_number}/{total_row_number})", end="\r")
@@ -130,9 +130,12 @@ for current, i in enumerate(data):
         if file_name != "":
             file_name += "-"
         file_name += data[i]["name"].replace("/", "-")
+        name = data[i]["name"]
+    else:
+        name = phone_number
 
     with open(f"{output_folder}/{file_name}.html", "w", encoding="utf-8") as f:
-        f.write(template.render(name=data[i]["name"] if data[i]["name"] is not None else phone_number, msgs=data[i]["messages"].values()))
+        f.write(template.render(name=name, msgs=data[i]["messages"].values(), my_avatar=None, their_avatar=f"WhatsApp/Avatars/{i}.j"))
     if current % 10 == 0:
         print(f"Creating HTML...({current}/{total_row_number})", end="\r")
     
diff --git a/whatsapp.html b/whatsapp.html
index db19c3d..696eab1 100644
--- a/whatsapp.html
+++ b/whatsapp.html
@@ -12,14 +12,14 @@
 		header {
 			position: fixed;
 			z-index: 20;
-			border-bottom: 2px solid #e3e6e8;
+			border-bottom: 2px solid #e3e6e7;
 			font-size: 2em;
 			font-weight: bolder;
 			background-color: white;
 			padding: 20px 0 20px 0;
 		}
 		footer {
-			border-top: 2px solid #e3e6e8;
+			border-top: 2px solid #e3e6e7;
 			font-size: 2em;
 			padding: 20px 0 20px 0;
 		}
@@ -68,14 +68,14 @@
 										<source src="{% filter escape %}{{ msg.data }}{% endfilter %}" />
 									</video>
 									{% elif "/" in msg.mime %}
-										{document}
+										{The file cannot be displayed here, however it should be located at {% filter escape %}{{ msg.data }}{% endfilter %}}
 									{% else %}
 										{% filter escape %}{{ msg.data }}{% endfilter %}
 									{% endif %}
 								{% endif %}
 								</div>
 							</div>
-							<div class="w3-col m2 l2" style="padding-left: 10px"><span>{icon}</span></div>
+							<div class="w3-col m2 l2" style="padding-left: 10px"><img src="{{ my_avatar }}"></div>
 						</div>
 						{% else %}
 						<div class="w3-row">
@@ -83,7 +83,7 @@
 							<div style="text-align: right; color:#70777c;">{{ msg.time }}</div>
 						</div>
 						<div class="w3-row">
-							<div class="w3-col m2 l2"><span>{icon}</span></div>
+							<div class="w3-col m2 l2"><img src="{{ their_avatar }}"></div>
 							<div class="w3-col m10 l10">
 								<div style="text-align: left;">
 								{% if msg.media == false %}
@@ -100,7 +100,7 @@
 										<source src="{% filter escape %}{{ msg.data }}{% endfilter %}" />
 									</video>
 									{% elif "/" in msg.mime %}
-										{document}
+										{The file cannot be displayed here, however it should be located at {% filter escape %}{{ msg.data }}{% endfilter %}}
 									{% else %}
 										{% filter escape %}{{ msg.data }}{% endfilter %}
 									{% endif %}