tdeerenberg/Musort
1
1
Fork 0
mirror of https://github.com/tdeerenberg/Musort.git synced 2025-07-16 00:54:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed repeating code

Browse Source
This commit is contained in:
tdeerenberg
2023-01-25 23:42:21 +01:00
parent 3d13b0f54f
commit e7b5fd4416
1 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/musort.py
View File

@ -65,37 +65,21 @@ WMA
MP4/M4A/M4B/M4R/M4V/ALAC/AAX/AAXC""" MP4/M4A/M4B/M4R/M4V/ALAC/AAX/AAXC"""
class Music: class Music:
def get_compatible(self, directory): def get_files(self, directory):
"""Scans the set directory for compatible audio files""" """Scans the set directory for compatible audio files"""
music = [] self.files = list(map(lambda x: os.path.join(os.path.abspath(directory), x),os.listdir(directory)))
all_files = list(map(lambda x: os.path.join(os.path.abspath(directory), x),os.listdir(directory)))
for file in all_files:
match file.split("."):
case [*_, "flac"]:
music.append(file)
case [*_, "mp3"]:
music.append(file)
case [*_, "mp1"]:
music.append(file)
case [*_, "mp2"]:
music.append(file)
case [*_, "opus"]:
music.append(file)
case [*_, "ogg"]:
music.append(file)
case [*_, "wma"]:
music.append(file)
self.directory = directory
self.compatible = music
def get_compatible_recursive(self, directory): def get_files_recursive(self, directory):
"""Scans the set directory with subdirectory for compatible audio files""" """Scans the set directory with subdirectory for compatible audio files"""
files = [] files = []
music = []
for a, b, c in os.walk(directory): for a, b, c in os.walk(directory):
for d in c: for d in c:
files.append(os.path.join(a,d)) files.append(os.path.join(a,d))
for file in files: self.files = files
def get_compatible(self):
music = []
for file in self.files:
match file.split("."): match file.split("."):
case [*_, "flac"]: case [*_, "flac"]:
music.append(file) music.append(file)
@ -111,7 +95,6 @@ class Music:
music.append(file) music.append(file)
case [*_, "wma"]: case [*_, "wma"]:
music.append(file) music.append(file)
self.directory = directory
self.compatible = music self.compatible = music
def set_separator(self, sep): def set_separator(self, sep):
@ -206,7 +189,8 @@ def main():
music.set_separator(arg) music.set_separator(arg)
if opt in ['-r', '--recursive']: if opt in ['-r', '--recursive']:
logging.info("Running recursively") logging.info("Running recursively")
music.get_compatible_recursive(sys.argv[1]) music.get_files_recursive(sys.argv[1])
music.get_compatible()
if sys.argv[1] == "-h" or sys.argv[1] == '--help': if sys.argv[1] == "-h" or sys.argv[1] == '--help':
print(help) print(help)
@ -218,7 +202,8 @@ def main():
music.compatible music.compatible
except: except:
logging.info("Running not recursively") logging.info("Running not recursively")
music.get_compatible(sys.argv[1]) music.get_files(sys.argv[1])
music.get_compatible()
try: try:
music.separator music.separator
except: except: