salt/badwitch
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make regex better, shut eyed3 up

Browse Source
This commit is contained in:
Salt 2020-03-20 22:50:03 -05:00
parent 37c2081627
commit 1e5e8088f3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
badwitch.py
View File

@ -268,8 +268,10 @@ class BadWitch:
# Parse flags # Parse flags
if self.args.debug: if self.args.debug:
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
eyed3.log.level = logging.WARNING
elif self.args.verbose: elif self.args.verbose:
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
eyed3.log.level = logging.WARNING
# Initialize library # Initialize library
libfile = self.args.library or self.dirs.user_data_dir + '/lib.json' libfile = self.args.library or self.dirs.user_data_dir + '/lib.json'
lib = Library(file=libfile) lib = Library(file=libfile)
@ -353,8 +355,8 @@ class BadWitch:
album = cregex.sub('', album) album = cregex.sub('', album)
# Remove junk from track titles # Remove junk from track titles
for regex in [ for regex in [
r'^' + re.escape(artist) + r'[ ]*[-:;~]*[ ]*', # Remove artist from beginning of songs r'^' + re.escape(artist) + r' *[-:;~]* *', # Remove artist from beginning of songs
re.escape('(Audio)') + r'$' # Remove (Audio) from VEVO tracks AUGH r' *\(.*(Official|Video|Audio|Audio|Lyric|VEVO).*\)' # Remove (Offical Audio), (Lyric Video), etc.
]: ]:
cregex = re.compile(regex, re.IGNORECASE) cregex = re.compile(regex, re.IGNORECASE)
for song, songcontent in playlist.items(): for song, songcontent in playlist.items():
@ -449,5 +451,6 @@ class BadWitch:
print('Closing library') print('Closing library')
return return
eyed3.log.level = logging.CRITICAL
badwitch = BadWitch() badwitch = BadWitch()
badwitch.execute() badwitch.execute()