From cd08b72df712589151565a8c3496337d491aa9d7 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Mon, 8 Jun 2015 21:55:14 -0700
Subject: [PATCH 01/10] Added ability to test pushover

---
 headphones/webserve.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/headphones/webserve.py b/headphones/webserve.py
index 5a41dc3b..bf02df85 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -1424,6 +1424,13 @@ class WebInterface(object):
             logger.warn(msg)
         return msg
 
+    @cherrypy.expose
+    def testPushover(self):
+        logger.info(u"Sending Pushover notification")
+        pushover = notifiers.PUSHOVER()
+        result = pushover.notify("hooray!", "This is a test")
+        return result
+
 class Artwork(object):
     @cherrypy.expose
     def index(self):

From 1204afadbba5a669fd4ca22bd883cf8cb9f54002 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Mon, 8 Jun 2015 21:56:10 -0700
Subject: [PATCH 02/10] Convert preferred bitrate to vbr preset for what.cd
 searching

---
 headphones/searcher.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/headphones/searcher.py b/headphones/searcher.py
index 1b58151f..a2eca508 100644
--- a/headphones/searcher.py
+++ b/headphones/searcher.py
@@ -1280,6 +1280,12 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None, choose
             search_formats = [None]  # should return all
             bitrate = headphones.CONFIG.PREFERRED_BITRATE
             if bitrate:
+                if 225 <= int(bitrate) < 256:
+                    bitrate = 'V0'
+                elif 200 <= int(bitrate) < 225:
+                    bitrate = 'V1'
+                elif 175 <= int(bitrate) < 200:
+                    bitrate = 'V2'
                 for encoding_string in gazelleencoding.ALL_ENCODINGS:
                     if re.search(bitrate, encoding_string, flags=re.I):
                         bitrate_string = encoding_string

From ebd6d3f3f915d598b6c1eba4e94c9c2988e73fe1 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Tue, 9 Jun 2015 00:31:50 -0700
Subject: [PATCH 03/10] Added option to keep folders when force post-processing
 under Manage. Also, added config option to keep original folder globally

---
 CHANGELOG.md                        |  9 +++
 data/interfaces/default/config.html |  6 ++
 data/interfaces/default/manage.html | 91 ++++++++++++++++++++++-------
 headphones/config.py                |  1 +
 headphones/postprocessor.py         | 30 +++++-----
 headphones/webserve.py              |  7 ++-
 6 files changed, 104 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62bf7df2..a3b702ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## v0.5.7
+Released xx xxx 2015
+
+Highlights:
+*Improved: Specify whether to delete folders when force post-processing
+*Improved: Convert target bitrate to vbr preset for what.cd searching
+
+The full list of commits can be found [here](https://github.com/rembo10/headphones/compare/v0.5.6...v0.5.7).
+
 ## v0.5.6
 Released 08 June 2015
 
diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 50dc6ae4..3e1258a2 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -753,6 +753,12 @@
                                                 <input type="checkbox" name="replace_existing_folders" value="1" ${config['replace_existing_folders']}>
                                             </label>
                                          </div>
+                                         <div class="row indent">
+                                            <label>
+                                                Keep original folder?
+                                                <input type="checkbox" name="keep_original_folder" value="1" ${config['keep_original_folder']}>
+                                            </label>
+                                         </div>
                                     </div>
                                     <label>
                                         Rename files
diff --git a/data/interfaces/default/manage.html b/data/interfaces/default/manage.html
index abf72618..ab5d6982 100644
--- a/data/interfaces/default/manage.html
+++ b/data/interfaces/default/manage.html
@@ -137,28 +137,27 @@
 					        No empty artists found.
 					    %endif
 					</div>
-				<a href="#" onclick="doAjaxCall('forcePostProcess',$(this))" data-success="Post-Processor is being loaded" data-error="Error during Post-Processing"><i class="fa fa-wrench fa-fw"></i> Force Post-Process Albums in Download Folder</a>
+					<div id="post_process">
+					<a href="#" class="btnOpenDialog"><i class="fa fa-wrench fa-fw"></i> Force Post-Process Albums in Download Folder</a>
+					</div>
 			</div>
 		</fieldset>
-		<form action="forcePostProcess" method="GET">
-		            <fieldset>
-		            <div class="row">
-		                <label>Force Post-Process Albums in Alternate Folder</label>
-					    <input type="text" value="" name="dir" id="dir" size="50" /><input type="submit" />
-		            </div>
-		            </fieldset>
-		      
-		</form>
-		<form action="forcePostProcess" method="GET">
-		            <fieldset>
-		            <div class="row">
-		                <label>Post-Process Single Folder</label>
-					    <input type="text" value="" name="album_dir" id="album_dir" size="50" /><input type="submit" />
-		            </div>
-		            </fieldset>
-		      
-		</form>
-		
+		<fieldset>
+            <div class="row" id="post_process_alternate">
+                <label>Force Post-Process Albums in Alternate Folder</label>
+			    <input type="text" value="" name="dir" id="dir" size="50" />
+			    <input type="button" class="btnOpenDialog" value="Submit" />
+            </div>
+        </fieldset>
+
+        <fieldset>
+            <div class="row" id="post_process_single">
+                <label>Post-Process Single Folder</label>
+			    <input type="text" value="" name="album_dir" id="album_dir" size="50" />
+			    <input type="button" class="btnOpenDialog" value="Submit" />
+            </div>
+        </fieldset>
+
 	</div>
 
 
@@ -177,8 +176,7 @@
 		</fieldset>
 		
 	</div>
-
-
+	<div id="dialog-confirm"></div>
 
 </div>
 </%def>
@@ -187,6 +185,55 @@
 		function addScanAction() {
 			$('#autoadd').append('<input type="hidden" name="scan" value=1 />');
 		};
+
+		function fnOpenNormalDialog(id) {
+			if (id === "post_process"){
+				var url = "forcePostProcess?"
+			}
+			if (id === "post_process_alternate"){
+				var dir = $('#dir').val();
+				var url = "forcePostProcess?dir=" + dir + "&"
+			}
+			if (id === "post_process_single"){
+				var dir = $('#album_dir').val();
+				var url = "forcePostProcess?album_dir=" + dir + "&"
+			}
+			var t = $('<a data-success="Post-Processor is being loaded" data-error="Error during Post-Processing">');
+		    $("#dialog-confirm").html("Do you want to keep the original folder(s) after post-processing? If you click no, the folders still might be kept depending on your global settings");
+
+		    // Define the Dialog and its properties.
+		    $("#dialog-confirm").dialog({
+		        resizable: false,
+		        modal: true,
+		        title: "Keep original folder(s)?",
+		        height: 170,
+		        width: 400,
+		        buttons: {
+		            "Yes": function () {
+		                $(this).dialog('close');
+		                doAjaxCall(url + "keep_original_folder=True", t);
+		            },
+		                "No": function () {
+		                $(this).dialog('close');
+		                doAjaxCall(url + "keep_original_folder=False", t);
+		            }
+		        }
+		    });
+		}
+
+		$('.btnOpenDialog').click(function(e){
+			e.preventDefault();
+			var parentId = $(this).closest('div').prop('id');
+			fnOpenNormalDialog(parentId);
+		});
+
+		function callback(value) {
+		    if (value) {
+		        alert("Confirmed");
+		    } else {
+		        alert("Rejected");
+		    }
+		}
 		
 		function initThisPage() {
 			$('#manage_albums').click(function() {
diff --git a/headphones/config.py b/headphones/config.py
index 73b66765..6ae02086 100644
--- a/headphones/config.py
+++ b/headphones/config.py
@@ -200,6 +200,7 @@ _CONFIG_DEFINITIONS = {
     'PUSHOVER_PRIORITY': (int, 'Pushover', 0),
     'RENAME_FILES': (int, 'General', 0),
     'REPLACE_EXISTING_FOLDERS': (int, 'General', 0),
+    'KEEP_ORIGINAL_FOLDER': (int, 'General', 0),
     'REQUIRED_WORDS': (str, 'General', ''),
     'RUTRACKER': (int, 'Rutracker', 0),
     'RUTRACKER_PASSWORD': (str, 'Rutracker', ''),
diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py
index a3c8e44e..03a85f19 100755
--- a/headphones/postprocessor.py
+++ b/headphones/postprocessor.py
@@ -59,7 +59,7 @@ def checkFolder():
 
     logger.debug("Checking download folder finished.")
 
-def verify(albumid, albumpath, Kind=None, forced=False):
+def verify(albumid, albumpath, Kind=None, forced=False, keep_original_folder=False):
 
     myDB = db.DBConnection()
     release = myDB.action('SELECT * from albums WHERE AlbumID=?', [albumid]).fetchone()
@@ -216,7 +216,7 @@ def verify(albumid, albumpath, Kind=None, forced=False):
         logger.debug('Matching metadata album: %s with album name: %s' % (metaalbum, dbalbum))
 
         if metaartist == dbartist and metaalbum == dbalbum:
-            doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list, Kind)
+            doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list, Kind, keep_original_folder)
             return
 
     # test #2: filenames
@@ -234,7 +234,7 @@ def verify(albumid, albumpath, Kind=None, forced=False):
             logger.debug('Checking if track title: %s is in file name: %s' % (dbtrack, filetrack))
 
             if dbtrack in filetrack:
-                doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list, Kind)
+                doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list, Kind, keep_original_folder)
                 return
 
     # test #3: number of songs and duration
@@ -266,7 +266,7 @@ def verify(albumid, albumpath, Kind=None, forced=False):
             logger.debug('Database track duration: %i' % db_track_duration)
             delta = abs(downloaded_track_duration - db_track_duration)
             if delta < 240:
-                doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list, Kind)
+                doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list, Kind, keep_original_folder)
                 return
 
     logger.warn(u'Could not identify album: %s. It may not be the intended album.' % albumpath.decode(headphones.SYS_ENCODING, 'replace'))
@@ -276,11 +276,11 @@ def verify(albumid, albumpath, Kind=None, forced=False):
         renameUnprocessedFolder(albumpath, tag="Unprocessed")
 
 
-def doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list, Kind=None):
+def doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list, Kind=None, keep_original_folder=False):
 
     logger.info('Starting post-processing for: %s - %s' % (release['ArtistName'], release['AlbumTitle']))
     # Check to see if we're preserving the torrent dir
-    if headphones.CONFIG.KEEP_TORRENT_FILES and Kind == "torrent" and 'headphones-modified' not in albumpath:
+    if (headphones.CONFIG.KEEP_TORRENT_FILES and Kind == "torrent" and 'headphones-modified' not in albumpath) or headphones.CONFIG.KEEP_ORIGINAL_FOLDER or keep_original_folder:
         new_folder = os.path.join(albumpath, 'headphones-modified'.encode(headphones.SYS_ENCODING, 'replace'))
         logger.info("Copying files to 'headphones-modified' subfolder to preserve downloaded files for seeding")
         try:
@@ -1060,7 +1060,7 @@ def renameUnprocessedFolder(path, tag):
             return
 
 
-def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None):
+def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None, keep_original_folder=False):
 
     logger.info('Force checking download folder for completed downloads')
 	
@@ -1136,7 +1136,7 @@ def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None):
                 continue
             else:
                 logger.info('Found a match in the database: %s. Verifying to make sure it is the correct album', snatched['Title'])
-                verify(snatched['AlbumID'], folder, snatched['Kind'])
+                verify(snatched['AlbumID'], folder, snatched['Kind'], keep_original_folder=keep_original_folder)
                 continue
 
         # Attempt 2: strip release group id from filename
@@ -1153,7 +1153,7 @@ def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None):
             release = myDB.action('SELECT ArtistName, AlbumTitle, AlbumID from albums WHERE AlbumID=?', [rgid]).fetchone()
             if release:
                 logger.info('Found a match in the database: %s - %s. Verifying to make sure it is the correct album', release['ArtistName'], release['AlbumTitle'])
-                verify(release['AlbumID'], folder, forced=True)
+                verify(release['AlbumID'], folder, forced=True, keep_original_folder=keep_original_folder)
                 continue
             else:
                 logger.info('Found a (possibly) valid Musicbrainz realse group id in album folder name.')
@@ -1172,7 +1172,7 @@ def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None):
             release = myDB.action('SELECT AlbumID, ArtistName, AlbumTitle from albums WHERE ArtistName LIKE ? and AlbumTitle LIKE ?', [name, album]).fetchone()
             if release:
                 logger.info('Found a match in the database: %s - %s. Verifying to make sure it is the correct album', release['ArtistName'], release['AlbumTitle'])
-                verify(release['AlbumID'], folder)
+                verify(release['AlbumID'], folder, keep_original_folder=keep_original_folder)
                 continue
             else:
                 logger.info('Querying MusicBrainz for the release group id for: %s - %s', name, album)
@@ -1183,7 +1183,7 @@ def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None):
                     rgid = None
 
                 if rgid:
-                    verify(rgid, folder)
+                    verify(rgid, folder, keep_original_folder=keep_original_folder)
                     continue
                 else:
                     logger.info('No match found on MusicBrainz for: %s - %s', name, album)
@@ -1207,7 +1207,7 @@ def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None):
             release = myDB.action('SELECT AlbumID, ArtistName, AlbumTitle from albums WHERE ArtistName LIKE ? and AlbumTitle LIKE ?', [name, album]).fetchone()
             if release:
                 logger.info('Found a match in the database: %s - %s. Verifying to make sure it is the correct album', release['ArtistName'], release['AlbumTitle'])
-                verify(release['AlbumID'], folder)
+                verify(release['AlbumID'], folder, keep_original_folder=keep_original_folder)
                 continue
             else:
                 logger.info('Querying MusicBrainz for the release group id for: %s - %s', name, album)
@@ -1218,7 +1218,7 @@ def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None):
                     rgid = None
 
                 if rgid:
-                    verify(rgid, folder)
+                    verify(rgid, folder, keep_original_folder=keep_original_folder)
                     continue
                 else:
                     logger.info('No match found on MusicBrainz for: %s - %s', name, album)
@@ -1231,7 +1231,7 @@ def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None):
             release = myDB.action('SELECT AlbumID, ArtistName, AlbumTitle from albums WHERE AlbumTitle LIKE ?', [folder_basename]).fetchone()
             if release:
                 logger.info('Found a match in the database: %s - %s. Verifying to make sure it is the correct album', release['ArtistName'], release['AlbumTitle'])
-                verify(release['AlbumID'], folder)
+                verify(release['AlbumID'], folder, keep_original_folder=keep_original_folder)
                 continue
             else:
                 logger.info('Querying MusicBrainz for the release group id for: %s', folder_basename)
@@ -1242,7 +1242,7 @@ def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None):
                     rgid = None
 
                 if rgid:
-                    verify(rgid, folder)
+                    verify(rgid, folder, keep_original_folder=keep_original_folder)
                     continue
                 else:
                     logger.info('No match found on MusicBrainz for: %s - %s', name, album)
diff --git a/headphones/webserve.py b/headphones/webserve.py
index bf02df85..706e0018 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -740,9 +740,9 @@ class WebInterface(object):
         raise cherrypy.HTTPRedirect("home")
 
     @cherrypy.expose
-    def forcePostProcess(self, dir=None, album_dir=None):
+    def forcePostProcess(self, dir=None, album_dir=None, keep_original_folder=False):
         from headphones import postprocessor
-        threading.Thread(target=postprocessor.forcePostProcess, kwargs={'dir': dir, 'album_dir': album_dir}).start()
+        threading.Thread(target=postprocessor.forcePostProcess, kwargs={'dir': dir, 'album_dir': album_dir, 'keep_original_folder':keep_original_folder}).start()
         raise cherrypy.HTTPRedirect("home")
 
     @cherrypy.expose
@@ -1066,6 +1066,7 @@ class WebInterface(object):
             "embed_album_art": checked(headphones.CONFIG.EMBED_ALBUM_ART),
             "embed_lyrics": checked(headphones.CONFIG.EMBED_LYRICS),
             "replace_existing_folders": checked(headphones.CONFIG.REPLACE_EXISTING_FOLDERS),
+            "keep_original_folder" : checked(headphones.CONFIG.KEEP_ORIGINAL_FOLDER),
             "destination_dir": headphones.CONFIG.DESTINATION_DIR,
             "lossless_destination_dir": headphones.CONFIG.LOSSLESS_DESTINATION_DIR,
             "folder_format": headphones.CONFIG.FOLDER_FORMAT,
@@ -1217,7 +1218,7 @@ class WebInterface(object):
             "launch_browser", "enable_https", "api_enabled", "use_blackhole", "headphones_indexer", "use_newznab", "newznab_enabled",
             "use_nzbsorg", "use_omgwtfnzbs", "use_kat", "use_piratebay", "use_oldpiratebay", "use_mininova", "use_waffles", "use_rutracker",
             "use_whatcd", "preferred_bitrate_allow_lossless", "detect_bitrate", "ignore_clean_releases", "freeze_db", "cue_split", "move_files", "rename_files",
-            "correct_metadata", "cleanup_files", "keep_nfo", "add_album_art", "embed_album_art", "embed_lyrics", "replace_existing_folders",
+            "correct_metadata", "cleanup_files", "keep_nfo", "add_album_art", "embed_album_art", "embed_lyrics", "replace_existing_folders", "keep_original_folder",
             "file_underscores", "include_extras", "autowant_upcoming", "autowant_all", "autowant_manually_added", "keep_torrent_files", "music_encoder",
             "encoderlossless", "encoder_multicore", "delete_lossless_files", "growl_enabled", "growl_onsnatch", "prowl_enabled",
             "prowl_onsnatch", "xbmc_enabled", "xbmc_update", "xbmc_notify", "lms_enabled", "plex_enabled", "plex_update", "plex_notify",

From 1b998e9d01d033bab4a2717a77b78c3f015552aa Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Fri, 12 Jun 2015 00:08:35 -0700
Subject: [PATCH 04/10] Updated pushover to use requests lib

---
 CHANGELOG.md            |  1 +
 headphones/notifiers.py | 27 +++++++++------------------
 headphones/webserve.py  |  2 +-
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3b702ad..08c067f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Released xx xxx 2015
 Highlights:
 *Improved: Specify whether to delete folders when force post-processing
 *Improved: Convert target bitrate to vbr preset for what.cd searching
+*Improved: Switched Pushover to requests lib
 
 The full list of commits can be found [here](https://github.com/rembo10/headphones/compare/v0.5.6...v0.5.7).
 
diff --git a/headphones/notifiers.py b/headphones/notifiers.py
index 5592a347..24d83b91 100644
--- a/headphones/notifiers.py
+++ b/headphones/notifiers.py
@@ -583,7 +583,7 @@ class PUSHOVER(object):
         if not headphones.CONFIG.PUSHOVER_ENABLED:
             return
 
-        http_handler = HTTPSConnection("api.pushover.net")
+        url = "https://api.pushover.net/1/messages.json"
 
         data = {'token': self.application_token,
                 'user': headphones.CONFIG.PUSHOVER_KEYS,
@@ -591,25 +591,16 @@ class PUSHOVER(object):
                 'message': message.encode("utf-8"),
                 'priority': headphones.CONFIG.PUSHOVER_PRIORITY}
 
-        http_handler.request("POST",
-                                "/1/messages.json",
-                                headers={'Content-type': "application/x-www-form-urlencoded"},
-                                body=urlencode(data))
-        response = http_handler.getresponse()
-        request_status = response.status
-        logger.debug(u"Pushover response status: %r" % request_status)
-        logger.debug(u"Pushover response headers: %r" % response.getheaders())
-        logger.debug(u"Pushover response body: %r" % response.read())
+        headers = {'Content-type': "application/x-www-form-urlencoded"}
 
-        if request_status == 200:
-                logger.info(u"Pushover notifications sent.")
-                return True
-        elif request_status >= 400 and request_status < 500:
-                logger.info(u"Pushover request failed: %s" % response.reason)
-                return False
+        response = request.request_response(url, method="POST", headers=headers, data=data)
+
+        if response:
+            logger.info(u"Pushover notifications sent.")
+            return True
         else:
-                logger.info(u"Pushover notification failed.")
-                return False
+            logger.error(u"Pushover notification failed.")
+            return False
 
     def updateLibrary(self):
         #For uniformity reasons not removed
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 706e0018..280d1376 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -1430,7 +1430,7 @@ class WebInterface(object):
         logger.info(u"Sending Pushover notification")
         pushover = notifiers.PUSHOVER()
         result = pushover.notify("hooray!", "This is a test")
-        return result
+        return str(result)
 
 class Artwork(object):
     @cherrypy.expose

From 1e75a18f55cb8fb8e471e2ae8aeefea8c0ba2267 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Fri, 19 Jun 2015 17:08:54 -0700
Subject: [PATCH 05/10] Initial commit to add plex tokens. Plex notifications
 need to be updated to requests, and the get request to the server might need
 to be cleaned up - but want to make sure it works first

---
 data/interfaces/default/config.html |  4 ++++
 headphones/config.py                |  1 +
 headphones/notifiers.py             | 23 +++++++++++------------
 headphones/webserve.py              |  7 +++++++
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 3e1258a2..55f0eae9 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -907,6 +907,10 @@
                                         <label>Plex Password</label><input type="password" name="plex_password" value="${config['plex_password']}" size="30">
 					                    <small>Password of your Plex client API (blank for none)</small>
                                     </div>
+                                    <div class="row">
+                                        <label>Plex Token</label><input type="text" name="plex_token" value="${config['plex_token']}" size="30">
+                              <small>Plex Token (for use with Plex Home)</small>
+                                    </div>
                                     <div class="checkbox row">
                                         <input type="checkbox" name="plex_update" value="1" ${config['plex_update']} /><label>Update Plex Library</label>
                                     </div>
diff --git a/headphones/config.py b/headphones/config.py
index 6ae02086..bc499fce 100644
--- a/headphones/config.py
+++ b/headphones/config.py
@@ -175,6 +175,7 @@ _CONFIG_DEFINITIONS = {
     'PLEX_SERVER_HOST': (str, 'Plex', ''),
     'PLEX_UPDATE': (int, 'Plex', 0),
     'PLEX_USERNAME': (str, 'Plex', ''),
+    'PLEX_TOKEN': (str, 'Plex', ''),
     'PREFERRED_BITRATE': (str, 'General', ''),
     'PREFERRED_BITRATE_ALLOW_LOSSLESS': (int, 'General', 0),
     'PREFERRED_BITRATE_HIGH_BUFFER': (int, 'General', 0),
diff --git a/headphones/notifiers.py b/headphones/notifiers.py
index 24d83b91..6a2978d8 100644
--- a/headphones/notifiers.py
+++ b/headphones/notifiers.py
@@ -316,6 +316,7 @@ class Plex(object):
         self.client_hosts = headphones.CONFIG.PLEX_CLIENT_HOST
         self.username = headphones.CONFIG.PLEX_USERNAME
         self.password = headphones.CONFIG.PLEX_PASSWORD
+        self.token = headphones.CONFIG.PLEX_TOKEN
 
     def _sendhttp(self, host, command):
 
@@ -354,13 +355,15 @@ class Plex(object):
         for host in hosts:
             logger.info('Sending library update command to Plex Media Server@ ' + host)
             url = "%s/library/sections" % host
-            try:
-                xml_sections = minidom.parse(urllib.urlopen(url))
-            except IOError, e:
-                logger.warn("Error while trying to contact Plex Media Server: %s" % e)
-                return False
+            if self.token:
+                params = {'X-Plex-Token': self.token}
+            else:
+                params = False
+
+            r = request.request_minidom(url, params=params)
+
+            sections = r.getElementsByTagName('Directory')
 
-            sections = xml_sections.getElementsByTagName('Directory')
             if not sections:
                 logger.info(u"Plex Media Server not running on: " + host)
                 return False
@@ -368,11 +371,7 @@ class Plex(object):
             for s in sections:
                 if s.getAttribute('type') == "artist":
                     url = "%s/library/sections/%s/refresh" % (host, s.getAttribute('key'))
-                    try:
-                        urllib.urlopen(url)
-                    except Exception as e:
-                        logger.warn("Error updating library section for Plex Media Server: %s" % e)
-                        return False
+                    request.request_response(url, params=params)
 
     def notify(self, artist, album, albumartpath):
 
@@ -862,4 +861,4 @@ class Email(object):
 
         except Exception, e:
             logger.warn('Error sending Email: %s' % e)
-            return False
\ No newline at end of file
+            return False
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 280d1376..164895db 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -1121,6 +1121,7 @@ class WebInterface(object):
             "plex_client_host": headphones.CONFIG.PLEX_CLIENT_HOST,
             "plex_username": headphones.CONFIG.PLEX_USERNAME,
             "plex_password": headphones.CONFIG.PLEX_PASSWORD,
+            "plex_token": headphones.CONFIG.PLEX_TOKEN,
             "plex_update": checked(headphones.CONFIG.PLEX_UPDATE),
             "plex_notify": checked(headphones.CONFIG.PLEX_NOTIFY),
             "nma_enabled": checked(headphones.CONFIG.NMA_ENABLED),
@@ -1432,6 +1433,12 @@ class WebInterface(object):
         result = pushover.notify("hooray!", "This is a test")
         return str(result)
 
+    @cherrypy.expose
+    def testPlex(self):
+        logger.info(u"Testing plex updates")
+        plex = notifiers.Plex()
+        plex.update()
+
 class Artwork(object):
     @cherrypy.expose
     def index(self):

From fbfec95a8aee8033bdf488ab233db0bdc195dc4b Mon Sep 17 00:00:00 2001
From: Hellowlol <Hellowlol@users.noreply.github.com>
Date: Thu, 25 Jun 2015 22:53:39 +0200
Subject: [PATCH 06/10] Add getLogs and clearLogs to api

---
 headphones/api.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/headphones/api.py b/headphones/api.py
index df9aa11a..6a51f55d 100644
--- a/headphones/api.py
+++ b/headphones/api.py
@@ -21,8 +21,8 @@ import json
 cmd_list = ['getIndex', 'getArtist', 'getAlbum', 'getUpcoming', 'getWanted', 'getSnatched', 'getSimilar', 'getHistory', 'getLogs',
             'findArtist', 'findAlbum', 'addArtist', 'delArtist', 'pauseArtist', 'resumeArtist', 'refreshArtist',
             'addAlbum', 'queueAlbum', 'unqueueAlbum', 'forceSearch', 'forceProcess', 'forceActiveArtistsUpdate', 
-            'getVersion', 'checkGithub','shutdown', 'restart', 'update', 'getArtistArt', 'getAlbumArt', 
-            'getArtistInfo', 'getAlbumInfo', 'getArtistThumb', 'getAlbumThumb', 
+            'getVersion', 'checkGithub', 'shutdown', 'restart', 'update', 'getArtistArt', 'getAlbumArt', 
+            'getArtistInfo', 'getAlbumInfo', 'getArtistThumb', 'getAlbumThumb', 'clearLogs',
             'choose_specific_download', 'download_specific_release']
 
 
@@ -176,7 +176,13 @@ class Api(object):
         return
 
     def _getLogs(self, **kwargs):
-        pass
+        self.data = headphones.LOG_LIST
+        return
+
+    def _clearLogs(self, **kwargs):
+        headphones.LOG_LIST = []
+        self.data = 'Cleared log'
+        return
 
     def _findArtist(self, **kwargs):
         if 'name' not in kwargs:

From 74275b969e9f65da956e6cad9f72b7a0623ebc3a Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Wed, 1 Jul 2015 00:56:48 -0700
Subject: [PATCH 07/10] Added a useragent to the metacritic request

---
 headphones/metacritic.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/headphones/metacritic.py b/headphones/metacritic.py
index f6fe9289..959282ca 100644
--- a/headphones/metacritic.py
+++ b/headphones/metacritic.py
@@ -17,6 +17,7 @@ import re
 import headphones
 
 from headphones import db, helpers, logger, request
+from headphones.common import USER_AGENT
 
 def update(artist_name,release_groups):
     """ Pretty simple and crude function to find the artist page on metacritic,
@@ -31,9 +32,11 @@ def update(artist_name,release_groups):
 
     mc_artist_name = mc_artist_name.replace(" ","-")
 
+    headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2243.2 Safari/537.36'}
+
     url = "http://www.metacritic.com/person/" + mc_artist_name + "?filter-options=music&sort_options=date&num_items=100"
 
-    res = request.request_soup(url, parser='html.parser')
+    res = request.request_soup(url, headers=headers, parser='html.parser')
 
     try:
         rows = res.tbody.find_all('tr')

From 867e5024482421d153b859efe656994befc6c333 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Wed, 1 Jul 2015 02:06:27 -0700
Subject: [PATCH 08/10] Cache metacritic scores in the artists table so we
 don't lose them if we can't connect for whatever reason

---
 headphones/__init__.py   |  7 +++++-
 headphones/importer.py   |  2 +-
 headphones/metacritic.py | 48 +++++++++++++++++++++++++++++++---------
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/headphones/__init__.py b/headphones/__init__.py
index ef2d4283..52630d5f 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -353,7 +353,7 @@ def dbcheck():
     conn = sqlite3.connect(DB_FILE)
     c = conn.cursor()
     c.execute(
-        'CREATE TABLE IF NOT EXISTS artists (ArtistID TEXT UNIQUE, ArtistName TEXT, ArtistSortName TEXT, DateAdded TEXT, Status TEXT, IncludeExtras INTEGER, LatestAlbum TEXT, ReleaseDate TEXT, AlbumID TEXT, HaveTracks INTEGER, TotalTracks INTEGER, LastUpdated TEXT, ArtworkURL TEXT, ThumbURL TEXT, Extras TEXT, Type TEXT)')
+        'CREATE TABLE IF NOT EXISTS artists (ArtistID TEXT UNIQUE, ArtistName TEXT, ArtistSortName TEXT, DateAdded TEXT, Status TEXT, IncludeExtras INTEGER, LatestAlbum TEXT, ReleaseDate TEXT, AlbumID TEXT, HaveTracks INTEGER, TotalTracks INTEGER, LastUpdated TEXT, ArtworkURL TEXT, ThumbURL TEXT, Extras TEXT, Type TEXT, MetaCritic TEXT)')
     # ReleaseFormat here means CD,Digital,Vinyl, etc. If using the default
     # Headphones hybrid release, ReleaseID will equal AlbumID (AlbumID is
     # releasegroup id)
@@ -599,6 +599,11 @@ def dbcheck():
     except sqlite3.OperationalError:
         c.execute('ALTER TABLE artists ADD COLUMN Type TEXT DEFAULT NULL')
 
+    try:
+        c.execute('SELECT MetaCritic from artists')
+    except sqlite3.OperationalError:
+        c.execute('ALTER TABLE artists ADD COLUMN MetaCritic TEXT DEFAULT NULL')
+
     conn.commit()
     c.close()
 
diff --git a/headphones/importer.py b/headphones/importer.py
index dc6e490b..81b6bf2a 100644
--- a/headphones/importer.py
+++ b/headphones/importer.py
@@ -496,7 +496,7 @@ def addArtisttoDB(artistid, extrasonly=False, forcefull=False, type="artist"):
     cache.getThumb(ArtistID=artistid)
 
     logger.info(u"Fetching Metacritic reviews for: %s" % artist['artist_name'])
-    metacritic.update(artist['artist_name'], artist['releasegroups'])
+    metacritic.update(artistid, artist['artist_name'], artist['releasegroups'])
 
     if errors:
         logger.info("[%s] Finished updating artist: %s but with errors, so not marking it as updated in the database" % (artist['artist_name'], artist['artist_name']))
diff --git a/headphones/metacritic.py b/headphones/metacritic.py
index 959282ca..21478800 100644
--- a/headphones/metacritic.py
+++ b/headphones/metacritic.py
@@ -14,16 +14,17 @@
 #  along with Headphones.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
+import json
 import headphones
 
 from headphones import db, helpers, logger, request
 from headphones.common import USER_AGENT
 
-def update(artist_name,release_groups):
+def update(artistid, artist_name,release_groups):
     """ Pretty simple and crude function to find the artist page on metacritic,
     then parse that page to get critic & user scores for albums"""
 
-    # First let's modify the artist name to fit the metacritic convention. 
+    # First let's modify the artist name to fit the metacritic convention.
     # We could just do a search, then take the top result, but at least this will
     # cut down on api calls. If it's ineffective then we'll switch to search
 
@@ -38,24 +39,49 @@ def update(artist_name,release_groups):
 
     res = request.request_soup(url, headers=headers, parser='html.parser')
 
+    rows = None
+
     try:
         rows = res.tbody.find_all('tr')
     except:
         logger.info("Unable to get metacritic scores for: %s" % artist_name)
-        return
 
     myDB = db.DBConnection()
+    artist = myDB.action('SELECT * FROM artists WHERE ArtistID=?', [artistid]).fetchone()
 
-    for row in rows:
-        title = row.a.string
+    score_list = []
+
+    # If we couldn't get anything from MetaCritic for whatever reason,
+    # let's try to load scores from the db
+    if not rows:
+        if artist['MetaCritic']:
+            score_list = json.loads(artist['MetaCritic'])
+        else:
+            return
+
+    # If we did get scores, let's update the db with them
+    else:
+        for row in rows:
+            title = row.a.string
+            scores = row.find_all("span")
+            critic_score = scores[0].string
+            user_score = scores[1].string
+            score_dict = {'title':title,'critic_score':critic_score,'user_score':user_score}
+            score_list.append(score_dict)
+
+        # Save scores to the database
+        controlValueDict = {"ArtistID": artistid}
+        newValueDict = {'MetaCritic':json.dumps(score_list)}
+        myDB.upsert("artists", newValueDict, controlValueDict)
+
+    for score in score_list:
+        title = score['title']
+        # Iterate through the release groups we got passed to see if we can find
+        # a match
         for rg in release_groups:
             if rg['title'].lower() == title.lower():
-                scores = row.find_all("span")
-                critic_score = scores[0].string
-                user_score = scores[1].string
+                critic_score = score['critic_score']
+                user_score = score['user_score']
                 controlValueDict = {"AlbumID": rg['id']}
                 newValueDict = {'CriticScore':critic_score,'UserScore':user_score}
                 myDB.upsert("albums", newValueDict, controlValueDict)
-
-
-

From 8b6d35cfe2b8bb6c2f0c999be312c1906e760d9a Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Wed, 1 Jul 2015 02:08:13 -0700
Subject: [PATCH 09/10] Updated changelog to reflect metacritic changes

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08c067f1..635a206e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 Released xx xxx 2015
 
 Highlights:
+*Improved: Cache MetaCritic scores. Added user-agent header to fix 403 errors
 *Improved: Specify whether to delete folders when force post-processing
 *Improved: Convert target bitrate to vbr preset for what.cd searching
 *Improved: Switched Pushover to requests lib

From 624a1d5509ce971c6ee134a1fdba096ae7438110 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Wed, 1 Jul 2015 02:17:51 -0700
Subject: [PATCH 10/10] Updated changelog for 0.5.7 release

---
 CHANGELOG.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 635a206e..800f6e6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,16 @@
 # Changelog
 
 ## v0.5.7
-Released xx xxx 2015
+Released 01 July 2015
 
 Highlights:
-*Improved: Cache MetaCritic scores. Added user-agent header to fix 403 errors
-*Improved: Specify whether to delete folders when force post-processing
-*Improved: Convert target bitrate to vbr preset for what.cd searching
-*Improved: Switched Pushover to requests lib
+* Improved: Moved pushover to use requests lib
+* Improved: Plex tokens with Plex Home
+* Improved: Added getLogs & clearLogs to api
+* Improved: Cache MetaCritic scores. Added user-agent header to fix 403 errors
+* Improved: Specify whether to delete folders when force post-processing
+* Improved: Convert target bitrate to vbr preset for what.cd searching
+* Improved: Switched Pushover to requests lib
 
 The full list of commits can be found [here](https://github.com/rembo10/headphones/compare/v0.5.6...v0.5.7).