Merge branch 'develop'

data/interfaces/brink/album.html

@@ -125,7 +125,7 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-	<script src="interfaces/brink/JS/libs/jquery.dataTables.min.js"></script>
+	<script src="interfaces/brink/js/libs/jquery.dataTables.min.js"></script>
 	<script>
 	$(document).ready(function() {
 		getAlbumInfo("${album['ArtistName']}","${album['AlbumTitle']}","#albumheader .albumArt",3);
@@ -155,4 +155,4 @@
 		}
 	});
 	</script>
-</%def>
+</%def>

data/interfaces/brink/base.html

@@ -45,7 +45,7 @@
 	
 	<!--Datatables-->
 	<script type="text/javascript" src="/js/libs/jquery.dataTables.min.js"></script>
-	<link rel="stylesheet" href="interfaces/brink/CSS/jquery.dataTables_themeroller.css">
+	<link rel="stylesheet" href="interfaces/brink/css/jquery.dataTables_themeroller.css">
 		
 	${next.headIncludes()}
 	${next.javascriptIncludes()}
@@ -160,7 +160,7 @@
 		</tr>
 		<tr id="footer" >
 			<td colspan="2">
-				<div class="btn left">
+				<div class="btn leftJ>
 					<a href="forceSearch"><span>I</span>Wanted Albums</a>
 					<a href="forceUpdate"><span>U</span>Active Artists</a>
 					<a href="forcePostProcess"><span>J</span>Post-Process</a>

data/interfaces/brink/history.html

@@ -60,7 +60,7 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-	<script src="interfaces/brink/JS/libs/jquery.dataTables.min.js"></script>
+	<script src="interfaces/brink/js/libs/jquery.dataTables.min.js"></script>
 	<script>
 	$(document).ready(function()
 	{
@@ -80,4 +80,4 @@
 			});
 	});
 	</script>
-</%def>
+</%def>

data/interfaces/brink/logs.html

@@ -37,7 +37,7 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-	<script src="interfaces/brink/JS/libs/jquery.dataTables.min.js"></script>
+	<script src="interfaces/brink/js/libs/jquery.dataTables.min.js"></script>
 	<script>
 	$(document).ready(function()
 	{
@@ -50,4 +50,4 @@
 		});
 	});
 	</script>
-</%def>
+</%def>

data/interfaces/brink/manageartists.html

@@ -61,7 +61,7 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-	<script src="interfaces/brink/JS/libs/jquery.dataTables.min.js"></script>
+	<script src="interfaces/brink/js/libs/jquery.dataTables.min.js"></script>
 	<script>
 	$(document).ready(function()
 	{
@@ -79,4 +79,4 @@
 			});
 	});
 	</script>
-</%def>
+</%def>

data/interfaces/brink/managenew.html

@@ -36,7 +36,7 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-	<script src="interfaces/brink/JS/libs/jquery.dataTables.min.js"></script>
+	<script src="interfaces/brink/js/libs/jquery.dataTables.min.js"></script>
 	<script>
 	$(document).ready(function()
 	{

data/interfaces/brink/upcoming.html

@@ -102,7 +102,7 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-	<script src="interfaces/brink/JS/libs/jquery.dataTables.min.js"></script>
+	<script src="interfaces/brink/js/libs/jquery.dataTables.min.js"></script>
 	<script>
 	function getArtistArt() {
 		$("table#upcoming_table tr td#artistname").each(function(){	
@@ -145,4 +145,4 @@
 			});
 	});
 	</script>
-</%def>
+</%def>

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):