enable zip files

app.py

@@ -23,7 +23,7 @@ def fn(files):
     if len(dfs) == 1:
         df = dfs[0]
     else:
-        df = pd.concatenate(dfs)  # TODO: Test this
+        df = pd.concat(dfs, join="inner")
 
     figs = [
         tinder_usage_overview(df),
@@ -64,29 +64,24 @@ def create_with_blocks():
         gr.Markdown(
             """
             # Explore your Tinder data
-            Upload your data.json file and get interactive plots, just like in the example.
-            Upload several files to compare stats.
+            Upload your myData.zip or data.json file and get interactive plots, just like with the provided example file.
+            
+            Upload several files at once to compare different stats.
             """
         )
         with gr.Accordion(
-            "How to get your tinder data file?",
+            "How to get your tinder data files?",
             open=False,
         ):
             gr.Markdown(
                 """
                 To get your data, visit https://www.help.tinder.com/hc/en-us/articles/115005626726-How-do-I-request-a-copy-of-my-personal-data-
-                You can either upload directly the archive, or if you want to avoid uploading sensitive information 
-                (even though it is not processed on our side: you can check the source code!) you can extract
-                the data.json file and remove all the sensitive informations. See below on how to do that.
-                """
-                )
-        with gr.Accordion(
-            "No data is storred on our side. Don't trust us? Expand to see how to cleanup your data!",
-            open=False,
-        ):
-            gr.Markdown(
-                """
-                Keep only numbers using this small python script, then upload public_data.json instead:
+                You shoud then receive a `myData.zip`. You can either upload directly the archive, or
+                you can extract the data.json file and remove all the sensitive informationsyou can to avoid uploading personal informations 
+                (Which we would not look at on our side: you can check the source code!). See below on how to do anonymise your data.json.
+
+
+                Keep only numbers using this small python script, then upload public_data.json instead of data.json or myData.zip:
                 ```python
                 import json
                 file = "./data.json"
@@ -95,7 +90,7 @@ def create_with_blocks():
                 new_data = {}
                 new_data["Usage"] = {k:v for k,v in data["Usage"].items() if k not in ["idfa", "advertising_id"]}
                 with open("./public_data.json", "w") as f:
-                json.dump(new_data, f)
+                    json.dump(new_data, f)
                 ```
                 """
             )
@@ -104,7 +99,7 @@ def create_with_blocks():
                 value="./public_data.json",
                 file_count="multiple",
                 elem_id="upload-element",
-                label="Upload your tinder data.json file(s)",
+                label="Upload your tinder file(s)! Click on the cross at the top-right corner to upload new file(s)!",
             )
         ]
         btn = gr.Button("Explore data!")

tinder_plots.py

@@ -6,6 +6,8 @@ from tqdm.auto import tqdm
 import plotly.graph_objects as go
 import tempfile
 import copy
+import zipfile
+import os
 
 TEMPLATE_PLOT = None  # "ggplot2"
 
@@ -14,8 +16,17 @@ def get_usage_df(file):
     if isinstance(file, tempfile._TemporaryFileWrapper):
         file = file.name
 
-    with open(file) as f:
-        data = json.load(f)
+    if file.endswith(".zip"):
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            with zipfile.ZipFile(file, "r") as zip_ref:
+                zip_ref.extractall(tmp_dir)
+            file = os.path.join(tmp_dir, "data.json")
+            with open(file) as f:
+                data = json.load(f)
+    else:
+        with open(file) as f:
+            data = json.load(f)
+
     new_data = {}
     new_data["date"] = []
     new_data["value"] = []