diff --git a/clockytracklist.py b/clockytracklist.py index 8141b3a..d0470e6 100644 --- a/clockytracklist.py +++ b/clockytracklist.py @@ -1,63 +1,62 @@ #!/usr/bin/python -import json -import os -import time -import copy +from pathlib import Path -EXTENSIONS=("mp3","ogg","wav","mpa","m4a","flac") +EXTENSIONS=(".mp3",".ogg",".wav",".mpa",".m4a",".flac") class ClockyTracklist: """read and monitor directory with audio files""" - - def __init__(self,path="."): - """do the reading""" + def __init__(self,path=".",recursive=False): + """Read (current or supplied) path for all audio files. Add recursive=True to check all subdirectories too""" + self.recursive=recursive self.path=path self.tracklist=[] - self.pathlist=[] self.count=0 - olddir=os.getcwd() - if(self.path != '.'): - if(not os.path.isdir(self.path)): - print("ERROR: \""+self.path+"\" is not an existing directory") - exit(); - os.chdir(self.path) - - for ent in os.listdir(): - if ent.lower().endswith(EXTENSIONS) and os.access(ent,os.R_OK): - self.tracklist.append(ent) - self.pathlist.append(os.path.join(self.path,ent)) + p=Path(self.path) + if(not p.is_dir()): + print("ERROR: \""+path+"\" is not an directory") + exit(); + + if(self.recursive): + selection='**/*' + else: + selection='*' + for Q in p.glob(selection): + if Q.suffix in EXTENSIONS: #and os.access(Q,os.R_OK): + self.tracklist.append(Q.as_posix()) self.count+=1 - os.chdir(olddir) - - - def Show(self): + def ReadTrackList(self): """Print the list""" - print("Tracklist.path = %s" %self.path) - print("Tracklist.count= %d" %self.count) - print("Tracks:") - for track in self.tracklist: + path=Path(self.path) + if(not path.is_dir()): + print("ERROR: \""+self.path+"\" is not an directory") + exit(); - print (" "+track) - fn=self.path+'\\'+track - if os.access(fn,os.R_OK): - print(fn+"!") - else: - print(fn+"-") - fn=self.path+'/'+track - if os.access(fn,os.R_OK): - print(fn+"!") - else: - print(fn+"-") - - print("Paths:") - for track in self.pathlist: - print (" "+track) - + if(self.recursive): + selection='**/*' + else: + selection='*' + for entry in path.glob(selection): + if entry.suffix in EXTENSIONS: + self.tracklist.append(entry.as_posix()) + self.count+=1 + + + def ShowTrackList(self): + """Print the list""" + print("Tracklist:") + print(" path = %s" %self.path) + print(" recursive = %s" %self.recursive) + print(" count = %d" %self.count) + print(" tracks:") + for track in self.tracklist: + print(" "+track) f=open(track,"r") if(f): - print("OK") f.close() - + + def CheckTrackList(self): + """Check path for filechanges""" + \ No newline at end of file diff --git a/tracktest.py b/tracktest.py index 5751684..4bee807 100644 --- a/tracktest.py +++ b/tracktest.py @@ -2,6 +2,11 @@ import clockytracklist +print("-------------------------------------") +print("-------------------------------------") +tl=clockytracklist.ClockyTracklist("mp3",True) +tl.ShowTrackList() +print("-------------------------------------") +t2=clockytracklist.ClockyTracklist("C:\data",True) +t2.ShowTrackList() -tl=clockytracklist.ClockyTracklist("mp3") -tl.Show()