From bc861d9b6f71c252f45565568ac2adaf51e8e125 Mon Sep 17 00:00:00 2001
From: Raymond <20032256+DominusZhou@users.noreply.github.com>
Date: Fri, 31 Dec 2021 23:19:43 -0800
Subject: [PATCH] Added timezone conversion

---
 README.md            | 7 ++++---
 data_manager.py      | 4 ++--
 linux.py             | 3 ++-
 spotify_rewrapped.py | 5 +++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 3b38e89..cf9c867 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,8 @@ First of all you need to download your Spotify detailed data from the [Spotify p
 2. Unzip.
 3. Run SpotifyRewrappedGUI.exe
 4. Fill the input path (path where your StreamingHistory.json is located) and the output path (where spotify-rewrapped.png will be generated)
-5. Generate
+5. Optionally, fill out your timezone with quotes (otherwise defaults to UTC). [Wikipedia listed timezones under 'TZ Database Name' column.](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)
+6. Generate
 
 ## On Linux
 1. You need to clone this repo (or download as ZIP) and run the python code.
@@ -26,9 +27,9 @@ First of all you need to download your Spotify detailed data from the [Spotify p
     ```
 3. Run linux.py
     ```bash
-    python3 ./linux.py <input_path> <output_path>
+    python3 ./linux.py <input_path> <output_path> <timezone>
     ```
     for example:
     ```bash
-    python3 ./linux.py /mnt/d/spotify_data /mnt/d/images
+    python3 ./linux.py /mnt/d/spotify_data /mnt/d/images 'US/Pacific'
     ```
diff --git a/data_manager.py b/data_manager.py
index 5b3b712..9f9a7b8 100644
--- a/data_manager.py
+++ b/data_manager.py
@@ -4,7 +4,7 @@
 
 class DataManager:
     """It's main responsability is to store the input data and allow querying it"""
-    def __init__(self, files=None):
+    def __init__(self, files=None, timezone='UTC'):
         # Read input files
         self.df = pd.DataFrame()
         for file in files:
@@ -13,7 +13,7 @@ def __init__(self, files=None):
             self.df = pd.concat([self.df, data_frame], axis=0)
 
         # Filter and process data
-        self.df.endTime = pd.to_datetime(self.df.endTime)
+        self.df.endTime = pd.to_datetime(self.df.endTime).dt.tz_localize('UTC').dt.tz_convert(timezone)
         self.df = self.df[self.df.endTime.dt.year == 2021]
         self.df = self.df[self.df.msPlayed > 10000]
 
diff --git a/linux.py b/linux.py
index f57a816..8f459d0 100644
--- a/linux.py
+++ b/linux.py
@@ -4,5 +4,6 @@
 
 input_path = sys.argv[1]
 output_file = sys.argv[2] + '/spotify-rewrapped.png'
+timezone = sys.argv[3] if len(sys.argv) == 4 else 'UTC'
 
-SpotifyRewrapped(path=input_path, output=output_file)
+SpotifyRewrapped(path=input_path, output=output_file, timezone=timezone)
diff --git a/spotify_rewrapped.py b/spotify_rewrapped.py
index 57d2c24..2fd688e 100644
--- a/spotify_rewrapped.py
+++ b/spotify_rewrapped.py
@@ -10,9 +10,10 @@
 class SpotifyRewrapped:
     """Spotify Rewrapped. Main class"""
 
-    def __init__(self, path, output):
+    def __init__(self, path, output, timezone='UTC'):
         self.path = path
         self.output = output
+        self.timezone = timezone
         self.generate()
         self.cleanup()
 
@@ -22,7 +23,7 @@ def generate(self):
         pg = PlotGenerator(path=self.path,
                            style='./resources/spotify.mplstyle',
                            font='./resources/gotham-medium.otf')
-        dm = DataManager(glob.glob(f'{self.path}/StreamingHistory[0-9].json'))
+        dm = DataManager(glob.glob(f'{self.path}/StreamingHistory[0-9].json'), timezone=self.timezone)
 
         # Top artists by hours_played
         top = dm.get_top_n_artists(20)