diff options
Diffstat (limited to 'debian/patches/76_mkdirname_cleanup.patch')
| -rw-r--r-- | debian/patches/76_mkdirname_cleanup.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/debian/patches/76_mkdirname_cleanup.patch b/debian/patches/76_mkdirname_cleanup.patch new file mode 100644 index 0000000..daabd00 --- /dev/null +++ b/debian/patches/76_mkdirname_cleanup.patch @@ -0,0 +1,40 @@ +Clean-up the code in mkdirname(), but don't change any functionality. + +Depends on 73_err_unknown_sub.patch and 74_multi_replace_cleanup.patch + +--- a/jack_utils.py 2007-11-09 19:19:45.000000000 +0100 ++++ b/jack_utils.py 2007-11-09 19:20:53.000000000 +0100 +@@ -168,9 +168,6 @@ + + def mkdirname(names, template): + "generate mkdir-able directory name(s)" +- dirs = template.split(os.path.sep) +- +- dirs2 = [] + if cf['_id3_year'] > 0: + year = `cf['_id3_year']` + else: +@@ -178,16 +175,16 @@ + replacelist = {"a": names[0][0].encode(cf['_charset'], "replace"), + "l": names[0][1].encode(cf['_charset'], "replace"), + "y": year, "g": cf['_id3_genre_txt']} +- for i in dirs: ++ # Process substitution patterns from dir_template ++ subst = template.split(os.path.sep) ++ dirs = [] ++ for i in subst: + x = jack_misc.multi_replace(i, replacelist, "dir_template", unusable_charmap, warn = 2) + exec("x = x" + cf['_char_filter']) +- dirs2.append(x) ++ dirs.append(x) + if cf['_append_year'] and year: +- dirs2[-1] = dirs2[-1] + jack_misc.multi_replace(cf['_append_year'], replacelist, "append-year", warn = 1) +- name = "" +- for i in dirs2: +- name = os.path.join(name, i) +- return dirs2, name ++ dirs[-1] += jack_misc.multi_replace(cf['_append_year'], replacelist, "append-year", warn = 1) ++ return dirs, os.path.join(*dirs) + + def split_dirname(name): + "split path in components" |