diff --git a/data/interfaces/brink/album.html b/data/interfaces/brink/album.html index 9dcf7613..2abe95d4 100644 --- a/data/interfaces/brink/album.html +++ b/data/interfaces/brink/album.html @@ -125,7 +125,7 @@ <%def name="javascriptIncludes()"> - + - \ No newline at end of file + diff --git a/data/interfaces/brink/base.html b/data/interfaces/brink/base.html index cadc65f9..e608ace8 100644 --- a/data/interfaces/brink/base.html +++ b/data/interfaces/brink/base.html @@ -45,7 +45,7 @@ - + ${next.headIncludes()} ${next.javascriptIncludes()} @@ -160,7 +160,7 @@ -
+
IWanted Albums UActive Artists JPost-Process diff --git a/data/interfaces/brink/CSS/jquery.jscrollpane.css b/data/interfaces/brink/css/jquery.jscrollpane.css similarity index 100% rename from data/interfaces/brink/CSS/jquery.jscrollpane.css rename to data/interfaces/brink/css/jquery.jscrollpane.css diff --git a/data/interfaces/brink/CSS/libs/dataTable.css b/data/interfaces/brink/css/libs/dataTable.css similarity index 100% rename from data/interfaces/brink/CSS/libs/dataTable.css rename to data/interfaces/brink/css/libs/dataTable.css diff --git a/data/interfaces/brink/CSS/libs/jquery.dataTables.css b/data/interfaces/brink/css/libs/jquery.dataTables.css similarity index 100% rename from data/interfaces/brink/CSS/libs/jquery.dataTables.css rename to data/interfaces/brink/css/libs/jquery.dataTables.css diff --git a/data/interfaces/brink/CSS/libs/jquery.dataTables_themeroller.css b/data/interfaces/brink/css/libs/jquery.dataTables_themeroller.css similarity index 100% rename from data/interfaces/brink/CSS/libs/jquery.dataTables_themeroller.css rename to data/interfaces/brink/css/libs/jquery.dataTables_themeroller.css diff --git a/data/interfaces/brink/CSS/libs/jquery.jscrollpane.css b/data/interfaces/brink/css/libs/jquery.jscrollpane.css similarity index 100% rename from data/interfaces/brink/CSS/libs/jquery.jscrollpane.css rename to data/interfaces/brink/css/libs/jquery.jscrollpane.css diff --git a/data/interfaces/brink/CSS/style.css b/data/interfaces/brink/css/style.css similarity index 100% rename from data/interfaces/brink/CSS/style.css rename to data/interfaces/brink/css/style.css diff --git a/data/interfaces/brink/history.html b/data/interfaces/brink/history.html index 39001839..fda2ca15 100644 --- a/data/interfaces/brink/history.html +++ b/data/interfaces/brink/history.html @@ -60,7 +60,7 @@ <%def name="javascriptIncludes()"> - + - \ No newline at end of file + diff --git a/data/interfaces/brink/Images/box-big.png b/data/interfaces/brink/images/box-big.png similarity index 100% rename from data/interfaces/brink/Images/box-big.png rename to data/interfaces/brink/images/box-big.png diff --git a/data/interfaces/brink/Images/cd-big.png b/data/interfaces/brink/images/cd-big.png similarity index 100% rename from data/interfaces/brink/Images/cd-big.png rename to data/interfaces/brink/images/cd-big.png diff --git a/data/interfaces/brink/Images/sort_asc.png b/data/interfaces/brink/images/sort_asc.png similarity index 100% rename from data/interfaces/brink/Images/sort_asc.png rename to data/interfaces/brink/images/sort_asc.png diff --git a/data/interfaces/brink/Images/sort_both.png b/data/interfaces/brink/images/sort_both.png similarity index 100% rename from data/interfaces/brink/Images/sort_both.png rename to data/interfaces/brink/images/sort_both.png diff --git a/data/interfaces/brink/Images/sort_desc.png b/data/interfaces/brink/images/sort_desc.png similarity index 100% rename from data/interfaces/brink/Images/sort_desc.png rename to data/interfaces/brink/images/sort_desc.png diff --git a/data/interfaces/brink/JS/libs/dd_belatedpng.js b/data/interfaces/brink/js/libs/dd_belatedpng.js similarity index 100% rename from data/interfaces/brink/JS/libs/dd_belatedpng.js rename to data/interfaces/brink/js/libs/dd_belatedpng.js diff --git a/data/interfaces/brink/JS/libs/jquery.dataTables.min.js b/data/interfaces/brink/js/libs/jquery.dataTables.min.js similarity index 100% rename from data/interfaces/brink/JS/libs/jquery.dataTables.min.js rename to data/interfaces/brink/js/libs/jquery.dataTables.min.js diff --git a/data/interfaces/brink/JS/libs/jquery.jscrollpane.min.js b/data/interfaces/brink/js/libs/jquery.jscrollpane.min.js similarity index 100% rename from data/interfaces/brink/JS/libs/jquery.jscrollpane.min.js rename to data/interfaces/brink/js/libs/jquery.jscrollpane.min.js diff --git a/data/interfaces/brink/JS/libs/jquery.mousewheel.js b/data/interfaces/brink/js/libs/jquery.mousewheel.js similarity index 100% rename from data/interfaces/brink/JS/libs/jquery.mousewheel.js rename to data/interfaces/brink/js/libs/jquery.mousewheel.js diff --git a/data/interfaces/brink/JS/libs/modernizr-1.7.min.js b/data/interfaces/brink/js/libs/modernizr-1.7.min.js similarity index 100% rename from data/interfaces/brink/JS/libs/modernizr-1.7.min.js rename to data/interfaces/brink/js/libs/modernizr-1.7.min.js diff --git a/data/interfaces/brink/JS/plugins.js b/data/interfaces/brink/js/plugins.js similarity index 100% rename from data/interfaces/brink/JS/plugins.js rename to data/interfaces/brink/js/plugins.js diff --git a/data/interfaces/brink/JS/script.js b/data/interfaces/brink/js/script.js similarity index 100% rename from data/interfaces/brink/JS/script.js rename to data/interfaces/brink/js/script.js diff --git a/data/interfaces/brink/logs.html b/data/interfaces/brink/logs.html index 7c743bc4..fb35653b 100644 --- a/data/interfaces/brink/logs.html +++ b/data/interfaces/brink/logs.html @@ -37,7 +37,7 @@ <%def name="javascriptIncludes()"> - + - \ No newline at end of file + diff --git a/data/interfaces/brink/manageartists.html b/data/interfaces/brink/manageartists.html index c7d64b1d..3cdd32f8 100644 --- a/data/interfaces/brink/manageartists.html +++ b/data/interfaces/brink/manageartists.html @@ -61,7 +61,7 @@ <%def name="javascriptIncludes()"> - + - \ No newline at end of file + diff --git a/data/interfaces/brink/managenew.html b/data/interfaces/brink/managenew.html index 8e34f561..cb207fcb 100644 --- a/data/interfaces/brink/managenew.html +++ b/data/interfaces/brink/managenew.html @@ -36,7 +36,7 @@ <%def name="javascriptIncludes()"> - + + - \ No newline at end of file + diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py index 5bf44dc1..309d613d 100644 --- a/headphones/postprocessor.py +++ b/headphones/postprocessor.py @@ -25,26 +25,29 @@ from lib.beets.mediafile import MediaFile import headphones from headphones import db, albumart, lyrics, logger, helpers +postprocessor_lock = threading.Lock() + def checkFolder(): + + with postprocessor_lock: - myDB = db.DBConnection() - snatched = myDB.select('SELECT * from snatched WHERE Status="Snatched"') + myDB = db.DBConnection() + snatched = myDB.select('SELECT * from snatched WHERE Status="Snatched"') - for album in snatched: + for album in snatched: - if album['FolderName']: - - nzb_album_path = os.path.join(headphones.DOWNLOAD_DIR, album['FolderName']).encode(headphones.SYS_ENCODING) - torrent_album_path = os.path.join(headphones.DOWNLOAD_TORRENT_DIR, album['FolderName']).encode(headphones.SYS_ENCODING) + if album['FolderName']: - if os.path.exists(nzb_album_path): - logger.debug('Found %s in NZB download folder. Verifying....' % album['FolderName']) - verify(album['AlbumID'], nzb_album_path) - - elif os.path.exists(torrent_album_path): - logger.debug('Found %s in torrent download folder. Verifying....' % album['FolderName']) - verify(album['AlbumID'], torrent_album_path) - + nzb_album_path = os.path.join(headphones.DOWNLOAD_DIR, album['FolderName']).encode(headphones.SYS_ENCODING) + torrent_album_path = os.path.join(headphones.DOWNLOAD_TORRENT_DIR, album['FolderName']).encode(headphones.SYS_ENCODING) + + if os.path.exists(nzb_album_path): + logger.debug('Found %s in NZB download folder. Verifying....' % album['FolderName']) + verify(album['AlbumID'], nzb_album_path) + + elif os.path.exists(torrent_album_path): + logger.debug('Found %s in torrent download folder. Verifying....' % album['FolderName']) + verify(album['AlbumID'], torrent_album_path) def verify(albumid, albumpath):