client: implement queuing

package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "animate.css": "^4.1.1",
     "core-js": "^3.6.5",
+    "mitt": "^3.0.0",
     "register-service-worker": "^1.7.1",
     "sass": "^1.44.0",
     "sass-loader": "^10",

server/app/api.py

@@ -1,4 +1,6 @@
+import typing
 from app.models import Folders, Artists
+
 from app.helpers import (
     all_songs_instance,
     convert_one_to_json,
@@ -29,6 +31,7 @@ bp = Blueprint('api', __name__, url_prefix='')
 
 artist_instance = Artists()
 folder_instance = Folders()
+img_path = "http://127.0.0.1:8900/images/thumbnails/"
 
 
 def main_whatever():
@@ -242,26 +245,26 @@ def getArtistData():
 @bp.route("/f/<folder>")
 @cache.cached()
 def getFolderTree(folder: str = None):
-    if folder == "home":
+    try:
-        requested_dir = home_dir
+        req_dir, last_id = folder.split('::')
-
-    else:
-        try:
-            req_dir, last_id = folder.split('::')
-        except (ValueError):
-            req_dir = folder
-            last_id = None
 
         req_dir = req_dir.replace('|', '/')
+        dir_list = req_dir.split('/')
+        requested_dir = os.path.join(home_dir, *dir_list)
 
-        if req_dir:
+        if req_dir == "home":
-            dir_list = req_dir.split('/')
+            requested_dir = home_dir
-            requested_dir = os.path.join(home_dir, *dir_list)
+
+        if last_id == "None":
+            last_id = None
+
+    except:
+        requested_dir = home_dir
+        last_id = None
 
     dir_content = os.scandir(requested_dir)
 
     folders = []
-    files = []
 
     for entry in dir_content:
         if entry.is_dir() and not entry.name.startswith('.'):
@@ -278,20 +281,23 @@ def getFolderTree(folder: str = None):
 
         if entry.is_file():
             if isValidFile(entry.name) == True:
-                songs_array = all_songs_instance.find_songs_by_folder(
+                file = all_songs_instance.find_song_by_path(entry.path)
-                    req_dir, last_id)
-                songs = convert_to_json(songs_array)
-                for song in songs:
-                    song['artists'] = song['artists'].split(', ')
 
-                files = songs
+                if not file:
+                    getTags(entry.path)
 
-    for file in files:
+    songs_array = all_songs_instance.find_songs_by_folder(
-        file['filepath'] = file['filepath'].replace(home_dir, '')
+        req_dir, last_id)
-        
+    songs = convert_to_json(songs_array)
+    for song in songs:
+        song['artists'] = song['artists'].split(', ')
+        song['filepath'] = song['filepath'].replace(home_dir, '')
+        song['image'] = img_path + song['image']
 
+        song['type']['name'] = "folder"
+        song['type']['id'] = req_dir
 
-    return {"files": files, "folders": folders}
+    return {"files": songs, "folders": folders}
 
 
 @bp.route('/image/<img_type>/<image_id>')
@@ -313,3 +319,24 @@ def send_image(img_type, image_id):
         print(img_dir + image)
 
     return send_from_directory(img_dir, image)
+
+
+@bp.route('/get/queue', methods=['POST'])
+def post():
+    args = request.get_json()
+
+    type = args['type']
+    id = args['id']
+
+    if type == "folder":
+        songs = all_songs_instance.find_songs_by_folder_og(id)
+        songs_array = convert_to_json(songs)
+
+        for song in songs_array:
+            song['artists'] = song['artists'].split(', ')
+            song['filepath'] = song['filepath'].replace(home_dir, '')
+            song['image'] = img_path + song['image']
+
+        return {'songs': songs_array}
+
+    return {'msg': 'ok'}

server/app/helpers.py

@@ -54,16 +54,16 @@ def extract_thumb(path):
         return webp_path
 
     if path.endswith('.flac'):
-        audio = FLAC(path)
         try:
+            audio = FLAC(path)
             album_art = audio.pictures[0].data
-        except IndexError:
+        except:
             album_art = None
     elif path.endswith('.mp3'):
-        audio = ID3(path)
         try:
+            audio = ID3(path)
             album_art = audio.getall('APIC')[0].data
-        except IndexError:
+        except:
             album_art = None
 
     if album_art is None:
@@ -91,10 +91,16 @@ def extract_thumb(path):
 
 def getTags(full_path):
     if full_path.endswith('.flac'):
-        audio = FLAC(full_path)
+        try:
+            audio = FLAC(full_path)
+        except:
+            return 
     elif full_path.endswith('.mp3'):
-        audio = MP3(full_path)
+        try:
-
+            audio = MP3(full_path)
+        except:
+            return
+        
     try:
         artists = audio['artist'][0]
     except KeyError:
@@ -122,8 +128,8 @@ def getTags(full_path):
             title = audio['TIT2'][0]
         except:
             title = 'Unknown'
-    except IndexError:
+    except:
-        title = 'Unknown'
+        title = full_path.split('/')[-1]
 
     try:
         album = audio['album'][0]

server/app/models.py

@@ -51,8 +51,7 @@ class AllSongs(Mongo):
 
     def insert_song(self, song_obj):
         self.collection.update_one(
-            {'filepath': song_obj['filepath']}, { "$set": song_obj}, upsert=True)
+            {'filepath': song_obj['filepath']}, {"$set": song_obj}, upsert=True)
-        # self.collection.insert_one(song_obj)
 
     def find_song_by_title(self, query):
         self.collection.create_index([('title', pymongo.TEXT)])
@@ -71,6 +70,9 @@ class AllSongs(Mongo):
         else:
             return self.collection.find({'folder': query, '_id': {'$gt': ObjectId(last_id)}}).limit(limit)
 
+    def find_songs_by_folder_og(self, query):
+        return self.collection.find({'folder': query})
+
     def find_songs_by_artist(self, query):
         return self.collection.find({'artists': {'$regex': query, '$options': 'i'}})
 

src/App.vue

@@ -12,7 +12,7 @@
       <PinnedStuff :collapsed="collapsed" />
     </div>
     <div class="content">
-      <router-view />
+      <router-view @sendQueue="updpateQueue"/>
     </div>
     <div class="r-sidebar">
       <Search
@@ -23,7 +23,7 @@
       <div class="m-np">
         <NowPlaying />
       </div>
-      <UpNext v-model:up_next="up_next" @expandQueue="expandQueue" />
+      <UpNext v-model:up_next="up_next" @expandQueue="expandQueue" :queue="queue"/>
       <RecommendedArtist />
     </div>
   </div>
@@ -51,6 +51,12 @@ export default {
   },
 
   setup() {
+    const queue = ref(JSON.parse(localStorage.getItem("queue")) || []);
+
+    const updpateQueue = (data)=> {
+      queue.value = data;
+    }
+
     const collapsed = ref(true);
 
     function toggleNav() {
@@ -76,12 +82,14 @@ export default {
 
     return {
       toggleNav,
+      updpateQueue,
       collapsed,
       up_next,
       expandQueue,
       expandSearch,
       collapseSearch,
       search,
+      queue,
     };
   },
 };

src/assets/css/global.scss

@@ -129,11 +129,11 @@ a {
   margin-bottom: 0.5em;
 }
 
-@media (max-width: 70em) {
+// @media (max-width: 70em) {
-  .r-sidebar {
+//   .r-sidebar {
-    display: none;
+//     display: none;
-  }
+//   }
-}
+// }
 
 .image {
   background-position: center;

src/components/FolderView/SongList.vue

@@ -2,44 +2,52 @@
   <div class="folder">
     <div class="table rounded" ref="songtitle" v-if="songs.length">
       <table>
-        <tr>
+        <thead>
-          <th>Track</th>
+          <tr>
-          <th>Artist</th>
+            <th>Track</th>
-          <th>Album</th>
+            <th>Artist</th>
-          <th v-if="songTitleWidth > minWidth">Duration</th>
+            <th>Album</th>
-        </tr>
+            <th v-if="songTitleWidth > minWidth">Duration</th>
-        <tr v-for="song in songs" :key="song" @click="playAudio(song.filepath)">
+          </tr>
-          <td :style="{ width: songTitleWidth + 'px' }" class="flex">
+        </thead>
-            <div
+        <tbody>
-              class="album-art rounded image"
+          <tr
-              :style="{
+            v-for="song in songs"
-                backgroundImage: `url(&quot;${image_path + song.image}&quot;)`,
+            :key="song"
-              }"
+            @click="updateQueue(song.type.name, song.type.id)"
-            ></div>
-            <div>
-              <span class="ellip">{{ song.title }}</span>
-            </div>
-          </td>
-          <td :style="{ width: songTitleWidth + 'px' }">
-            <div class="ellip">
-              <span
-                class="artist"
-                v-for="artist in song.artists"
-                :key="artist"
-                >{{ artist }}</span
-              >
-            </div>
-          </td>
-          <td :style="{ width: songTitleWidth + 'px' }">
-            <div class="ellip">{{ song.album }}</div>
-          </td>
-          <td
-            :style="{ width: songTitleWidth + 'px' }"
-            v-if="songTitleWidth > minWidth"
           >
-            {{ `${Math.trunc(song.length / 60)} min` }}
+            <td :style="{ width: songTitleWidth + 'px' }" class="flex">
-          </td>
+              <div
-        </tr>
+                class="album-art rounded image"
+                :style="{
+                  backgroundImage: `url(&quot;${song.image}&quot;)`,
+                }"
+              ></div>
+              <div>
+                <span class="ellip">{{ song.title }}</span>
+              </div>
+            </td>
+            <td :style="{ width: songTitleWidth + 'px' }">
+              <div class="ellip">
+                <span
+                  class="artist"
+                  v-for="artist in putCommas(song.artists)"
+                  :key="artist"
+                  >{{ artist }}</span
+                >
+              </div>
+            </td>
+            <td :style="{ width: songTitleWidth + 'px' }">
+              <div class="ellip">{{ song.album }}</div>
+            </td>
+            <td
+              :style="{ width: songTitleWidth + 'px' }"
+              v-if="songTitleWidth > minWidth"
+            >
+              {{ `${Math.trunc(song.length / 60)} min` }}
+            </td>
+          </tr>
+        </tbody>
       </table>
     </div>
     <div v-else ref="songtitle"></div>
@@ -48,15 +56,17 @@
 
 <script>
 import { ref } from "@vue/reactivity";
+
 import { onMounted, onUnmounted } from "@vue/runtime-core";
 import { playAudio } from "@/composables/playAudio.js";
+import getQueue from "@/composables/getQueue.js";
+import putCommas from "@/composables/perks.js";
 
 export default {
   props: ["songs"],
-  setup() {
+  setup(props, context) {
     const songtitle = ref(null);
     const songTitleWidth = ref(null);
-    const image_path = "http://127.0.0.1:8900/images/thumbnails/";
 
     const minWidth = ref(300);
 
@@ -66,6 +76,11 @@ export default {
       songTitleWidth.value = a > minWidth.value * 4 ? a / 4 : a / 3;
     };
 
+    const updateQueue = async (type, id) => {
+      const queue = await getQueue(type, id);
+      context.emit("updateQueue", queue);
+    };
+
     onMounted(() => {
       resizeSongTitleWidth();
 
@@ -80,7 +95,14 @@ export default {
       });
     });
 
-    return { songtitle, image_path, songTitleWidth, minWidth, playAudio };
+    return {
+      songtitle,
+      songTitleWidth,
+      minWidth,
+      playAudio,
+      updateQueue,
+      putCommas
+    };
   },
 };
 </script>
@@ -103,11 +125,15 @@ export default {
   position: relative;
   margin: 1rem;
 
-  tr {
+  tbody tr {
+    cursor: pointer;
+    transition: all 0.5s ease;
+
     &:hover {
       td {
         background-color: rgba(255, 174, 0, 0.534);
       }
+      transform: scale(0.99);
     }
   }
 }

src/components/LeftSidebar/Navigation.vue

@@ -45,7 +45,7 @@
       </div>
     </router-link>
     <hr />
-    <router-link :to="{ name: 'FolderView', params: { path: '$home' } }">
+    <router-link :to="{ name: 'FolderView', params: { path: 'home' } }">
       <div class="nav-button" id="folders-button">
         <div class="in">
           <div class="nav-icon image" id="folders-icon"></div>
@@ -54,7 +54,7 @@
       </div>
     </router-link>
     <hr />
-    <router-link :to="{ name: 'FolderView', params: { path: '$home' } }">
+    <router-link :to="{ name: 'FolderView', params: { path: 'home' } }">
       <div class="nav-button" id="folders-button">
         <div class="in">
           <div class="nav-icon image" id="settings-icon"></div>

src/components/RightSideBar/UpNext.vue

@@ -14,12 +14,21 @@
     <div>
       <div :class="{ hr: is_expanded }" class="all-items">
         <div :class="{ v0: !is_expanded, v1: is_expanded }" class="scrollable">
-          <div class="song-item h-1" v-for="song in songs" :key="song">
+          <div class="song-item h-1" v-for="song in queue" :key="song">
-            <div class="album-art image"></div>
+            <div
+              class="album-art image"
+              :style="{
+                backgroundImage: `url(&quot;${song.image}&quot;)`,
+              }"
+            ></div>
             <div class="tags">
               <p class="title">{{ song.title }}</p>
               <hr />
-              <p class="artist">{{ song.artist }}</p>
+              <p class="artist">
+                <span v-for="artist in putCommas(song.artists)" :key="artist">{{
+                  artist
+                }}</span>
+              </p>
             </div>
           </div>
         </div>
@@ -30,97 +39,18 @@
 
 <script>
 import { toRefs } from "@vue/reactivity";
+import putCommas from "@/composables/perks.js";
 
 export default {
-  props: ["up_next"],
+  props: ["up_next", "queue"],
-  emits: ["expandQueue"],
   setup(props, { emit }) {
-    const songs = [
-      {
-        title: "Hard to forget",
-        artist: "Sam Hunt",
-      },
-      {
-        title: "Bluebird",
-        artist: "Miranda Lambert",
-      },
-      {
-        title: "I called mama",
-        artist: "Ken Chesseny",
-      },
-      {
-        title: "Bluebird",
-        artist: "Miranda Lambert",
-      },
-      {
-        title: "I called mama",
-        artist: "Ken Chesseny",
-      },
-      {
-        title: "Bluebird",
-        artist: "Miranda Lambert",
-      },
-      {
-        title: "I called mama",
-        artist: "Ken Chesseny",
-      },
-      {
-        title: "Bluebird",
-        artist: "Miranda Lambert",
-      },
-      {
-        title: "I called mama",
-        artist: "Ken Chesseny",
-      },
-      {
-        title: "Bluebird",
-        artist: "Miranda Lambert",
-      },
-      {
-        title: "I called mama",
-        artist: "Ken Chesseny",
-      },
-      {
-        title: "Bluebird",
-        artist: "Miranda Lambert",
-      },
-      {
-        title: "I called mama",
-        artist: "Ken Chesseny",
-      },
-      {
-        title: "Bluebird",
-        artist: "Miranda Lambert",
-      },
-      {
-        title: "I called mama",
-        artist: "Ken Chesseny",
-      },
-      {
-        title: "Bluebird",
-        artist: "Miranda Lambert",
-      },
-      {
-        title: "I called mama",
-        artist: "Ken Chesseny",
-      },
-      {
-        title: "Bluebird",
-        artist: "Miranda Lambert",
-      },
-      {
-        title: "I called mama",
-        artist: "Ken Chesseny",
-      },
-    ];
-
     const is_expanded = toRefs(props).up_next;
 
     let collapse = () => {
       emit("expandQueue");
     };
-
+    
-    return { songs, collapse, is_expanded };
+    return { collapse, is_expanded, putCommas };
   },
 };
 </script>
@@ -177,10 +107,9 @@ export default {
 .up-next .main-item .album-art {
   width: 4.5rem;
   height: 4.5rem;
-  background-color: #ccc;
+  background-image: url(../../assets/images/null.webp);
   margin: 0 0.5rem 0 0;
   border-radius: 0.5rem;
-  background-image: url(../../assets/images/htf.jpeg);
 }
 
 .up-next .main-item .tags hr {
@@ -234,10 +163,9 @@ export default {
 .up-next .all-items .album-art {
   width: 3rem;
   height: 3rem;
-  background-color: #ccc;
   margin: 0 0.5rem 0 0;
   border-radius: 0.5rem;
-  background-image: url(../../assets/images/htf.jpeg);
+  background-image: url(../../assets/images/null.webp);
 }
 
 .up-next .all-items .song-item .artist {

src/composables/car.js

@@ -0,0 +1,5 @@
+const car = () => {
+  return;
+};
+
+export default car;

src/composables/getFiles.js

@@ -12,13 +12,13 @@ const getData = async (path, last_id) => {
   if (last_id) {
     url = `${folders_uri}/f/${encoded_path}::${last_id}`;
   } else {
-    url = url = `${folders_uri}/f/${encoded_path}`;
+    url = url = `${folders_uri}/f/${encoded_path}::None`;
   }
 
   const res = await fetch(url);
 
   if (!res.ok) {
-    const message = `An erro has occured: ${res.status}`;
+    const message = `An error has occured: ${res.status}`;
     throw new Error(message);
   }
 

src/composables/getQueue.js

@@ -0,0 +1,27 @@
+const url = "http://127.0.0.1:9876/get/queue";
+
+const getQueue = async (type, id) => {
+  const res = await fetch(url, {
+    method: "POST",
+    headers: {
+      Accept: "application/json",
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      type: type,
+      id: id,
+    }),
+  });
+
+  if (!res.ok) {
+    const message = `An error has occured: ${res.status}`;
+    throw new Error(message);
+  }
+
+  const data = await res.json();
+  localStorage.setItem("queue", JSON.stringify(data.songs));
+
+  return data.songs;
+};
+
+export default getQueue;

src/composables/perks.js

@@ -0,0 +1,15 @@
+const putCommas = (artists) => {
+  let result = [];
+
+  artists.forEach((i, index, artists) => {
+    if (index !== artists.length - 1) {
+      result.push(i + ", ");
+    } else {
+      result.push(i);
+    }
+  });
+
+  return result;
+};
+
+export default putCommas;

src/main.js

@@ -6,5 +6,11 @@ import router from "./router";
 import "../src/assets/css/global.scss";
 
 import "animate.css";
+import mitt from "mitt";
 
-createApp(App).use(router).mount("#app");
+const emitter = mitt();
+
+const app = createApp(App);
+app.use(router);
+app.provide('emitter', emitter);
+app.mount('#app');

src/views/FolderView.vue

@@ -5,7 +5,7 @@
     </div>
     <div id="scrollable" ref="scrollable">
       <FolderList :folders="folders" />
-      <SongList :songs="songs" />
+      <SongList :songs="songs" @updateQueue="updateQueue" />
     </div>
   </div>
 </template>
@@ -27,7 +27,7 @@ export default {
     FolderList,
     SearchBox,
   },
-  setup() {
+  setup(props, context) {
     const route = useRoute();
     const path = ref(route.params.path);
 
@@ -39,6 +39,10 @@ export default {
     const scrollable = ref(null);
     const loading = ref(false);
 
+    const updateQueue = (queue) => {
+     context.emit("sendQueue", queue);
+    };
+
     onMounted(() => {
       const getPathFolders = (path, last_id) => {
         loading.value = true;
@@ -92,6 +96,7 @@ export default {
       path,
       scrollable,
       loading,
+      updateQueue,
     };
   },
 };

yarn.lock

@@ -5935,6 +5935,11 @@ mississippi@^3.0.0:
     stream-each "^1.1.0"
     through2 "^2.0.0"
 
+mitt@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.0.tgz#69ef9bd5c80ff6f57473e8d89326d01c414be0bd"
+  integrity sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==
+
 mixin-deep@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"