upstream/IPod-Shuffle-4g
1
0
Fork 1
mirror of https://github.com/nims11/IPod-Shuffle-4g.git synced 2025-12-07 07:58:01 +09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add failsafe path operations

Browse source
This commit is contained in:
Nimesh Ghelani 2016-06-08 03:43:32 +05:30
parent e6303ad964
commit 06ce8cb403
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shuffle.py
View file

@ -57,6 +57,16 @@ def exec_exists_in_path(command):
except OSError as e: except OSError as e:
return False return False
def splitpath(path):
return path.split(os.sep)
def get_relpath(path, basepath):
commonprefix = os.sep.join(os.path.commonprefix(map(splitpath, [path, basepath])))
return os.path.relpath(path, commonprefix)
def is_path_prefix(prefix, path):
return prefix == os.sep.join(os.path.commonprefix(map(splitpath, [prefix, path])))
class Text2Speech(object): class Text2Speech(object):
valid_tts = {'pico2wave': True, 'RHVoice': True, 'espeak': True} valid_tts = {'pico2wave': True, 'RHVoice': True, 'espeak': True}
@ -564,8 +574,9 @@ class Shuffler(object):
self.tunessd = TunesSD(self) self.tunessd = TunesSD(self)
for (dirpath, dirnames, filenames) in os.walk(self.path): for (dirpath, dirnames, filenames) in os.walk(self.path):
dirnames.sort() dirnames.sort()
relpath = get_relpath(dirpath, self.path)
# Ignore the speakable directory and any hidden directories # Ignore the speakable directory and any hidden directories
if "iPod_Control/Speakable" not in dirpath and "/." not in dirpath: if not is_path_prefix("iPod_Control/Speakable", relpath) and "/." not in dirpath:
for filename in sorted(filenames, key = lambda x: x.lower()): for filename in sorted(filenames, key = lambda x: x.lower()):
fullPath = os.path.abspath(os.path.join(dirpath, filename)) fullPath = os.path.abspath(os.path.join(dirpath, filename))
if os.path.splitext(filename)[1].lower() in (".mp3", ".m4a", ".m4b", ".m4p", ".aa", ".wav"): if os.path.splitext(filename)[1].lower() in (".mp3", ".m4a", ".m4b", ".m4p", ".aa", ".wav"):