From db983cfc8f739dcda0e69e464adebfe2b19daa70 Mon Sep 17 00:00:00 2001
From: agres <agres.dominik@gmail.com>
Date: Sun, 23 Mar 2025 23:19:12 +0100
Subject: [PATCH] Refactored to own logger

---
 src/gdpr_export.py | 53 ++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/gdpr_export.py b/src/gdpr_export.py
index 319a20c..c75396e 100644
--- a/src/gdpr_export.py
+++ b/src/gdpr_export.py
@@ -1,15 +1,16 @@
 import json
-import logging as log
 import os
 
 from auth import simple_authenticate
 from database_handler import Database, Table
+from logger import LoggerWrapper
 from spotify_api import get_multiple_field_information
 
 # Define the absolute folder path to the folder containing the gdrp retrieved data
 folder_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data', 'gdpr_data')
 # Define the db
 db = Database()
+log = LoggerWrapper()
 
 
 def _read_gdrp_data() -> list:
@@ -20,32 +21,34 @@ def _read_gdrp_data() -> list:
     :return: all_songs_played: A dict with an items field containing all songs played for the user
     """
     all_songs_played = []
+    try:
+        for filename in os.listdir(folder_path):
 
-    for filename in os.listdir(folder_path):
+            if filename.endswith('.json'):
+                file_path = os.path.join(folder_path, filename)
 
-        if filename.endswith('.json'):
-            file_path = os.path.join(folder_path, filename)
+                with open(file_path, 'r') as file:
+                    data = json.load(file)
 
-            with open(file_path, 'r') as file:
-                data = json.load(file)
-
-                for entry in data:
-                    # This removes all podcasts from the list
-                    if entry['spotify_track_uri'] is None:
-                        continue
-                    try:
-                        track = {
-                            'timestamp': entry['ts'],
-                            'id': _extract_id(entry['spotify_track_uri']),
-                            'track_name': entry['master_metadata_track_name'],
-                            'artist_name': entry['master_metadata_album_artist_name'],
-                            'album_name': entry['master_metadata_album_album_name'],
-                            'conn_country': entry['conn_country'],
-                            'ms_played': entry['ms_played']
-                            }
-                        all_songs_played.append(track)
-                    except Exception as e:
-                        print(f'Missing field: {e}')
+                    for entry in data:
+                        # This removes all podcasts from the list
+                        if entry['spotify_track_uri'] is None:
+                            continue
+                        try:
+                            track = {
+                                'timestamp': entry['ts'],
+                                'id': _extract_id(entry['spotify_track_uri']),
+                                'track_name': entry['master_metadata_track_name'],
+                                'artist_name': entry['master_metadata_album_artist_name'],
+                                'album_name': entry['master_metadata_album_album_name'],
+                                'conn_country': entry['conn_country'],
+                                'ms_played': entry['ms_played']
+                                }
+                            all_songs_played.append(track)
+                        except Exception as e:
+                            log.warning(f'Missing field from gdpr data: {e}')
+    except Exception as e:
+        log.error(f'Failed to read gdpr data: {e}')
 
     all_songs_played = sorted(all_songs_played, key=lambda x: x['timestamp'])
     return all_songs_played
@@ -139,7 +142,7 @@ def _insert_data_into_db(all_songs_played: list):
             log.error(f'Failed adding {entry} to database, error {e}')
 
 
-def export_gdpr_data(n_limit: int = 100):
+def export_gdpr_data(n_limit: int = 100) -> None:
     all_songs_played = _read_gdrp_data()
     all_songs_played = all_songs_played[-n_limit:]
     all_songs_catalogued = _populate_ids(all_songs_played)