fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-27 18:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve readability while iterating scripts

Browse Source
This commit is contained in:
suhas2go
2016-12-26 23:14:46 +05:30
parent 3849902434
commit df60977d0b
3 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
picard/album.py
View File

@@ -262,25 +262,23 @@ class Album(DataObject, Item):
if not self._requests:
# Prepare parser for user's script
if config.setting["enable_tagger_scripts"]:
for item in config.setting["list_of_scripts"]:
if item[2]:
script = item[3]
if script:
parser = ScriptParser()
for track in self._new_tracks:
# Run tagger script for each track
try:
parser.eval(script, track.metadata)
except:
self.error_append(traceback.format_exc())
# Strip leading/trailing whitespace
track.metadata.strip_whitespace()
# Run tagger script for the album itself
for s_pos, s_name, s_enabled, s_text in config.setting["list_of_scripts"]:
if s_enabled and s_text:
parser = ScriptParser()
for track in self._new_tracks:
# Run tagger script for each track
try:
parser.eval(script, self._new_metadata)
parser.eval(s_text, track.metadata)
except:
self.error_append(traceback.format_exc())
self._new_metadata.strip_whitespace()
# Strip leading/trailing whitespace
track.metadata.strip_whitespace()
# Run tagger script for the album itself
try:
parser.eval(s_text, self._new_metadata)
except:
self.error_append(traceback.format_exc())
self._new_metadata.strip_whitespace()
for track in self.tracks:
for file in list(track.linked_files):

19
picard/track.py
View File

@@ -276,16 +276,15 @@ class NonAlbumTrack(Track):
self._customize_metadata()
run_track_metadata_processors(self.album, m, None, recording)
if config.setting["enable_tagger_scripts"]:
for item in config.setting["list_of_scripts"]:
if item[2]:
script = item[3]
if script:
parser = ScriptParser()
try:
parser.eval(script, m)
except:
log.error(traceback.format_exc())
m.strip_whitespace()
for s_pos, s_name, s_enabled, s_text in config.setting["list_of_scripts"]:
if s_enabled and s_text:
parser = ScriptParser()
try:
parser.eval(s_text, m)
except:
log.error(traceback.format_exc())
m.strip_whitespace()
self.loaded = True
if self.callback:
self.callback()

7
picard/ui/options/renaming.py
View File

@@ -136,11 +136,10 @@ class RenamingOptionsPage(OptionsPage):
}
try:
if config.setting["enable_tagger_scripts"]:
for item in config.setting["list_of_scripts"]:
if item[2]:
script = item[3]
for s_pos, s_name, s_enabled, s_text in config.setting["list_of_scripts"]:
if s_enabled and s_text:
parser = ScriptParser()
parser.eval(script, file.metadata)
parser.eval(s_text, file.metadata)
filename = file._make_filename(file.filename, file.metadata, settings)
if not settings["move_files"]:
return os.path.basename(filename)