diff --git a/couchpotato/core/helpers/variable.py b/couchpotato/core/helpers/variable.py index 459d0e9b..16207a64 100644 --- a/couchpotato/core/helpers/variable.py +++ b/couchpotato/core/helpers/variable.py @@ -307,3 +307,9 @@ def scanForPassword(name): if m: return m.group(1).strip('. '), m.group(2).strip() + + +under_pat = re.compile(r'_([a-z])') + +def underscoreToCamel(name): + return under_pat.sub(lambda x: x.group(1).upper(), name) diff --git a/couchpotato/core/media/movie/providers/metadata/base.py b/couchpotato/core/media/movie/providers/metadata/base.py index 0d25fba4..93a513d7 100644 --- a/couchpotato/core/media/movie/providers/metadata/base.py +++ b/couchpotato/core/media/movie/providers/metadata/base.py @@ -4,7 +4,7 @@ import traceback from couchpotato.core.event import addEvent, fireEvent from couchpotato.core.helpers.encoding import sp -from couchpotato.core.helpers.variable import getIdentifier +from couchpotato.core.helpers.variable import getIdentifier, underscoreToCamel from couchpotato.core.logger import CPLog from couchpotato.core.media._base.providers.metadata.base import MetaDataBase from couchpotato.environment import Env @@ -37,7 +37,7 @@ class MovieMetaData(MetaDataBase): root = os.path.dirname(root_name) movie_info = group['media'].get('info') - + for file_type in ['nfo']: try: self._createType(meta_name, root, movie_info, group, file_type, 0) @@ -59,12 +59,13 @@ class MovieMetaData(MetaDataBase): log.error('Unable to create %s file: %s', (file_type, traceback.format_exc())) def _createType(self, meta_name, root, movie_info, group, file_type, i): # Get file path - name = getattr(self, 'get' + file_type.capitalize() + 'Name')(meta_name, root, i) + camelcase_method = underscoreToCamel(file_type.capitalize()) + name = getattr(self, 'get' + camelcase_method + 'Name')(meta_name, root, i) if name and (self.conf('meta_' + file_type) or self.conf('meta_' + file_type) is None): # Get file content - content = getattr(self, 'get' + file_type.capitalize())(movie_info = movie_info, data = group, i = i) + content = getattr(self, 'get' + camelcase_method)(movie_info = movie_info, data = group, i = i) if content: log.debug('Creating %s file: %s', (file_type, name)) if os.path.isfile(content): @@ -113,7 +114,7 @@ class MovieMetaData(MetaDataBase): def getLandscapeName(self, name, root, i): return - + def getExtrathumbsName(self, name, root, i): return