From 1345e984c4dfad686ac0cfd10b76995b74fbeb34 Mon Sep 17 00:00:00 2001 From: Ruud Date: Wed, 2 May 2012 21:35:37 +0200 Subject: [PATCH] Fixes for desktop imports --- couchpotato/core/loader.py | 1 + couchpotato/core/providers/metadata/base.py | 4 ++-- libs/guessit/fileutils.py | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/couchpotato/core/loader.py b/couchpotato/core/loader.py index ee7afcb..957a699 100644 --- a/couchpotato/core/loader.py +++ b/couchpotato/core/loader.py @@ -58,6 +58,7 @@ class Loader(object): pass # todo:: this needs to be more descriptive. log.error('Import error, remove the empty folder: %s' % plugin.get('module')) + log.debug('Can\'t import %s: %s' % (module_name, traceback.format_exc())) except: log.error('Can\'t import %s: %s' % (module_name, traceback.format_exc())) diff --git a/couchpotato/core/providers/metadata/base.py b/couchpotato/core/providers/metadata/base.py index 3819d56..0f59c9f 100644 --- a/couchpotato/core/providers/metadata/base.py +++ b/couchpotato/core/providers/metadata/base.py @@ -29,7 +29,7 @@ class MetaDataBase(Plugin): log.error('Failed to update movie, before creating metadata: %s' % traceback.format_exc()) root_name = self.getRootName(release) - name = os.path.basename(root_name) + meta_name = os.path.basename(root_name) root = os.path.dirname(root_name) movie_info = release['library'].get('info') @@ -37,7 +37,7 @@ class MetaDataBase(Plugin): for file_type in ['nfo', 'thumbnail', 'fanart']: try: # Get file path - name = getattr(self, 'get' + file_type.capitalize() + 'Name')(name, root) + name = getattr(self, 'get' + file_type.capitalize() + 'Name')(meta_name, root) if name and self.conf('meta_' + file_type): diff --git a/libs/guessit/fileutils.py b/libs/guessit/fileutils.py index 13d12c5..e146390 100644 --- a/libs/guessit/fileutils.py +++ b/libs/guessit/fileutils.py @@ -18,7 +18,6 @@ # along with this program. If not, see . # -import ntpath import os.path import zipfile @@ -46,7 +45,7 @@ def split_path(path): """ result = [] while True: - head, tail = ntpath.split(path) + head, tail = os.path.split(path) # on Unix systems, the root folder is '/' if head == '/' and tail == '':