mirror of
https://github.com/rembo10/headphones.git
synced 2026-07-21 08:24:00 +01:00
Updated file/folder variabled to instead of %variable%. Modified config.html pages tooltips accordingly
This commit is contained in:
@@ -424,8 +424,8 @@
|
|||||||
<input type="text" name="folder_format" value="${config['folder_format']}" size="43" />
|
<input type="text" name="folder_format" value="${config['folder_format']}" size="43" />
|
||||||
<div class="tooltip">
|
<div class="tooltip">
|
||||||
<span>
|
<span>
|
||||||
Use: %Artist%/%artist%, %Album%/%album%, %Year%/%year%, %Type%/%type% (release type) and %First%/%first% (first letter in artist name)
|
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]
|
E.g.: $Type/$First/$artist/$album [$year] = Album/G/girl talk/all day [2010]
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<br /><br />
|
<br /><br />
|
||||||
@@ -435,7 +435,7 @@
|
|||||||
<input type="text" name="file_format" value="${config['file_format']}" size="43" />
|
<input type="text" name="file_format" value="${config['file_format']}" size="43" />
|
||||||
<div class="tooltip">
|
<div class="tooltip">
|
||||||
<span>
|
<span>
|
||||||
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
|
||||||
<span>
|
<span>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -314,12 +314,12 @@
|
|||||||
<h2>Renaming Options:</h2>
|
<h2>Renaming Options:</h2>
|
||||||
<br>
|
<br>
|
||||||
<h3>Folder Format:</h3><input type="text" name="folder_format" value="${config['folder_format']}" size="43"><br>
|
<h3>Folder Format:</h3><input type="text" name="folder_format" value="${config['folder_format']}" size="43"><br>
|
||||||
<i class="smalltext">Use: %Artist%/%artist%, %Album%/%album%, %Year%/%year%, %Type%/%type% (release type) and %First%/%first% (first letter in artist name)<br />
|
<i class="smalltext">Use: $Artist/$artist, $Album/$album, $Year/$year, $Type/$type (release type) and $First/$first (first letter in artist name)<br />
|
||||||
E.g.: %Type%/%First%/%artist%/%album% [%year%] = Album/G/girl talk/all day [2010]</i>
|
E.g.: $Type/$First/$artist/$album [$year] = Album/G/girl talk/all day [2010]</i>
|
||||||
<br><br>
|
<br><br>
|
||||||
<h3>File Format:</h3><input type="text" name="file_format" value="${config['file_format']}" size="43">
|
<h3>File Format:</h3><input type="text" name="file_format" value="${config['file_format']}" size="43">
|
||||||
<br>
|
<br>
|
||||||
<i class="smalltext">Use: %Track%/%track% (track #), %Title%/%title%, %Artist%/%artist%, %Album%/%album% and %Year%/%year%</i>
|
<i class="smalltext">Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</i>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<h2>Miscellaneous:</h2>
|
<h2>Miscellaneous:</h2>
|
||||||
|
|||||||
@@ -314,12 +314,12 @@
|
|||||||
<h2>Renaming Options:</h2>
|
<h2>Renaming Options:</h2>
|
||||||
<br>
|
<br>
|
||||||
<h3>Folder Format:</h3><input type="text" name="folder_format" value="${config['folder_format']}" size="43"><br>
|
<h3>Folder Format:</h3><input type="text" name="folder_format" value="${config['folder_format']}" size="43"><br>
|
||||||
<i class="smalltext">Use: Artist/artist, Album/album, Year/year, Type/type (release type) and First/first (first letter in artist name)<br />
|
<i class="smalltext">Use: $Artist/$artist, $Album/$album, $Year/$year, $Type/$type (release type) and $First/$first (first letter in artist name)<br />
|
||||||
E.g.: Type/First/artist/album [year] = Album/G/girl talk/all day [2010]</i>
|
E.g.: $Type/$First/$artist/$album [$year] = Album/G/girl talk/all day [2010]</i>
|
||||||
<br><br>
|
<br><br>
|
||||||
<h3>File Format:</h3><input type="text" name="file_format" value="${config['file_format']}" size="43">
|
<h3>File Format:</h3><input type="text" name="file_format" value="${config['file_format']}" size="43">
|
||||||
<br>
|
<br>
|
||||||
<i class="smalltext">Use: Track/track (track #), Title/title, Artist/artist, Album/album and Year/year</i>
|
<i class="smalltext">Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</i>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<h2>Miscellaneous:</h2>
|
<h2>Miscellaneous:</h2>
|
||||||
|
|||||||
+20
-20
@@ -366,27 +366,27 @@ def initialize():
|
|||||||
|
|
||||||
from headphones.helpers import replace_all
|
from headphones.helpers import replace_all
|
||||||
|
|
||||||
file_values = { 'Track': '%Track%',
|
file_values = { 'Track': '$Track',
|
||||||
'Title': '%Title%',
|
'Title': '$Title',
|
||||||
'Artist': '%Artist%',
|
'Artist': '$Artist',
|
||||||
'Album': '%Album%',
|
'Album': '$Album',
|
||||||
'Year': '%Year%',
|
'Year': '$Year',
|
||||||
'track': '%track%',
|
'track': '$track',
|
||||||
'title': '%title%',
|
'title': '$title',
|
||||||
'artist': '%artist%',
|
'artist': '$artist',
|
||||||
'album': '%album%',
|
'album': '$album',
|
||||||
'year': '%year%'
|
'year': '$year'
|
||||||
}
|
}
|
||||||
folder_values = { 'Artist': '%Artist%',
|
folder_values = { 'Artist': '$Artist',
|
||||||
'Album': '%Album%',
|
'Album': '$Album',
|
||||||
'Year': '%Year%',
|
'Year': '$Year',
|
||||||
'Type': '%Type%',
|
'Type': '$Type',
|
||||||
'First': '%First%',
|
'First': '$First',
|
||||||
'artist': '%artist%',
|
'artist': '$artist',
|
||||||
'album': '%album%',
|
'album': '$album',
|
||||||
'year': '%year%',
|
'year': '$year',
|
||||||
'type': '%type%',
|
'type': '$type',
|
||||||
'first': '%first%'
|
'first': '$first'
|
||||||
}
|
}
|
||||||
FILE_FORMAT = replace_all(FILE_FORMAT, file_values)
|
FILE_FORMAT = replace_all(FILE_FORMAT, file_values)
|
||||||
FOLDER_FORMAT = replace_all(FOLDER_FORMAT, folder_values)
|
FOLDER_FORMAT = replace_all(FOLDER_FORMAT, folder_values)
|
||||||
|
|||||||
+20
-20
@@ -329,16 +329,16 @@ def moveFiles(albumpath, release, tracks):
|
|||||||
firstchar = sortname[0]
|
firstchar = sortname[0]
|
||||||
|
|
||||||
|
|
||||||
values = { '%Artist%': artist,
|
values = { '$Artist': artist,
|
||||||
'%Album%': album,
|
'$Album': album,
|
||||||
'%Year%': year,
|
'$Year': year,
|
||||||
'%Type%': releasetype,
|
'$Type': releasetype,
|
||||||
'%First%': firstchar,
|
'$First': firstchar,
|
||||||
'%artist%': artist.lower(),
|
'$artist': artist.lower(),
|
||||||
'%album%': album.lower(),
|
'$album': album.lower(),
|
||||||
'%year%': year,
|
'$year': year,
|
||||||
'%type%': releasetype.lower(),
|
'$type': releasetype.lower(),
|
||||||
'%first%': firstchar.lower()
|
'$first': firstchar.lower()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -504,16 +504,16 @@ def renameFiles(albumpath, downloaded_track_list, release):
|
|||||||
else:
|
else:
|
||||||
title = f.title
|
title = f.title
|
||||||
|
|
||||||
values = { '%Track%': tracknumber,
|
values = { '$Track': tracknumber,
|
||||||
'%Title%': title,
|
'$Title': title,
|
||||||
'%Artist%': release['ArtistName'],
|
'$Artist': release['ArtistName'],
|
||||||
'%Album%': release['AlbumTitle'],
|
'$Album': release['AlbumTitle'],
|
||||||
'%Year%': year,
|
'$Year': year,
|
||||||
'%track%': tracknumber,
|
'$track': tracknumber,
|
||||||
'%title%': title.lower(),
|
'$title': title.lower(),
|
||||||
'%artist%': release['ArtistName'].lower(),
|
'$artist': release['ArtistName'].lower(),
|
||||||
'%album%': release['AlbumTitle'].lower(),
|
'$album': release['AlbumTitle'].lower(),
|
||||||
'%year%': year
|
'$year': year
|
||||||
}
|
}
|
||||||
|
|
||||||
ext = os.path.splitext(downloaded_track)[1]
|
ext = os.path.splitext(downloaded_track)[1]
|
||||||
|
|||||||
Reference in New Issue
Block a user