From 84bf467d9fece0a6cdc9ff9fe5dd4e97606dd31a Mon Sep 17 00:00:00 2001
From: geoffrey45 <geoffreymungai45@gmail.com>
Date: Wed, 8 Jun 2022 14:24:26 +0300
Subject: [PATCH] fix folder tracks being None

---
 server/app/api/search.py               | 3 ---
 server/app/lib/albumslib.py            | 7 ++-----
 server/app/lib/folderslib.py           | 6 ++++--
 server/app/serializer.py               | 1 -
 src/assets/css/_variables.scss         | 6 ++++--
 src/assets/css/global.scss             | 2 ++
 src/components/FolderView/SongList.vue | 8 ++++----
 7 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/server/app/api/search.py b/server/app/api/search.py
index 9c550cec..52a54ca6 100644
--- a/server/app/api/search.py
+++ b/server/app/api/search.py
@@ -119,9 +119,6 @@ def search_load_more():
     type = request.args.get("type")
     index = int(request.args.get("index"))
 
-    print(type, index)
-    print(len(SEARCH_RESULTS["tracks"]))
-
     if type == "tracks":
         return {
             "tracks": SEARCH_RESULTS["tracks"][index:index + 5],
diff --git a/server/app/lib/albumslib.py b/server/app/lib/albumslib.py
index 1cbee2e2..2bf6d929 100644
--- a/server/app/lib/albumslib.py
+++ b/server/app/lib/albumslib.py
@@ -62,11 +62,8 @@ def find_album(albums: List[models.Album], hash: str) -> int | None:
     while left <= right:
         mid = (left + right) // 2
 
-        try:
-            if albums[mid].hash == hash:
-                return mid
-        except AttributeError:
-            print(albums)
+        if albums[mid].hash == hash:
+            return mid
 
         if albums[mid].hash < hash:
             left = mid + 1
diff --git a/server/app/lib/folderslib.py b/server/app/lib/folderslib.py
index a1998401..bc70f830 100644
--- a/server/app/lib/folderslib.py
+++ b/server/app/lib/folderslib.py
@@ -104,7 +104,9 @@ class getFnF:
         """
         Returns a list of Track objects for each file in the given list.
         """
-        return helpers.UseBisection(api.TRACKS, "filepath", files)()
+        tracks = helpers.UseBisection(api.TRACKS, "filepath", files)()
+        tracks = filter(lambda t: t is not None, tracks)
+        return list(tracks)
 
     def __call__(self) -> Tuple[Track, Folder]:
         try:
@@ -128,4 +130,4 @@ class getFnF:
         folders = [create_folder(dir) for dir in dirs]
         folders = filter(lambda f: f.trackcount > 0, folders)
 
-        return (tracks, folders)
+        return tracks, folders
diff --git a/server/app/serializer.py b/server/app/serializer.py
index b0e5d102..cfae04d5 100644
--- a/server/app/serializer.py
+++ b/server/app/serializer.py
@@ -14,7 +14,6 @@ def date_string_to_time_passed(prev_date: str) -> str:
 
     diff = now - then
     days = diff.days
-    print(days)
 
     if days < 0:
         return "in the future"
diff --git a/src/assets/css/_variables.scss b/src/assets/css/_variables.scss
index 18f37bdb..358be400 100644
--- a/src/assets/css/_variables.scss
+++ b/src/assets/css/_variables.scss
@@ -27,6 +27,7 @@ $gray5: rgb(44, 44, 46);
 
 $red: #FF453A;
 $blue: #0A84FF;
+$darkblue: #055ee2;
 $green: rgb(20, 160, 55);
 $yellow: rgb(255, 214, 10);
 $orange: rgb(255, 159, 10);
@@ -36,9 +37,10 @@ $brown: rgb(172, 142, 104);
 $indigo: #5E5CE6;
 $teal: rgb(64, 200, 224);
 
-// 60 30 10
+
 $primary: $gray4;
-$accent: $indigo;
+$accent: $darkblue;
+$secondary: $gray5;
 $cta: $blue;
 $danger: $red;
 $track-hover: $gray4;
diff --git a/src/assets/css/global.scss b/src/assets/css/global.scss
index ab6589f3..35c60c86 100644
--- a/src/assets/css/global.scss
+++ b/src/assets/css/global.scss
@@ -131,10 +131,12 @@ a {
 
 #acontent {
   grid-area: content;
+  width: 100%;
   max-width: 1504px;
   padding: $small;
   padding-left: 0;
   overflow: auto;
+  margin: 0 auto;
 
   .nav {
     margin: $small;
diff --git a/src/components/FolderView/SongList.vue b/src/components/FolderView/SongList.vue
index 0c75f344..51d3f1d8 100644
--- a/src/components/FolderView/SongList.vue
+++ b/src/components/FolderView/SongList.vue
@@ -10,13 +10,13 @@
       </div>
       <div class="songlist">
         <SongItem
-          v-for="(song, index) in tracks"
-          :key="song.trackid"
-          :song="song"
+          v-for="(track, index) in tracks"
+          :key="track.trackid"
+          :song="track"
           :index="index + 1"
           @updateQueue="updateQueue"
           :isPlaying="queue.playing"
-          :isCurrent="queue.current.trackid == song.trackid"
+          :isCurrent="queue.current.trackid == track.trackid"
         />
       </div>
     </div>