dinislage/CouchPotatoServer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/develop' into tv

Browse Source
This commit is contained in:
Ruud committed 2014-03-22 09:52:32 +01:00
2 parents 0a0a1704be d4eca60b1d
commit bb4252363d
3 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

couchpotato/core/media/_base/media/main.py
+1 -1
View File
@@ -169,7 +169,7 @@ class MediaPlugin(MediaBase):
except: except:
pass pass
log.error('No media found with identifiers: %s', identifiers) log.debug('No media found with identifiers: %s', identifiers)
def list(self, types = None, status = None, release_status = None, status_or = False, limit_offset = None, starts_with = None, search = None): def list(self, types = None, status = None, release_status = None, status_or = False, limit_offset = None, starts_with = None, search = None):
couchpotato/core/media/movie/providers/metadata/base.py
+2 -1
View File
@@ -4,6 +4,7 @@ import traceback
from couchpotato.core.event import addEvent, fireEvent from couchpotato.core.event import addEvent, fireEvent
from couchpotato.core.helpers.encoding import sp from couchpotato.core.helpers.encoding import sp
from couchpotato.core.helpers.variable import getIdentifier
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.media._base.providers.metadata.base import MetaDataBase from couchpotato.core.media._base.providers.metadata.base import MetaDataBase
from couchpotato.environment import Env from couchpotato.environment import Env
@@ -27,7 +28,7 @@ class MovieMetaData(MetaDataBase):
# Update library to get latest info # Update library to get latest info
try: try:
group['media'] = fireEvent('movie.update_info', group['media'].get('_id'), identifier = group['media']['identifier'], extended = True, single = True) group['media'] = fireEvent('movie.update_info', group['media'].get('_id'), identifier = getIdentifier(group['media']), extended = True, single = True)
except: except:
log.error('Failed to update movie, before creating metadata: %s', traceback.format_exc()) log.error('Failed to update movie, before creating metadata: %s', traceback.format_exc())
couchpotato/core/plugins/renamer.py
+1 -1
View File
@@ -248,7 +248,7 @@ class Renamer(Plugin):
'profile_id': None 'profile_id': None
}, search_after = False, status = 'done', single = True) }, search_after = False, status = 'done', single = True)
else: else:
group['media'] = fireEvent('movie.update_info', identifier = group['media']['identifier'], single = True) group['media'] = fireEvent('movie.update_info', identifier = getIdentifier(group['media']), single = True)
if not group['media'] or not group['media'].get('_id'): if not group['media'] or not group['media'].get('_id'):
log.error('Could not rename, no library item to work with: %s', group_identifier) log.error('Could not rename, no library item to work with: %s', group_identifier)