From ad782b7641bb9eb8860d3af90a2aa2b706673dcc Mon Sep 17 00:00:00 2001 From: rembo10 Date: Sat, 14 Apr 2012 15:56:18 +0530 Subject: [PATCH] Updated file/folder variabled to instead of %variable%. Modified config.html pages tooltips accordingly --- data/interfaces/brink/config.html | 6 ++--- data/interfaces/default/config.html | 6 ++--- data/interfaces/remix/config.html | 6 ++--- headphones/__init__.py | 40 ++++++++++++++--------------- headphones/postprocessor.py | 40 ++++++++++++++--------------- 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/data/interfaces/brink/config.html b/data/interfaces/brink/config.html index 01e01af5..28c366f8 100644 --- a/data/interfaces/brink/config.html +++ b/data/interfaces/brink/config.html @@ -424,8 +424,8 @@
- Use: %Artist%/%artist%, %Album%/%album%, %Year%/%year%, %Type%/%type% (release type) and %First%/%first% (first letter in artist name) - E.g.: %Type%/%First%/%artist%/%album% [%year%] = Album/G/girl talk/all day [2010] + Use: $Artist/$artist, $Album/$album, $Year/$year, $Type/$type (release type) and $First/$first (first letter in artist name) + E.g.: $Type/$First/$artist/$album [$year] = Album/G/girl talk/all day [2010]


@@ -435,7 +435,7 @@
- Use: %Track%/%track% (track #), %Title%/%title%, %Artist%/%artist%, %Album%/%album% and %Year%/%year% + Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year
diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index d792924f..f75b5c50 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -314,12 +314,12 @@

Renaming Options:


Folder Format:


- Use: %Artist%/%artist%, %Album%/%album%, %Year%/%year%, %Type%/%type% (release type) and %First%/%first% (first letter in artist name)
- E.g.: %Type%/%First%/%artist%/%album% [%year%] = Album/G/girl talk/all day [2010] + Use: $Artist/$artist, $Album/$album, $Year/$year, $Type/$type (release type) and $First/$first (first letter in artist name)
+ E.g.: $Type/$First/$artist/$album [$year] = Album/G/girl talk/all day [2010]

File Format:


- Use: %Track%/%track% (track #), %Title%/%title%, %Artist%/%artist%, %Album%/%album% and %Year%/%year% + Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year

Miscellaneous:

diff --git a/data/interfaces/remix/config.html b/data/interfaces/remix/config.html index dae45c58..f75b5c50 100644 --- a/data/interfaces/remix/config.html +++ b/data/interfaces/remix/config.html @@ -314,12 +314,12 @@

Renaming Options:


Folder Format:


- Use: Artist/artist, Album/album, Year/year, Type/type (release type) and First/first (first letter in artist name)
- E.g.: Type/First/artist/album [year] = Album/G/girl talk/all day [2010] + Use: $Artist/$artist, $Album/$album, $Year/$year, $Type/$type (release type) and $First/$first (first letter in artist name)
+ E.g.: $Type/$First/$artist/$album [$year] = Album/G/girl talk/all day [2010]

File Format:


- Use: Track/track (track #), Title/title, Artist/artist, Album/album and Year/year + Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year

Miscellaneous:

diff --git a/headphones/__init__.py b/headphones/__init__.py index 427f6c96..408e0a8f 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -366,27 +366,27 @@ def initialize(): from headphones.helpers import replace_all - file_values = { 'Track': '%Track%', - 'Title': '%Title%', - 'Artist': '%Artist%', - 'Album': '%Album%', - 'Year': '%Year%', - 'track': '%track%', - 'title': '%title%', - 'artist': '%artist%', - 'album': '%album%', - 'year': '%year%' + file_values = { 'Track': '$Track', + 'Title': '$Title', + 'Artist': '$Artist', + 'Album': '$Album', + 'Year': '$Year', + 'track': '$track', + 'title': '$title', + 'artist': '$artist', + 'album': '$album', + 'year': '$year' } - folder_values = { 'Artist': '%Artist%', - 'Album': '%Album%', - 'Year': '%Year%', - 'Type': '%Type%', - 'First': '%First%', - 'artist': '%artist%', - 'album': '%album%', - 'year': '%year%', - 'type': '%type%', - 'first': '%first%' + folder_values = { 'Artist': '$Artist', + 'Album': '$Album', + 'Year': '$Year', + 'Type': '$Type', + 'First': '$First', + 'artist': '$artist', + 'album': '$album', + 'year': '$year', + 'type': '$type', + 'first': '$first' } FILE_FORMAT = replace_all(FILE_FORMAT, file_values) FOLDER_FORMAT = replace_all(FOLDER_FORMAT, folder_values) diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py index af5b9a61..462795a4 100644 --- a/headphones/postprocessor.py +++ b/headphones/postprocessor.py @@ -329,16 +329,16 @@ def moveFiles(albumpath, release, tracks): firstchar = sortname[0] - values = { '%Artist%': artist, - '%Album%': album, - '%Year%': year, - '%Type%': releasetype, - '%First%': firstchar, - '%artist%': artist.lower(), - '%album%': album.lower(), - '%year%': year, - '%type%': releasetype.lower(), - '%first%': firstchar.lower() + values = { '$Artist': artist, + '$Album': album, + '$Year': year, + '$Type': releasetype, + '$First': firstchar, + '$artist': artist.lower(), + '$album': album.lower(), + '$year': year, + '$type': releasetype.lower(), + '$first': firstchar.lower() } @@ -504,16 +504,16 @@ def renameFiles(albumpath, downloaded_track_list, release): else: title = f.title - values = { '%Track%': tracknumber, - '%Title%': title, - '%Artist%': release['ArtistName'], - '%Album%': release['AlbumTitle'], - '%Year%': year, - '%track%': tracknumber, - '%title%': title.lower(), - '%artist%': release['ArtistName'].lower(), - '%album%': release['AlbumTitle'].lower(), - '%year%': year + values = { '$Track': tracknumber, + '$Title': title, + '$Artist': release['ArtistName'], + '$Album': release['AlbumTitle'], + '$Year': year, + '$track': tracknumber, + '$title': title.lower(), + '$artist': release['ArtistName'].lower(), + '$album': release['AlbumTitle'].lower(), + '$year': year } ext = os.path.splitext(downloaded_track)[1]