Merge pull request #17 from IsakTheHacker/dev

Author: IsakTheHacker

Diff for: Python AT Audio Player/Python_AT_Audio_Player.py

@@ -4,8 +4,9 @@
 import os
 import time
 import random
-import msvcrt
 import json
+import keyboard
+import msvcrt
 import threading as thread
 
 os.environ["PYGAME_HIDE_SUPPORT_PROMPT"] = "hide"
@@ -16,6 +17,7 @@
 scriptDir = os.path.dirname(os.path.realpath(__file__))
 shouldRun = True
 loopSong = False
+loadingAnimation = False
 songLog = []
 standardOptions = {
 	"shuffle": False,
@@ -30,6 +32,11 @@
 pygame.mixer_music.set_endevent(SONG_END)
 
 #Classes
+class PressedCharacter:
+	def __init__(self):
+		self.char = None
+		self.globalChar = keyboard.KeyboardEvent(None, None)
+pressedCharacter = PressedCharacter()
 class PlaylistData:
 	def __init__(self):
 		self.shuffleIndefinitely = False
@@ -41,6 +48,7 @@ def __init__(self, name, path, paused):
 		self.paused = paused
 		self.positionOffset = 0
 		self.playlist = None
+		self.logged = False
 		if self.path != None:
 			self.length = int(pygame.mixer.Sound(self.path).get_length())
 		else:
@@ -49,6 +57,23 @@ def __init__(self, name, path, paused):
 nowPlaying = NowPlaying(None, None, None)		#Standard object for the current playing song
 
 #Functions
+def getChar():
+	while shouldRun:
+		pressedCharacter.char = msvcrt.getwch()
+def loading_animation(str):
+	array = ["/", "—", "\\", "|"]
+	n = 0
+	while loadingAnimation:
+		print("\r" + array[n] + " " + str, end="")
+		time.sleep(0.15)
+		if n == 3:
+			n = 0
+		else:
+			n += 1
+	sys.exit(0)
+def wait():
+	pressedCharacter.char = ""
+	time.sleep(0.2)
 def play(files):
 	if len(files) == 1:
 		type = "song"
@@ -82,6 +107,7 @@ def play(files):
 				nowPlaying.paused = False
 				nowPlaying.length = files[index].length
 				nowPlaying.positionOffset = files[index].positionOffset
+				nowPlaying.logged = False
 
 				#Add to log
 				songLog.append(files[index].path)
@@ -109,6 +135,7 @@ def play(files):
 				nowPlaying.length = None
 				nowPlaying.positionOffset = 0
 				nowPlaying.playlist = None
+				nowPlaying.logged = False
 
 				sys.exit(0)		#Exit thread
 
@@ -129,12 +156,20 @@ def play(files):
 	print("Options file could not be found...")
 pygame.mixer_music.set_volume(options["volume"])
 
+#Prepare some things
+with open(scriptDir + "/play.log","a") as file:
+	file.write(time.strftime("#time: %Y-%m-%d %H:%M:%S\n", time.localtime(time.time())))
+
 #Start standard song
 if options["onStartSong"] != None:
 	files = []
+	loadingAnimation = True
+	thread._start_new_thread(loading_animation, ("Loading playlist!",))
 	for entry in os.scandir(options["onStartSong"]["path"]):
 		if entry.is_file() and entry.name.endswith(".mp3"):
 			files.append(NowPlaying(entry.name, entry.path, False))
+	loadingAnimation = False
+	print("\r", end="")
 	if len(files) > 0:
 		thread._start_new_thread(play, (files,))
 		print("Standard playlist loaded!")
@@ -150,38 +185,65 @@ def saveFiles():
 
 	#Append played songs to log
 	with open(scriptDir + "/play.log","a") as file:
-		file.write(time.strftime("#time: %Y-%m-%d %H:%M:%S\n", time.localtime(time.time())))
-		for song in songLog:
-			file.write(song + "\n")
-
+		if not nowPlaying.logged:
+			file.write(nowPlaying.path + "\n")
+			nowPlaying.logged = True
+
+thread._start_new_thread(getChar, ())
+def setGlobalChar(event):
+	pressedCharacter.globalChar = event
+keyboard.on_press(setGlobalChar)
 while shouldRun:
-	char = msvcrt.getwch()
 
-	if char == "p" and pygame.mixer_music.get_busy():
+	p_event = (pressedCharacter.char == "p") or ((keyboard.is_pressed(76)) and (pressedCharacter.globalChar.is_keypad))		#Trigger on "p" inside console or "5" on numpad (globally)
+	s_event = (pressedCharacter.char == "s") or ((keyboard.is_pressed(77)) and (pressedCharacter.globalChar.is_keypad))		#Trigger on "s" inside console or "6" on numpad (globally)
+	l_event = pressedCharacter.char == "l"
+	i_event = pressedCharacter.char == "i"
+	u_event = pressedCharacter.char == "u"
+	r_event = (pressedCharacter.char == "r") or ((keyboard.is_pressed(75)) and (pressedCharacter.globalChar.is_keypad))		#Trigger on "r" inside console or "4" on numpad (globally)
+	t_event = pressedCharacter.char == "t"
+	g_event = pressedCharacter.char == "g"
+	j_event = pressedCharacter.char == "j"
+	n_event = pressedCharacter.char == "n"
+	h_event = pressedCharacter.char == "h"
+	c_event = pressedCharacter.char == "c"
+	o_event = pressedCharacter.char == "o"
+	e_event = (pressedCharacter.char == "e") or ((keyboard.is_pressed(79)) and (pressedCharacter.globalChar.is_keypad))		#Trigger on "e" inside console or "1" on numpad (globally)
+	q_event = pressedCharacter.char == "q"
+
+	if p_event and pygame.mixer_music.get_busy():
 		pygame.mixer_music.pause()
 		nowPlaying.paused = True
 		print("Paused!")
-	elif char == "p" and not pygame.mixer_music.get_busy():
+		wait()
+	elif p_event and not pygame.mixer_music.get_busy():
 		pygame.mixer_music.unpause()
 		nowPlaying.paused = False
 		print("Unpaused!")
+		wait()
 
-	if char == "s":
+	if s_event:
 		pygame.mixer_music.stop()
 		pygame.mixer_music.unload()
 		nowPlaying.paused = None
 		print("Stopped/Next!")
+		wait()
 
-	if char == "l":
+	if l_event:
 		new_song = input("Type the new song here: ")
 		if os.path.exists(new_song):
+			loadingAnimation = True
+			thread._start_new_thread(loading_animation, ("Loading song!",))
 			song = [NowPlaying(os.path.basename(new_song), os.path.abspath(new_song), False)]
+			loadingAnimation = False
+			print("\r", end="")
 			thread._start_new_thread(play, (song,))
-			print("Song loaded!")
+			print("Song was loaded!")
 		else:
 			print("Song doesn't exist.")
+		wait()
 
-	if char == "i":
+	if i_event:
 		playlist = input("Type the playlist here: ")
 		if os.path.exists(playlist):
 			#if os.path.isfile(playlist):
@@ -193,18 +255,23 @@ def saveFiles():
 			#	pygame.mixer_music.play()
 			if os.path.isdir(playlist):
 				files = []
+				loadingAnimation = True
+				thread._start_new_thread(loading_animation, ("Loading playlist!",))
 				for entry in os.scandir(playlist):
 					if entry.is_file() and entry.name.endswith(".mp3"):
 						files.append(NowPlaying(entry.name, entry.path, False))
+				loadingAnimation = False
+				print("\r", end="")
 				if len(files) > 0:
 					thread._start_new_thread(play, (files,))
-					print("Playlist loaded!")
+					print("Playlist was loaded!")
 				else:
 					print("Directory does not contain any mp3-files")
 		else:
 			print("Playlist doesn't exist.")
+		wait()
 
-	if char == "u":
+	if u_event:
 		print("\nREMAINING SONGS:")
 		if not nowPlaying.path:
 			print("No song is currently loaded!")
@@ -219,23 +286,26 @@ def saveFiles():
 						print(song.name)
 				else:
 					print("The current playing song is the last one.")
+		wait()
 
-	if char == "r":
+	if r_event:
 		pygame.mixer_music.play()
 		if nowPlaying.paused:
 			pygame.mixer_music.pause()
 			nowPlaying.paused = True
 		print("Rewind!")
+		wait()
 
-	if char == "t":
+	if t_event:
 		if loopSong:
 			print("Stop looping current track.")
 			loopSong = False
 		else:
 			print("Looping current track!")
 			loopSong = True
+		wait()
 
-	if char == "g":
+	if g_event:
 		print("\nGOTO POSITION:")
 		seconds = int(pygame.mixer_music.get_pos() / 1000) + nowPlaying.positionOffset
 		print("Position is currently: {}:{}{}. ".format(seconds // 60, (lambda int: "0" if int < 10 else "")(seconds % 60), seconds % 60), end="")
@@ -258,13 +328,15 @@ def saveFiles():
 				pygame.mixer_music.pause()
 				nowPlaying.paused = True
 			print("Go to {} seconds!".format(position))
+		wait()
 
-	if char == "j":
+	if j_event:
 		print("\nJOURNAL:")
 		for song in songLog:
 			print(song)
+		wait()
 
-	if char == "n":
+	if n_event:
 		print("\nNOW PLAYING:")
 		if not nowPlaying.path:
 			print("No song is currently loaded!")
@@ -276,8 +348,9 @@ def saveFiles():
 			print("Length: {}:{}{}".format(nowPlaying.length // 60, (lambda int: "0" if int < 10 else "")(nowPlaying.length % 60), nowPlaying.length % 60))
 			seconds = int(pygame.mixer_music.get_pos() / 1000) + nowPlaying.positionOffset
 			print("Position: {}:{}{}".format(seconds // 60, (lambda int: "0" if int < 10 else "")(seconds % 60), seconds % 60))
+		wait()
 
-	if char == "h":
+	if h_event:
 		print("\nHELP:")
 		print("p - Pause/Unpause")
 		print("s - Stop")
@@ -291,15 +364,17 @@ def saveFiles():
 		print("h - Access this menu")
 		print("e/q - Quit program")
 		print()
+		wait()
 
-	if char == "c":
+	if c_event:
 		print("\nCREDITS:")
 		print("Author: Isak Brynielsson Neri")
 		print("Libs:")
 		print("    Pygame: {}".format(pygame.version.ver))
 		print()
+		wait()
 
-	if char == "o":
+	if o_event:
 		print("\nOPTIONS:")
 		print("v - Change volume!")
 		print("s - Change shuffle setting.")
@@ -357,11 +432,12 @@ def saveFiles():
 			options["shuffleIndefinitely"] = newShuffleIndefinitely
 			print("New shuffle indefinitely settings: {}!\n".format(options["shuffleIndefinitely"]))
 		saveFiles()
+		wait()
 
-	if char == "e":
+	if e_event:
 		print("Bye!\n")
 		shouldRun = False
-	if char == "q":
+	if q_event:
 		print("Goodbye!\n")
 		shouldRun = False