diff --git a/bin/gui/gui.kv b/bin/gui/gui.kv index 9c78511..37c685e 100644 --- a/bin/gui/gui.kv +++ b/bin/gui/gui.kv @@ -129,7 +129,6 @@ RootScreen: app.root.current = "Showcase" root.manager.transition.direction = "left" - : on_pre_enter: root.screen_updater_start() name: "Showcase" diff --git a/bin/info_handler.py b/bin/info_handler.py new file mode 100644 index 0000000..9df72fc --- /dev/null +++ b/bin/info_handler.py @@ -0,0 +1,17 @@ +import bin.csv_parsers + + +cvr = bin.csv_parsers.CsvRead() +cvw = bin.csv_parsers.CsvWrite() + + +class InfoHandler: + def __init__(self): + pass + + def infohandler(self, infos, path): + print(path, "path") + self.path = f"{path}/songlist.csv" + self.__info_doc = cvr.importing(self.path) + print(self.__info_doc) + print(infos) diff --git a/bin/player.py b/bin/player.py index 747a310..627d459 100644 --- a/bin/player.py +++ b/bin/player.py @@ -3,7 +3,7 @@ import bin.csv_parsers import copy import bin.filepathanalysis import pygame -import time +import bin.info_handler pa = bin.filepathanalysis.PathAnalysis() cvr = bin.csv_parsers.CsvRead() @@ -26,10 +26,13 @@ class Player: else: pygame.init() self.path = cvr.importing("./data/temp.csv").pop(0) - self.__imports = pa.validsonglistcreator(self.path.pop()) + self.pathtr = self.path.pop(0) + self.__imports = pa.validsonglistcreator(self.pathtr) self.playlist = self.__imports.pop(0) + self.playlist.sort() self.playlist_backup = copy.deepcopy(self.playlist) self.information = self.__imports.pop(0) + self.information.sort() mx.init() self.current_playing = self.playlist.pop(0) mx.music.load(self.current_playing) @@ -39,7 +42,12 @@ class Player: def infoupdater(self): self.transmission = [] cvw.write_str("./data/songtemp.csv", [self.current_playing_pos]) - cvw.app_str("./data/songtemp.csv", self.information) + self.__config = cvr.importing("./data/config.csv").pop(0) + if self.__config == ["1"]: + cvw.app_str("./data/songtemp.csv", self.information) + else: + print(self.path, "path") + bin.info_handler.InfoHandler().infohandler(self.information, self.pathtr) def musicmanager(self, inst, other): self.start_playing() diff --git a/data/config.csv b/data/config.csv new file mode 100644 index 0000000..c227083 --- /dev/null +++ b/data/config.csv @@ -0,0 +1 @@ +0 \ No newline at end of file diff --git a/data/songtemp.csv b/data/songtemp.csv index 304c865..573541a 100644 --- a/data/songtemp.csv +++ b/data/songtemp.csv @@ -1,2 +1 @@ 0 -Metaheuristic - Freedom Trail Studio.mp3,Heal You - Freedom Trail Studio.mp3,Straw Squeak.mp3 diff --git a/data/temp.csv b/data/temp.csv index 0ace8cd..1c7ee34 100644 --- a/data/temp.csv +++ b/data/temp.csv @@ -1 +1 @@ -/home/janis/Downloads +/home/janis/Downloads/KB diff --git a/musicplayer.py b/musicplayer.py index 312195a..c7a5be9 100644 --- a/musicplayer.py +++ b/musicplayer.py @@ -10,11 +10,6 @@ from kivy.clock import Clock import bin.csv_parsers import bin.filepathanalysis import bin.player -import pygame -import pygame.mixer as mx -import copy -import time - pl = bin.player.Player() @@ -150,6 +145,7 @@ class ShowcaseS(MDScreen): self.__currents_imp = self.__info.pop(0) self.__currents = int(self.__currents_imp.pop(0)) self.__upcoming = self.__info.pop(0) + self.__upcoming.sort() self.__current = self.__upcoming.pop(self.__currents) self.ids.current_song.text = self.__current[:(len(self.__current) - 4)] if len(self.__upcoming) <= self.__currents: