improve artist shuffle order

osci-pi.py

@@ -39,7 +39,7 @@ import RPi.GPIO as GPIO
 from PIL import ImageFont
 
 basevol = "70"
-debouncems = 200
+debouncems = 100
 
 #fontfile = "/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf"
 fontfile = "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
@@ -81,14 +81,15 @@ def get_artist(fn):
 
 #originalsongs = os.listdir(basedir)
 originalsongs = []
-artists = []
+originalartists = []
 for fn in glob.iglob(os.path.join(basedir, '**', '*.wav'), recursive=True):
     originalsongs.append(fn)
 
     artist = get_artist(fn)
-    if artist not in artists:
-        artists.append(artist)
+    if artist not in originalartists:
+        originalartists.append(artist)
 
+artists = originalartists.copy()
 random.shuffle(artists)
 currentartist = artists[0]
 
@@ -208,10 +209,11 @@ def switch_artist():
     global artists
     global currentartist
 
-    ca = currentartist
-    while currentartist == ca:
+    if len(artists) <= 0:
+        artists = originalartists.copy()
         random.shuffle(artists)
-        currentartist = artists[0]
+
+    currentartist = artists.pop()
 
     switch_track()