Merge branch 'refs/heads/develop'

couchpotato/core/media/_base/media/main.py

@@ -411,6 +411,8 @@ class MediaPlugin(MediaBase):
                     elif new_media_status:
                         media['status'] = new_media_status
                         db.update(media)
+
+                        fireEvent('media.untag', media['_id'], 'recent', single = True)
                     else:
                         fireEvent('media.restatus', media.get('_id'), single = True)
 

couchpotato/core/media/movie/_base/static/movie.actions.js

@@ -302,7 +302,7 @@ MA.Release = new Class({
 			self.movie.data.releases.each(function(release){
 				if(has_available && has_snatched) return;
 
-				if(['snatched', 'downloaded', 'seeding'].contains(release.status))
+				if(['snatched', 'downloaded', 'seeding', 'done'].contains(release.status))
 					has_snatched = true;
 
 				if(['available'].contains(release.status))

couchpotato/core/media/movie/library.py

@@ -1,4 +1,5 @@
 from couchpotato.core.event import addEvent
+from couchpotato.core.helpers.variable import getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.library.base import LibraryBase
 
@@ -17,7 +18,9 @@ class MovieLibraryPlugin(LibraryBase):
         if media.get('type') != 'movie':
             return
 
+        default_title = getTitle(media)
         titles = media['info'].get('titles', [])
+        titles.insert(0, default_title)
 
         # Add year identifier to titles
         if include_year:

couchpotato/core/media/movie/searcher.py

@@ -220,7 +220,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
                     log.debug('Found %s releases for "%s", but ETA isn\'t correct yet.', (results_count, default_title))
 
             # Try find a valid result and download it
-            if (force_download or not could_not_be_released) and fireEvent('release.try_download_result', results, movie, quality_custom, single = True):
+            if (force_download or not could_not_be_released or alway_search) and fireEvent('release.try_download_result', results, movie, quality_custom, single = True):
                 ret = True
 
             # Remove releases that aren't found anymore

couchpotato/core/notifications/pushover.py

@@ -13,7 +13,6 @@ autoload = 'Pushover'
 
 class Pushover(Notification):
 
-    app_token = 'YkxHMYDZp285L265L3IwH3LmzkTaCy'
 
     def notify(self, message = '', data = None, listener = None):
         if not data: data = {}
@@ -22,7 +21,7 @@ class Pushover(Notification):
 
         api_data = {
             'user': self.conf('user_key'),
-            'token': self.app_token,
+            'token': self.conf('api_token'),
             'message': toUnicode(message),
             'priority': self.conf('priority'),
             'sound': self.conf('sound'),
@@ -49,7 +48,7 @@ class Pushover(Notification):
             log.error('Pushover auth failed: %s', response.reason)
             return False
         else:
-            log.error('Pushover notification failed.')
+            log.error('Pushover notification failed: %s', request_status)
             return False
 
 
@@ -70,6 +69,12 @@ config = [{
                     'name': 'user_key',
                     'description': 'Register on pushover.net to get one.'
                 },
+                {
+                    'name': 'api_token',
+                    'description': '<a href="https://pushover.net/apps/clone/couchpotato" target="_blank">Register on pushover.net</a> to get one.',
+                    'advanced': True,
+                    'default': 'YkxHMYDZp285L265L3IwH3LmzkTaCy',
+                },
                 {
                     'name': 'priority',
                     'default': 0,

couchpotato/core/plugins/manage.py

@@ -166,10 +166,9 @@ class Manage(Plugin):
                                         already_used = used_files.get(release_file)
 
                                         if already_used:
+                                            release_id = release['_id'] if already_used.get('last_edit', 0) < release.get('last_edit', 0) else already_used['_id']
                                             if release_id not in deleted_releases:
-                                                release_id = release['_id'] if already_used.get('last_edit', 0) < release.get('last_edit', 0) else already_used['_id']
                                                 fireEvent('release.delete', release_id, single = True)
-
                                                 deleted_releases.append(release_id)
                                             break
                                         else: