From 067eb520f708846ae8161efe6fa0766150358ae3 Mon Sep 17 00:00:00 2001
From: nanometer5088 <code.deleo@simplelogin.com>
Date: Wed, 15 Feb 2023 16:18:18 -0300
Subject: [PATCH] Several new features and fixes!

---
 Docs/assets/load_img.png    | Bin 0 -> 951 bytes
 Docs/assets/repeat_img.png  | Bin 0 -> 800 bytes
 Docs/assets/shuffle_img.png | Bin 0 -> 1987 bytes
 Docs/assets/wipe_img.png    | Bin 0 -> 960 bytes
 m_player.py                 | 126 ++++++++++++++++++++++++++++++++----
 5 files changed, 112 insertions(+), 14 deletions(-)
 create mode 100644 Docs/assets/load_img.png
 create mode 100644 Docs/assets/repeat_img.png
 create mode 100644 Docs/assets/shuffle_img.png
 create mode 100644 Docs/assets/wipe_img.png

diff --git a/Docs/assets/load_img.png b/Docs/assets/load_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..29e6260eaa9760d753fb1949a9a518780048508a
GIT binary patch
literal 951
zcmV;o14#UdP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000AiNkl<ZcwX(B
zyRS__6vkc83W)-Rk|3T1p`eyXlt?rZh5tz*bc9YLQPPkQAtWSJ3JH-23gY>#o4s$&
zoij6Q&3pE>ZgR5kJ$u%yZ+_=nYtK1n--T8B<0Y`5eEb9y5aW=Z0KJ0N-Gkn@IPUDh
z-Ms+%0T}BIAiwbUy4H|-0Q4OYHaI~1w1BJ1tTiB;b4&nDA+-cV3tua=L$h*g1?V@x
ztQNu<hyB4XYXW1EhqnOqH&Jy}%~g{DOe&m_Z8hE15@BUAW#uzl7421$V3i>aSz3Vv
zT-xNNbIy&c0f@VlQ`xz6P-FHr^Ws;x(tv!MKzg+Z4gqlWCep{1X3>38Nk9_kjPCFO
zB9P4>l>)@|oY6UB&2xYxkcyOB2|(PdZNeE#&DKawebkeDnzL^va|4p>b8I;!4w~Ij
zbGo_n;;UM=i3FQKn{z@+Y<5wclW1&~wPl$^&_sQ3LQ1SUq#S@k8?w#bAtg2&&-J_H
z&15Q|hfsUWQ_!4qVoNN<NzXC(khtj>15*L{nz9s5Y>9<9DSDmJfrC01pb$7Y0MQ)2
z#vQ%R=)eKcO&re~t_+2f3lPm?>q&R<{OMLDMtSexab^(k5y!0&Vq%-LE!8_bxnnqS
z564pxdX_>`9h8!LHZ~`qT$&c=Q9uk%1*Cw|Do!1w4pIlD5l{!E@zWlp4pIlD5l{!E
z@w4?H`he-cFzss`_oSr|MYnt}_6!OS4k};bxPMl$3Frk*?lYG30e^23Ei-;lD?sld
zdAlK-ZYJG3K4$`ICA8bT3drvIB`yj`0eKrETiWU%b&xtJeskf!acgm2Eio-IEio;z
z6aq}_WG?fz_keG(xLpO|(A1LwL}EYTv1I`A1;@>W;Y<!t1s-!LCgmUn)Pg{*CVc~m
zE_ArS6iL?+e9<w1^W%=Q2)M-srKsvC*42M5LF2ViXUI+6j}dgVqXni&d4S*(5+j5F
zqWO;C@gzlA2eF5t;i*T*GA6EXR(*G`KEmY3J6LFpg!>3ODTPDhT!22~9Jf)sjWOq9
zR5pmYf}EF`yx(wsqdCU+-Mr)<QyQ$bSV}7k?&gL61(K5k2Z&y-l@7_vKmv#$(VNG)
z`YdMlIun0InoV3PDWGwlmEtDxy2S$x(zM&W%F*xa{IVUgR9h?{>HL!)r+}E3PysQ3
Z{sE?^uu1r(jSBz(002ovPDHLkV1gwiu}S~{

literal 0
HcmV?d00001

diff --git a/Docs/assets/repeat_img.png b/Docs/assets/repeat_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c3d24ff23f0d42a1aa31500737acc18e5523d51
GIT binary patch
literal 800
zcmV+*1K<3KP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0008#Nkl<ZcwX(C
zzb^z)5XW8A3XMqoC=t<XR0=xL2#M(F{3l8}iGoBVqPq~4POCsIAv6-vNCY!-ds*x4
z`!%!s-oBenHj%r1GvE2_cjor&((02<OQ0ou^aKQu!67LC`YzPSS`%xq0PVU1Iky#g
z+3I2o6aWsUEV?HzgQYf>Ac5du+E3W~HTlW)kpl#Tlcm<V2#+DvNLm~LoXR1k0?0Iv
zyq%O1ph_U628bP!EubaHd=}Bnp-Qo>+c@Fdpk$G%Cc^c{plQ`cmyV?A<I^U7%*R-{
zNOjNzRCOP7WenQRZ9Ag~Xb2WQGYE)1gq3?#*9JCiwGRuoI+yt|g21mIy3HC+5s(Rv
zQ{X`4*lWm&9)*G)N{YhQ#{(7Yl9nA#-a%!-aUKo3s0?&$C2(v2^<-P+Pcj0ygMCtQ
z=CQ5H+Afe${-v$VIawwIRF<Ua?(x;1@mK*iC#eFW!pRKOZaSa=sN}8Cc)oD1AkJK|
ziJJ~6t7i;;c!B+cFdUVmCKW&gF5RU9$Usp52_RadiG##J;vgCUaS)B4%ph@)IEY3-
z97N+MGe{gH4x$kd2hsS+3=#)5%t3>o_m!r(*40ieb`8>IJ>?Y>;V;(TJ!93mtQ62C
zsF*J(@x3#U+&#7o#2NrP>OkU#gJFGRM&Te15tZKp<`Aigfe&arDc-;3II~TMgIr2S
z0~JsTaPR>Qd_GFGwJ3m6fO7*>W=h~p!|UEHmI9nF!-vPOd3+qyWH`G}^QOhX?{aYk
zWP)RnJNiRLK;dJi(gn~dELx7fJet5MSpMfBdKW;cyGO~w1<(P|-JqSIC|6&As)aIT
zE`W3wR8dxL5Va2PADV=_0<wYR6Vs$K*!#Z4nC6jh++ZNMS}Y%@Cm>PJbn=j>fRdj{
z9Dq!a@H>z0-$z6@ck+U`0GS|h=BX7Zw{X==+JlPlFBBWOaRX90sfrx6!EUtpIw%Ps
e17!hZ0Q3V%dV{|2pyRy&0000<MNUMnLSTZMrDoIs

literal 0
HcmV?d00001

diff --git a/Docs/assets/shuffle_img.png b/Docs/assets/shuffle_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..28e3706869e196c05b55e4c760b79ed32bc77fa2
GIT binary patch
literal 1987
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
V#%Jz3>EHkW002ovPDHLkV1nM#&1e7s

literal 0
HcmV?d00001

diff --git a/Docs/assets/wipe_img.png b/Docs/assets/wipe_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fcd8d1479648f514c5b4e98ed145951e526e2cb
GIT binary patch
literal 960
zcmV;x13&zUP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000ArNkl<ZcwX(?
zOOFjf6bJAb2_b@ojaW#=cmxR&iC4^EA-;lzh44Y}J&1*sy@gnLi;*Ciu<(q9*jSNB
zkl=sfHZ`rDU8lNFRdpqud%L@C)j7Xg-Ceim&Yhkbi&bEH^sx(!K!1FGO_)~W@vBNU
z0{z2jT(;rKt7fHkpl0N>kF&Md@P#(k3}nJtGI(kQa^d_PJT(G&<J5SF1>w{N6pT|7
zP$!&PfI8#U02GB&I#4uD$v`YPr2?_xlnBI%QyLIEPDwyXa7qD6hEoDiQk>j@lH=qI
z)C*3oK)vDQ2-GW1Za}@`<ODPbPA))$;p6}`D2{ZX!Eq!5iNKKxBnC$!kSH8!K;m#D
z0g1#(0dxtCo@>4yF?l?U$A_(L>Z({AZXj2prY}mIMj%%$fP;R)f}``FNY1w%Q@yij
z<FW?Hw_S^G+%B#FT%$*g($ps%nskUZg)6owA<iH;kj@~RD*+=iDtVt5hXUO|qpPqS
zH8jqF<P&#qb$o$VAfj(dR5$VbWDQ6@K&F%MT>#COj${L(xywPvSbmKC`%6aB0WC+u
z-vbWv7pS|dRHQag$VpZ;d5M+nB_gRnpON62fRWR#`UV@el!l}Nbsasb$rG&Xi$tPx
z8lBrj6cuPaBKpJ-)qS*aBofKz>dFwRyNPxnGy%Nje%aJT)H!ddM{OLBKoSc?Ii0{l
z6G2^Bz{Ug0j`w)J$xt_DGASB}@})zBCW2~N#L8|BhV9(dbuuX)h#cr-`Dg<24v(8P
zI6iYGYQr?))Zt!3{Zp31x7S^+cWMWsxsGMl5S8zhFJv<5ib)iZEf`;%rj6Hlveg0o
z-~WvEs-fwu>$??-({%mTG8*Ya@v@;o+WmI{vf<Eeksnw-VA*I$);5`x=Hq=Yxe1*9
zLO~NjT?zSIXPZolLh3St=pNARRu;N;E})KWGD&S56Q#j;4pJwRCS;%Ulx;F8!mi5*
zY67Rp<UK<clsF-}3cY^LRcXlmF+irc?*t^BqJLIT?f{=6y1kweu0uV#2PL|20zF5j
zI|H)i>^q>_u&SIv&Y)|W2>KMxetr7uT!%Z*J&5F)BO3Z;75ashEDAReC4C6X155TP
z`b>tMDp<O7)77k9R$_zt7usZraW$L@h~m@TnM~Oqm&uZLQU|;Ny?w+&KYK;DGO{bF
ifwBW>2Rs5f-ooF0aE3|4Fad`E0000<MNUMnLSTXnP_<M5

literal 0
HcmV?d00001

diff --git a/m_player.py b/m_player.py
index 649ffcb..2b587c2 100755
--- a/m_player.py
+++ b/m_player.py
@@ -1,3 +1,4 @@
+import random
 import fnmatch
 import os
 import platform
@@ -7,6 +8,8 @@ from tkinter import filedialog
 
 from pygame import mixer
 
+
+
 canvas = tk.Tk()
 canvas.title("Music Player")
 canvas.geometry("600x800")
@@ -20,13 +23,28 @@ elif platform.system() == "Darwin":  # Mac path, I think
         print("Weird Fucking system Bro")
 elif platform.system() == "Linux":  # Linux path
     rootpath = os.path.join(os.path.expanduser("~"), "Music")
-pattern = "*.mp3"
+    
+    
+audio_extensions = ['.mp3', '.wav', '.ogg', '.flac', '.m4a', '.wma', '.aac', '.alac', '.aiff', '.opus']
+
+def is_audio_file(file):
+    return os.path.splitext(file)[1] in audio_extensions
+
+def load_songs():
+    for root, dirnames, filenames in os.walk(rootpath):
+        for filename in filenames:
+            if is_audio_file(filename):
+                listBox.insert(tk.END, filename)
 
 prev_img = tk.PhotoImage(file="Docs/assets/prev_img.png")
 stop_img = tk.PhotoImage(file="Docs/assets/stop_img.png")
 play_img = tk.PhotoImage(file="Docs/assets/play_img.png")
 pause_img = tk.PhotoImage(file="Docs/assets/pause_img.png")
 next_img = tk.PhotoImage(file="Docs/assets/next_img.png")
+shuffle_img = tk.PhotoImage(file="Docs/assets/shuffle_img.png")
+repeat_img = tk.PhotoImage(file="Docs/assets/repeat_img.png")
+wipe_img = tk.PhotoImage(file="Docs/assets/wipe_img.png")
+load_img = tk.PhotoImage(file="Docs/assets/load_img.png")
 
 mixer.init()
 
@@ -34,12 +52,20 @@ mixer.init()
 #It plays the selected music, and if pressed again while playing
 #It plays the music from the start
 def select(): 
-    text_d=listBox.get("anchor")
-    text_d = text_d.rsplit(".", 1)[0]
-    label.config(text=text_d)
-    mixer.music.load(rootpath + "/" + listBox.get("anchor"))
+    global playlist
+    if shuffleButton['text'] == 'Shuffle':
+        selected_song = rootpath + '/' + listBox.get("anchor")
+    else:
+        if not playlist:
+            playlist = list(listBox.get(0, tk.END))
+        selected_song = rootpath + '/' + playlist.pop(0)
+        listBox.delete(0)
+        listBox.insert(tk.END, *playlist)
+
+    mixer.music.load(selected_song)
     mixer.music.play()
-    mixer.music.set_volume(Volumelevel.get() /100)
+    mixer.music.set_volume(Volumelevel.get() / 100)
+    label.config(text=listBox.get("anchor").rsplit(".", 1)[0])
 
 #As the name suggests, this function stops the music from playing
 #And it clears the name of the previous song
@@ -48,6 +74,10 @@ def stop():
     listBox.select_clear("active")
     label.config(text="")
 
+def clear_playlist():
+    stop()
+    listBox.delete(0, tk.END)
+    
 #This function plays the next song of the listed songs
 def play_next():
     next_song = listBox.curselection()
@@ -82,6 +112,22 @@ def play_prev():
     listBox.activate(prev_song)
     listBox.select_set(prev_song)
 
+playlist = []
+
+def shuffle_playlist():
+    global playlist
+    playlist = list(listBox.get(0, tk.END))
+    random.shuffle(playlist)
+    listBox.delete(0, tk.END)
+    for song in playlist:
+        listBox.insert(tk.END, song)
+
+def toggle_repeat():
+    if mixer.music.get_busy():
+        mixer.music.stop()
+    mixer.music.play(-1 if mixer.music.get_volume() else 0, 0)
+    
+
 #This function pauses the music and when pressed again
 #Resumes the music from where it was paused
 def pause_song():
@@ -92,12 +138,17 @@ def pause_song():
         mixer.music.unpause()
         pauseButton["text"] = "Pause"
 
-#This function is still a work in progress
-#But i intend to make it possible to download music
-#To add it to the list
 def add_song():
-    filepath = filedialog.askopenfilename()
-    shutil.copy2(filepath, rootpath)
+    file_path = filedialog.askopenfilename(filetypes=[("Audio Files", "*.mp3;*.wav;*.ogg;*.flac;*.m4a;*.wma;*.aac;*.alac;*.aiff;*.opus")])
+    if file_path:
+        # Check if the selected file is an audio file
+        if not is_audio_file(file_path):
+            messagebox.showerror("Error", "Selected file is not an audio file.")
+            return
+        # Add the selected file to the listbox
+        filename = os.path.basename(file_path)
+        listBox.insert(tk.END, filename)
+
 
 #This function is also a work in progress
 #I intend to make it a slider that controls the volume
@@ -117,6 +168,7 @@ label = tk.Label(
 label.pack(pady=15)
 
 top = tk.Frame(canvas, bg="#6433d6")
+
 top.pack(padx=10, pady=5, anchor="center")
 
 #adds the prev Button to the music player
@@ -143,6 +195,31 @@ stopButton = tk.Button(
 )
 stopButton.pack(pady=15, in_=top, side="left")
 
+
+clearButton = tk.Button(
+    canvas,
+    text="Clear Playlist",
+    image=wipe_img,
+    bg="#6433d6",
+    borderwidth=0,
+    height= 70,
+    command=clear_playlist,
+)
+clearButton.pack(pady=15, in_=top, side="left")
+
+
+loadButton = tk.Button(
+    canvas,
+    text="Load Music",
+    image=load_img,
+    bg="#6433d6",
+    borderwidth=0,
+    height= 70,
+    command=load_songs,
+)
+loadButton.pack(pady=15, in_=top, side="left")
+
+
 #adds the play Button to the music player
 playButton = tk.Button(
     canvas,
@@ -179,6 +256,28 @@ nextButton = tk.Button(
 )
 nextButton.pack(pady=15, in_=top, side="left")
 
+shuffleButton = tk.Button(
+    canvas,
+    text="Shuffle",
+    image=shuffle_img,
+    bg="#6433d6",
+    borderwidth=0,
+    height=70,
+    command=shuffle_playlist,
+)
+shuffleButton.pack(pady=15, in_=top, side="left")
+
+repeatButton = tk.Button(
+    canvas,
+    text="Repeat",
+    image=repeat_img,
+    bg="#6433d6",
+    borderwidth=0,
+    height=70,
+    command=toggle_repeat,
+)
+repeatButton.pack(pady=15, in_=top, side="left")
+
 #adds the volume slider
 Volumelevel = tk.Scale(canvas,from_= 0, to_=100,
                         orient= tk.HORIZONTAL,
@@ -190,6 +289,7 @@ Volumelevel = tk.Scale(canvas,from_= 0, to_=100,
                         )
 Volumelevel.set(50) #puts defalt value of slider to 50
 Volumelevel.pack(pady=15)
+
 #adds the add Button to the music player
 addButton = tk.Button(
     canvas,
@@ -203,9 +303,7 @@ addButton.pack(pady=15, side="left")
 #Generates the list of song
 #Reads the file name and format(mp3)
 #Inserts the songs with the correct format to the list of songs
-for root, dirs, files in os.walk(rootpath):
-    for filename in fnmatch.filter(files, pattern):
-        listBox.insert("end", filename)
+load_songs()
 
 #Loops the code so the Music Player can function                  
 canvas.mainloop()