Mark selected albums as +
Mark as: Wanted Wanted (new only) @@ -47,24 +78,27 @@ %for album in albums: <% %> - - - - + + + + + + %if album['Status'] == 'Skipped': + + %elif album['Status'] == 'Wanted': + + %else: + * + J + %endif + + + - - %if album['Status'] == 'Skipped': - O - %elif album['Status'] == 'Wanted': - N - %else: - * - J - %endif - - - ${artist['ArtistName']} - ${album['AlbumTitle']} + + + ${artist['ArtistName']} + ${album['AlbumTitle']} %endfor @@ -114,18 +148,18 @@ %> - + %if album['Status'] == 'Skipped': - O + O %elif album['Status'] == 'Wanted': - N + N %else: - * - J + * + J %endif @@ -159,29 +193,14 @@ <%def name="javascriptIncludes()"> diff --git a/data/interfaces/brink/artistGrid.html b/data/interfaces/brink/artistGrid.html deleted file mode 100644 index 0a6a85e0..00000000 --- a/data/interfaces/brink/artistGrid.html +++ /dev/null @@ -1,190 +0,0 @@ -<%inherit file="base.html"/> -<%! - from headphones import db -%> - -<%def name="headerIncludes()"> - - - Refresh Artist - Delete Artist - %if artist['Status'] == 'Paused': - Resume Artist - %else: - Pause Artist - %endif - %if artist['IncludeExtras']: - Remove Extras - %else: - Get Extras - %endif - - - - -<%def name="body()"> - - ${artist['ArtistName']} - %if artist['Status'] == 'Loading': - WAlbum information for this artist is currently being loaded - %endif - - - - Mark selected albums as - - Wanted - Wanted (new only) - Skipped - Downloaded - - - - %for album in albums: - <% - %> - - - - - %if album['Status'] == 'Skipped': - O - %elif album['Status'] == 'Wanted': - N - %else: - * - J - %endif - - - ${artist['ArtistName']} - ${album['AlbumTitle']} - - - %endfor - - - - - - Name - Date - Type - Have - Bitrate - - - - %for album in albums: - <% - if album['Status'] == 'Skipped': - grade = 'Z' - elif album['Status'] == 'Wanted': - grade = 'X' - elif album['Status'] == 'Snatched': - grade = 'C' - else: - grade = 'A' - - myDB = db.DBConnection() - totaltracks = len(myDB.select('SELECT TrackTitle from tracks WHERE AlbumID=?', [album['AlbumID']])) - havetracks = len(myDB.select('SELECT TrackTitle from tracks WHERE AlbumID=? AND Location IS NOT NULL', [album['AlbumID']])) + len(myDB.select('SELECT TrackTitle from have WHERE ArtistName like ? AND AlbumTitle LIKE ?', [album['ArtistName'], album['AlbumTitle']])) - - try: - percent = (havetracks*100.0)/totaltracks - if percent > 100: - percent = 100 - except (ZeroDivisionError, TypeError): - percent = 0 - totaltracks = '?' - - avgbitrate = myDB.action("SELECT AVG(BitRate) FROM tracks WHERE AlbumID=?", [album['AlbumID']]).fetchone()[0] - if avgbitrate: - bitrate = str(int(avgbitrate)/1000) + ' kbps' - else: - bitrate = '' - - %> - - - - - - - %if album['Status'] == 'Skipped': - O - %elif album['Status'] == 'Wanted': - N - %else: - * - J - %endif - - - - - ${album['AlbumTitle']} - ${album['ReleaseDate']} - ${album['Type']} - - - ${percent} - - - - - ${bitrate} - - %endfor - - - - - -<%def name="headIncludes()"> - - %if artist['Status'] == 'Loading': - - %endif - - -<%def name="javascriptIncludes()"> - - diff --git a/data/interfaces/brink/artistList.html b/data/interfaces/brink/artistList.html deleted file mode 100644 index 0a6a85e0..00000000 --- a/data/interfaces/brink/artistList.html +++ /dev/null @@ -1,190 +0,0 @@ -<%inherit file="base.html"/> -<%! - from headphones import db -%> - -<%def name="headerIncludes()"> - - - Refresh Artist - Delete Artist - %if artist['Status'] == 'Paused': - Resume Artist - %else: - Pause Artist - %endif - %if artist['IncludeExtras']: - Remove Extras - %else: - Get Extras - %endif - - - - -<%def name="body()"> - - ${artist['ArtistName']} - %if artist['Status'] == 'Loading': - WAlbum information for this artist is currently being loaded - %endif - - - - Mark selected albums as - - Wanted - Wanted (new only) - Skipped - Downloaded - - - - %for album in albums: - <% - %> - - - - - %if album['Status'] == 'Skipped': - O - %elif album['Status'] == 'Wanted': - N - %else: - * - J - %endif - - - ${artist['ArtistName']} - ${album['AlbumTitle']} - - - %endfor - - - - - - Name - Date - Type - Have - Bitrate - - - - %for album in albums: - <% - if album['Status'] == 'Skipped': - grade = 'Z' - elif album['Status'] == 'Wanted': - grade = 'X' - elif album['Status'] == 'Snatched': - grade = 'C' - else: - grade = 'A' - - myDB = db.DBConnection() - totaltracks = len(myDB.select('SELECT TrackTitle from tracks WHERE AlbumID=?', [album['AlbumID']])) - havetracks = len(myDB.select('SELECT TrackTitle from tracks WHERE AlbumID=? AND Location IS NOT NULL', [album['AlbumID']])) + len(myDB.select('SELECT TrackTitle from have WHERE ArtistName like ? AND AlbumTitle LIKE ?', [album['ArtistName'], album['AlbumTitle']])) - - try: - percent = (havetracks*100.0)/totaltracks - if percent > 100: - percent = 100 - except (ZeroDivisionError, TypeError): - percent = 0 - totaltracks = '?' - - avgbitrate = myDB.action("SELECT AVG(BitRate) FROM tracks WHERE AlbumID=?", [album['AlbumID']]).fetchone()[0] - if avgbitrate: - bitrate = str(int(avgbitrate)/1000) + ' kbps' - else: - bitrate = '' - - %> - - - - - - - %if album['Status'] == 'Skipped': - O - %elif album['Status'] == 'Wanted': - N - %else: - * - J - %endif - - - - - ${album['AlbumTitle']} - ${album['ReleaseDate']} - ${album['Type']} - - - ${percent} - - - - - ${bitrate} - - %endfor - - - - - -<%def name="headIncludes()"> - - %if artist['Status'] == 'Loading': - - %endif - - -<%def name="javascriptIncludes()"> - - diff --git a/data/interfaces/brink/base.html b/data/interfaces/brink/base.html index 6c38cb14..f1dea383 100644 --- a/data/interfaces/brink/base.html +++ b/data/interfaces/brink/base.html @@ -22,30 +22,30 @@ + - - - - - + + + - - - + + + + - + ${next.headIncludes()} ${next.javascriptIncludes()} @@ -58,53 +58,50 @@ + + $("#commits-behind").fadeIn('slow').text("${headphones.COMMITS_BEHIND}"); % elif headphones.CURRENT_VERSION != headphones.LATEST_VERSION and headphones.INSTALL_TYPE != 'win': - + $("#commits-behind").fadeIn('slow').text("(${headphones.COMMITS_BEHIND})"); + % else: + $("#commits-behind").hide() % endif - - + }); + - - - - + + + Artist + + + + N Upcoming + + + + R Suggestions + + + + _ Manage + + + + Z History + + + + a Logs + + + + S Settings + + + @@ -112,46 +109,13 @@ Album - + ${next.headerIncludes()} - - - - UHome - - - - NUpcoming - - - - RSuggestions - - - - _Manage - - - - ZHistory - - - - aLogs - - - - SSettings - - - - - ${next.body()} @@ -161,14 +125,16 @@ - IWanted Albums - UActive Artists - JPost-Process - VUpdate + I Wanted Albums + U Active Artists + J Post-Process + V Update + + - JRestart - XShut Down + J Restart + X Shut Down diff --git a/data/interfaces/brink/config.html b/data/interfaces/brink/config.html index bd7ba0b1..7aceed00 100644 --- a/data/interfaces/brink/config.html +++ b/data/interfaces/brink/config.html @@ -11,24 +11,38 @@ <%def name="body()"> - + + + + Settings Jump Menu + + Web Interface + Download Settings + I Quality & Post Processing + Advanced Settings + Notifications + + + Save Changes + + - CWeb Interface - WWeb Interface changes require a restart to take effect + CWeb Interface + WWeb Interface changes require a restart to take effect HTTP - Basic settings for Headphones. + Basic settings for Headphones. Host: - Localhost or 0.0.0.0 + Localhost or 0.0.0.0 @@ -37,7 +51,7 @@ Port: - Default is: 8181 + Default is: 8181 @@ -46,7 +60,7 @@ Username: - Enter a desired username at login, or leave blank for none. + Enter a desired username at login, or leave blank for none. @@ -55,7 +69,7 @@ Password: - Enter a desired password at login, or leave blank for none. + Enter a desired password at login, or leave blank for none. @@ -64,11 +78,10 @@ Launch browser: - Enabling this feature will open Headphones at startup. + Enabling this feature will open Headphones at startup. - @@ -76,7 +89,7 @@ Interface: - Choose from a verity of different themes + Choose from a verity of different themes @@ -98,12 +111,12 @@ API: - Enabled/Disabled - + Enabled/Disabled + - + - Visit Drepo for more information. + Visit Drepo for more information. @@ -113,14 +126,14 @@ - PScan Intervals + PScan Intervals - NZB Search: - + NZB Search: + @@ -136,8 +149,8 @@ - Download folder scan every: - + Download folder scan every: + @@ -150,8 +163,8 @@ - Library scan: - + Library scan: + @@ -167,9 +180,9 @@ - - uDownload Settings - Setup SABnzbd or BitTorrent + + uDownload Settings + Setup SABnzbd or BitTorrent @@ -177,25 +190,25 @@ SABnzbd - + Host: - Usually http://localhost:8080 + Usually http://localhost:8080 Username: - Type the user name for SABnzbd + Type the user name for SABnzbd Password: - Enter the password for SABnzbd + Enter the password for SABnzbd @@ -205,14 +218,14 @@ Category: - Write the category label name from SABnzbd + Write the category label name from SABnzbd Download Directory: - Full path to the directory where SAB downloads your music. + Full path to the directory where SAB downloads your music. @@ -224,13 +237,13 @@ - ~Torrents + ~Torrents Black Hole Directory: - Folder your Download program watches for NZBs + Folder your Download program watches for NZBs @@ -238,14 +251,14 @@ Usenet Retention: - Binary retention time + Binary retention time Black Hole Directory: - Folder your Download program watches for Torrents + Folder your Download program watches for Torrents @@ -253,14 +266,14 @@ Minimum seeders: - Number of minimum seeders a torrent must have to be accepted + Number of minimum seeders a torrent must have to be accepted Music Download Directory: - Full path to the directory where your torrent client downloads your music i.e. /Users/name/Downloads/music + Full path to the directory where your torrent client downloads your music i.e. /Users/name/Downloads/music @@ -272,18 +285,20 @@ - LSearch Providers - "We provide you with a automated search service to locate binary files/secgments that can be found on the public access network called Usenet." + L Search Providers + "We provide you with a automated search service to locate binary files/secgments that can be found on the public access network called Usenet." - DNZBMatrix - Enabled/Disabled + DNZBMatrix + Enabled/Disabled - + + + Username: @@ -299,18 +314,54 @@ - DNewznab - Enabled/Disabled + DNewznab + Enabled/Disabled - Host: - - - - API: - + + + + Newznab Host + + e.g. http://nzb.su + + + Newznab API + + + + + Enabled + + + <% + newznab_number = 1 + %> + %for newznab in config['extra_newznabs']: + + + Newznab Host: + + + + Newznab API: + + + + Enabled + + + + + + <% + newznab_number += 1 + %> + %endfor + + @@ -319,10 +370,10 @@ - DNzbs - + DNzbs + - + @@ -337,8 +388,8 @@ - DNewzbin - Enabled/Disabled + DNewzbin + Enabled/Disabled @@ -362,7 +413,7 @@ BitTorrent: - A peer-to-peer file sharing (P2P) communications protocol + A peer-to-peer file sharing (P2P) communications protocol @@ -383,12 +434,12 @@ - IQuality & Post Processing - + I Quality & Post Processing + Album Quality: - + @@ -419,7 +470,7 @@ Post Processing: - + @@ -446,7 +497,7 @@ Music Folder: - i.e. /Users/name/Music/iTunes or /Volumes/share/music + i.e. /Users/name/Music/iTunes or /Volumes/share/music @@ -454,22 +505,22 @@ - SAdvanced Settings + SAdvanced Settings - TRenaming + TRenaming 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 @@ -478,15 +529,15 @@ - FMiscellaneous - Customize what HP + FMiscellaneous + Customize what HP Automatically: - EPs, Compilations, Live Albums, Remix Albums and Singles + EPs, Compilations, Live Albums, Remix Albums and Singles @@ -514,7 +565,7 @@ Re-Encoding Options - Re-encode downloads during postprocessing.This option requires the lame or ffmpeg encoder. + Re-encode downloads during postprocessing.This option requires the lame or ffmpeg encoder. @@ -634,7 +685,7 @@ Advanced Encoding Options: - Ignores audio properties + Ignores audio properties @@ -648,13 +699,13 @@ - WNotifications - + W Notifications + Prowl Options - Enabled/Disabled + Enabled/Disabled @@ -677,7 +728,7 @@ XBMC - Enabled/Disabled + Enabled/Disabled @@ -685,7 +736,7 @@ XBMC Host: - e.g. http://localhost:8080. Separate hosts with commas + e.g. http://localhost:8080. Separate hosts with commas @@ -713,7 +764,7 @@ Notify My Android - Enabled/Disabled + Enabled/Disabled @@ -721,7 +772,7 @@ NotifyMyAndroid API Key: - Separate multiple api keys with ",". + Separate multiple api keys with ",". @@ -759,10 +810,13 @@ - + + Synology NAS + Enable Synoindex + - KMirror + KMirror @@ -805,7 +859,7 @@ Headphones Server - DGet an Account + DGet an Account @@ -824,7 +878,6 @@ - @@ -832,89 +885,39 @@ <%def name="javascriptIncludes()"> + - + \ No newline at end of file diff --git a/data/interfaces/brink/index.html b/data/interfaces/brink/index.html index aa663c63..3e2f841a 100644 --- a/data/interfaces/brink/index.html +++ b/data/interfaces/brink/index.html @@ -4,6 +4,44 @@ %> <%def name="body()"> + + + Viewport + + + + %for artist in artists: + <% + totaltracks = artist['TotalTracks'] + havetracks = artist['HaveTracks'] + if not havetracks: + havetracks = 0 + try: + percent = (havetracks*100.0)/totaltracks + if percent > 100: + percent = 100 + except (ZeroDivisionError, TypeError): + percent = 0 + totaltracks = '?' + %> + + + + + %if artist['Status'] == 'Loading': + + %else: + ${havetracks}/${totaltracks} + %endif + + + + ${artist['ArtistName']} + + + %endfor + + @@ -48,33 +86,34 @@ grade = 'X' %> - - - - - - %if artist['Status'] == 'Active': - / - %else: - - %endif + + + + + + + %if artist['Status'] == 'Loading': + + + + %endif - - - - ${artist['ArtistName']} - ${albumdisplay} - - - ${havetracks}/${totaltracks} - - - - + + ${artist['ArtistName']} + ${albumdisplay} + + + ${havetracks}/${totaltracks} + + + + + %endfor + <%def name="headIncludes()"> @@ -85,7 +124,12 @@ + - + \ No newline at end of file diff --git a/data/interfaces/brink/manage.html b/data/interfaces/brink/manage.html index 1a75a9de..62b3d3d0 100644 --- a/data/interfaces/brink/manage.html +++ b/data/interfaces/brink/manage.html @@ -3,99 +3,98 @@ import headphones from headphones.helpers import checked %> -<%def name="headerIncludes()"> - - - Manage Artists - %if not headphones.ADD_ARTISTS: - Manage New Artists - %endif - - - <%def name="body()"> - - Scan Music Library - - - - - Where do you keep your music? - + + + Manage: + Albums + Artists + %if not headphones.ADD_ARTISTS: + New Artists + %endif + + + + + Scan Music Library + + - %if headphones.MUSIC_DIR: - - - - You can put in any directory, and it will scan for audio files in that folder - (including all subdirectories) - For example: '/Users/name/Music' - - - %else: - - - - - You can put in any directory, and it will scan for audio files in that folder - (including all subdirectories) - For example: '/Users/name/Music' - - - - %endif - - - Automatically add new artists - - - - - This process runs in the background. - - - - - - - - - - Import Last.FM Artists - - - - - Enter the username whose artists you want to import: - - - <% - if headphones.LASTFM_USERNAME: - lastfmvalue = headphones.LASTFM_USERNAME - else: - lastfmvalue = 'Last.fm Username' - %> - - - - - - - - - - - Force Search - - - - Force Check for Wanted Albums - Force Update Active Artists - Force Post-Process Albums in Download Folder - Check for Headphones Updates - - - + %if headphones.MUSIC_DIR: + + Local Music Directory: + + You can put in any directory, and it will scan for audio files in that folder + (including all subdirectories) + For example: '/Users/name/Music' + + + + %else: + + Local Music Directory: + + You can put in any directory, and it will scan for audio files in that folder + (including all subdirectories) + For example: '/Users/name/Music' + + + + %endif + + + + Automatically add new artists + + + + + + + + + This process runs in the background. + + + + + + Import Last.FM Artists + + + + Username: + + + + <% + if headphones.LASTFM_USERNAME: + lastfmvalue = headphones.LASTFM_USERNAME + else: + lastfmvalue = 'Last.fm Username' + %> + + + + + + + + \ No newline at end of file diff --git a/data/interfaces/brink/managealbums.html b/data/interfaces/brink/managealbums.html new file mode 100644 index 00000000..a7316816 --- /dev/null +++ b/data/interfaces/brink/managealbums.html @@ -0,0 +1,140 @@ +<%inherit file="base.html" /> +<%! + from headphones import db + import headphones +%> + + +<%def name="body()"> + + + Manage Albums + + + Mark selected albums as + + Choose... + Wanted + Wanted (new only) + Wanted (lossless) + Skipped + Downloaded + + + + + + + + Album + Artist + Date + Type + Status + Have + Bitrate + Format + + + + %for album in albums: + <% + if album['Status'] == 'Skipped': + grade = 'Z' + elif album['Status'] == 'Wanted': + grade = 'X' + elif album['Status'] == 'Snatched': + grade = 'C' + else: + grade = 'A' + + myDB = db.DBConnection() + totaltracks = len(myDB.select('SELECT TrackTitle from tracks WHERE AlbumID=?', [album['AlbumID']])) + havetracks = len(myDB.select('SELECT TrackTitle from tracks WHERE AlbumID=? AND Location IS NOT NULL', [album['AlbumID']])) + len(myDB.select('SELECT TrackTitle from have WHERE ArtistName like ? AND AlbumTitle LIKE ?', [album['ArtistName'], album['AlbumTitle']])) + + try: + percent = (havetracks*100.0)/totaltracks + if percent > 100: + percent = 100 + except (ZeroDivisionError, TypeError): + percent = 0 + totaltracks = '?' + + avgbitrate = myDB.action("SELECT AVG(BitRate) FROM tracks WHERE AlbumID=?", [album['AlbumID']]).fetchone()[0] + if avgbitrate: + bitrate = str(int(avgbitrate)/1000) + ' kbps' + else: + bitrate = '' + + albumformatcount = myDB.action("SELECT COUNT(DISTINCT Format) FROM tracks WHERE AlbumID=?", [album['AlbumID']]).fetchone()[0] + if albumformatcount == 1: + albumformat = myDB.action("SELECT DISTINCT Format FROM tracks WHERE AlbumID=?", [album['AlbumID']]).fetchone()[0] + elif albumformatcount > 1: + albumformat = 'Mixed' + else: + albumformat = '' + + lossy_formats = [str.upper(fmt) for fmt in headphones.LOSSY_MEDIA_FORMATS] + + %> + + + ${album['AlbumTitle']} + ${album['ArtistName']} + ${album['ReleaseDate']} + ${album['Type']} + ${album['Status']} + ${havetracks}/${totaltracks} + ${bitrate} + ${albumformat} + + %endfor + + + + + + +<%def name="headIncludes()"> + + +<%def name="javascriptIncludes()"> + + + + diff --git a/data/interfaces/brink/manageartists.html b/data/interfaces/brink/manageartists.html index 3cdd32f8..be947b76 100644 --- a/data/interfaces/brink/manageartists.html +++ b/data/interfaces/brink/manageartists.html @@ -1,7 +1,7 @@ <%inherit file="base.html" /> <%def name="body()"> - + Manage Artists @@ -19,8 +19,8 @@ - Artist Name Status + Artist Name Latest Album @@ -46,8 +46,18 @@ %> + + + %if artist['Status'] == 'Paused': + + %elif artist['Status'] == 'Loading': + + %else: + + %endif + + ${artist['ArtistName']} - ${artist['Status']} ${albumdisplay} %endfor @@ -61,22 +71,22 @@ <%def name="javascriptIncludes()"> - + - + \ No newline at end of file diff --git a/data/interfaces/brink/managenew.html b/data/interfaces/brink/managenew.html index cb207fcb..54d82339 100644 --- a/data/interfaces/brink/managenew.html +++ b/data/interfaces/brink/managenew.html @@ -3,7 +3,7 @@ import headphones %> <%def name="body()"> - + Manage New Artists Scan Music Library @@ -20,10 +20,10 @@ - %for artist in newartists: + %for artist in headphones.NEW_ARTISTS: - - ${artist['ArtistName']} + + ${artist} %endfor @@ -36,7 +36,7 @@ <%def name="javascriptIncludes()"> - + - + \ No newline at end of file diff --git a/data/interfaces/brink/searchresults.html b/data/interfaces/brink/searchresults.html index e86c0002..95a9799a 100644 --- a/data/interfaces/brink/searchresults.html +++ b/data/interfaces/brink/searchresults.html @@ -2,17 +2,17 @@ <%def name="body()"> - + LSearch Results %if type == 'album': - + Album Name %elif type == 'artist': - + %endif Artist Name Score @@ -29,33 +29,36 @@ grade = 'Z' %> - + %if type == 'album': - - - + - - ${result['title']} + %elif type == 'artist': + + + + + + %endif - ${result['uniquename']} + ${result['uniquename']} ${result['score']}% - + %if type == 'album': - + %elif type == 'artist': - + + %endif %endfor @@ -71,19 +74,33 @@ <%def name="javascriptIncludes()"> \ No newline at end of file diff --git a/data/interfaces/brink/upcoming.html b/data/interfaces/brink/upcoming.html index 67627104..87ecaf63 100644 --- a/data/interfaces/brink/upcoming.html +++ b/data/interfaces/brink/upcoming.html @@ -66,20 +66,16 @@ - - - %if album['Status'] == 'Skipped': - N - %elif album['Status'] == 'Wanted': - / - × - %else: - * - J - %endif - - + + %if album['Status'] == 'Wanted': + / + + %else: + * + + %endif + @@ -102,7 +98,7 @@ <%def name="javascriptIncludes()"> - + - + \ No newline at end of file
Mark selected albums as - - Wanted - Wanted (new only) - Skipped - Downloaded - - -
- Where do you keep your music? -
- -
- Automatically add new artists -
- Enter the username whose artists you want to import: -