Ignore deleted media documents
This commit is contained in:
@@ -26,9 +26,9 @@ class MediaBase(Plugin):
|
|||||||
def onComplete():
|
def onComplete():
|
||||||
try:
|
try:
|
||||||
media = fireEvent('media.get', media_id, single = True)
|
media = fireEvent('media.get', media_id, single = True)
|
||||||
event_name = '%s.searcher.single' % media.get('type')
|
if media:
|
||||||
|
event_name = '%s.searcher.single' % media.get('type')
|
||||||
fireEventAsync(event_name, media, on_complete = self.createNotifyFront(media_id), manual = True)
|
fireEventAsync(event_name, media, on_complete = self.createNotifyFront(media_id), manual = True)
|
||||||
except:
|
except:
|
||||||
log.error('Failed creating onComplete: %s', traceback.format_exc())
|
log.error('Failed creating onComplete: %s', traceback.format_exc())
|
||||||
|
|
||||||
@@ -39,9 +39,9 @@ class MediaBase(Plugin):
|
|||||||
def notifyFront():
|
def notifyFront():
|
||||||
try:
|
try:
|
||||||
media = fireEvent('media.get', media_id, single = True)
|
media = fireEvent('media.get', media_id, single = True)
|
||||||
event_name = '%s.update' % media.get('type')
|
if media:
|
||||||
|
event_name = '%s.update' % media.get('type')
|
||||||
fireEvent('notify.frontend', type = event_name, data = media)
|
fireEvent('notify.frontend', type = event_name, data = media)
|
||||||
except:
|
except:
|
||||||
log.error('Failed creating onComplete: %s', traceback.format_exc())
|
log.error('Failed creating onComplete: %s', traceback.format_exc())
|
||||||
|
|
||||||
|
|||||||
@@ -282,6 +282,10 @@ class MediaPlugin(MediaBase):
|
|||||||
|
|
||||||
media = fireEvent('media.get', media_id, single = True)
|
media = fireEvent('media.get', media_id, single = True)
|
||||||
|
|
||||||
|
# Skip if no media has been found
|
||||||
|
if not media:
|
||||||
|
continue
|
||||||
|
|
||||||
# Merge releases with movie dict
|
# Merge releases with movie dict
|
||||||
medias.append(media)
|
medias.append(media)
|
||||||
|
|
||||||
|
|||||||
@@ -179,6 +179,9 @@ class MovieBase(MovieTypeBase):
|
|||||||
db.delete(rel)
|
db.delete(rel)
|
||||||
|
|
||||||
movie_dict = fireEvent('media.get', m['_id'], single = True)
|
movie_dict = fireEvent('media.get', m['_id'], single = True)
|
||||||
|
if not movie_dict:
|
||||||
|
log.debug('Failed adding media, can\'t find it anymore')
|
||||||
|
return False
|
||||||
|
|
||||||
if do_search and search_after:
|
if do_search and search_after:
|
||||||
onComplete = self.createOnComplete(m['_id'])
|
onComplete = self.createOnComplete(m['_id'])
|
||||||
|
|||||||
@@ -89,6 +89,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
|
|||||||
for media_id in medias:
|
for media_id in medias:
|
||||||
|
|
||||||
media = fireEvent('media.get', media_id, single = True)
|
media = fireEvent('media.get', media_id, single = True)
|
||||||
|
if not media: continue
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.single(media, search_protocols, manual = manual)
|
self.single(media, search_protocols, manual = manual)
|
||||||
@@ -388,9 +389,10 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
|
|||||||
rel['status'] = 'ignored'
|
rel['status'] = 'ignored'
|
||||||
db.update(rel)
|
db.update(rel)
|
||||||
|
|
||||||
movie_dict = fireEvent('media.get', media_id, single = True)
|
media = fireEvent('media.get', media_id, single = True)
|
||||||
log.info('Trying next release for: %s', getTitle(movie_dict))
|
if media:
|
||||||
self.single(movie_dict, manual = manual, force_download = force_download)
|
log.info('Trying next release for: %s', getTitle(media))
|
||||||
|
self.single(media, manual = manual, force_download = force_download)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,8 @@ class Automation(Plugin):
|
|||||||
break
|
break
|
||||||
|
|
||||||
movie_dict = fireEvent('media.get', movie_id, single = True)
|
movie_dict = fireEvent('media.get', movie_id, single = True)
|
||||||
fireEvent('movie.searcher.single', movie_dict)
|
if movie_dict:
|
||||||
|
fireEvent('movie.searcher.single', movie_dict)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import random as rndm
|
import random as rndm
|
||||||
import time
|
import time
|
||||||
|
from CodernityDB.database import RecordDeleted
|
||||||
|
|
||||||
from couchpotato import get_db
|
from couchpotato import get_db
|
||||||
from couchpotato.api import addApiView
|
from couchpotato.api import addApiView
|
||||||
@@ -58,7 +59,11 @@ class Dashboard(Plugin):
|
|||||||
rndm.shuffle(active_ids)
|
rndm.shuffle(active_ids)
|
||||||
|
|
||||||
for media_id in active_ids:
|
for media_id in active_ids:
|
||||||
media = db.get('id', media_id)
|
try:
|
||||||
|
media = db.get('id', media_id)
|
||||||
|
except RecordDeleted:
|
||||||
|
log.debug('Record already deleted: %s', media_id)
|
||||||
|
continue
|
||||||
|
|
||||||
pp = profile_pre.get(media.get('profile_id'))
|
pp = profile_pre.get(media.get('profile_id'))
|
||||||
if not pp: continue
|
if not pp: continue
|
||||||
|
|||||||
@@ -234,7 +234,8 @@ class Manage(Plugin):
|
|||||||
total = self.in_progress[folder]['total']
|
total = self.in_progress[folder]['total']
|
||||||
movie_dict = fireEvent('media.get', identifier, single = True)
|
movie_dict = fireEvent('media.get', identifier, single = True)
|
||||||
|
|
||||||
fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = None if total > 5 else 'Added "%s" to manage.' % getTitle(movie_dict))
|
if movie_dict:
|
||||||
|
fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = None if total > 5 else 'Added "%s" to manage.' % getTitle(movie_dict))
|
||||||
|
|
||||||
return afterUpdate
|
return afterUpdate
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user