Moved library and refactored to its now location. Modified anything firing libray.add/update/_release date to now fire library.add.movie...

Conflicts:
	couchpotato/core/loader.py
	couchpotato/core/media/show/_base/main.py
	couchpotato/core/media/show/library/season/main.py

couchpotato/core/loader.py

@@ -10,9 +10,19 @@ class Loader(object):
 
     plugins = {}
     providers = {}
-
     modules = {}
 
+    def addPath(self, root, base_path, priority, recursive=False):
+        for filename in os.listdir(os.path.join(root, *base_path)):
+            path = os.path.join(os.path.join(root, *base_path), filename)
+            if os.path.isdir(path) and filename[:2] != '__':
+                if not u'__init__.py' in os.listdir(path):
+                    return
+                new_base_path = ''.join(s + '.' for s in base_path)  + filename
+                self.paths[new_base_path.replace('.', '_')] = (priority, new_base_path,  path)
+                if recursive:
+                    self.addPath(root, base_path + [filename], priority, recursive=True)
+                    
     def preload(self, root = ''):
 
         core = os.path.join(root, 'couchpotato', 'core')
@@ -25,19 +35,14 @@ class Loader(object):
         }
 
         # Add providers to loader
-        provider_dir = os.path.join(root, 'couchpotato', 'core', 'providers')
+        self.addPath(root, ['couchpotato', 'core', 'providers'], 25,  recursive=False)
-        for provider in os.listdir(provider_dir):
+        
-            path = os.path.join(provider_dir, provider)
-            if os.path.isdir(path) and provider[:2] != '__' and '__init__.py' in os.listdir(path):
-                self.paths[provider + '_provider'] = (25, 'couchpotato.core.providers.' + provider, path)
-
         # Add media to loader
-        media_dir = os.path.join(root, 'couchpotato', 'core', 'media')
+        self.addPath(root, ['couchpotato', 'core', 'media'], 25,  recursive=False)
-        for media in os.listdir(media_dir):
+        
-            path = os.path.join(media_dir, media)
+        # Add Libraries to loader
-            if os.path.isdir(path) and media[:2] != '__' and '__init__.py' in os.listdir(path):
+        self.addPath(root, ['couchpotato', 'core', 'media', 'movie'], 1,  recursive=False)
-                self.paths[media + '_media'] = (25, 'couchpotato.core.media.' + media, path)
+        self.addPath(root, ['couchpotato', 'core', 'media', 'show'], 1,  recursive=False)
-
 
         for plugin_type, plugin_tuple in self.paths.iteritems():
             priority, module, dir_name = plugin_tuple
@@ -111,7 +116,12 @@ class Loader(object):
 
     def loadPlugins(self, module, name):
         try:
-            module.start()
+            klass = module.start()
+            klass.registerPlugin()
+
+            if klass and getattr(klass, 'auto_register_static'):
+                klass.registerStatic(module.__file__)
+
             return True
         except Exception, e:
             log.error('Failed loading plugin "%s": %s', (module.__file__, traceback.format_exc()))

couchpotato/core/media/_base/library/__init__.py

@@ -0,0 +1,14 @@
+from couchpotato.core.event import addEvent
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+
+
+class LibraryBase(Plugin):
+
+    _type = None
+
+    def initType(self):
+        addEvent('library.types', self.getType)
+
+    def getType(self):
+        return self._type

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

@@ -319,7 +319,7 @@ class MovieBase(MovieTypeBase):
                     if title.default: default_title = title.title
 
                 fireEvent('notify.frontend', type = 'movie.busy.%s' % x, data = True)
-                fireEventAsync('library.update', identifier = movie.library.identifier, default_title = default_title, force = True, on_complete = self.createOnComplete(x))
+                fireEventAsync('library.update.movie', identifier = movie.library.identifier, default_title = default_title, force = True, on_complete = self.createOnComplete(x))
 
         db.expire_all()
         return {
@@ -364,7 +364,7 @@ class MovieBase(MovieTypeBase):
                 pass
 
 
-        library = fireEvent('library.add', single = True, attrs = params, update_after = update_library)
+        library = fireEvent('library.add.movie', single = True, attrs = params, update_after = update_library)
 
         # Status
         status_active, snatched_status, ignored_status, done_status, downloaded_status = \
@@ -391,7 +391,7 @@ class MovieBase(MovieTypeBase):
             if search_after:
                 onComplete = self.createOnComplete(m.id)
 
-            fireEventAsync('library.update', params.get('identifier'), default_title = params.get('title', ''), on_complete = onComplete)
+            fireEventAsync('library.update.movie', params.get('identifier'), default_title = params.get('title', ''), on_complete = onComplete)
             search_after = False
         elif force_readd:
 

couchpotato/core/media/movie/library/movie/__init__.py

@@ -0,0 +1,6 @@
+from .main import MovieLibraryPlugin
+
+def start():
+    return MovieLibraryPlugin()
+
+config = []

couchpotato/core/media/movie/library/movie/main.py

@@ -2,8 +2,8 @@ from couchpotato import get_session
 from couchpotato.core.event import addEvent, fireEventAsync, fireEvent
 from couchpotato.core.helpers.encoding import toUnicode, simplifyString
 from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
 from couchpotato.core.settings.model import Library, LibraryTitle, File
+from couchpotato.core.media._base.library import LibraryBase
 from string import ascii_letters
 import time
 import traceback
@@ -11,29 +11,35 @@ import traceback
 log = CPLog(__name__)
 
 
-class LibraryPlugin(Plugin):
+class MovieLibraryPlugin(LibraryBase):
 
     default_dict = {'titles': {}, 'files':{}}
 
     def __init__(self):
-        addEvent('library.add', self.add)
+        addEvent('library.add.movie', self.add)
-        addEvent('library.update', self.update)
+        addEvent('library.update.movie', self.update)
-        addEvent('library.update_release_date', self.updateReleaseDate)
+        addEvent('library.update.movie_release_date', self.updateReleaseDate)
 
     def add(self, attrs = {}, update_after = True):
-
+        # movies don't yet contain these, so lets make sure to set defaults
+        type = attrs.get('type', 'movie')
+        primary_provider = attrs.get('primary_provider', 'imdb')
+        
         db = get_session()
-
+        
-        l = db.query(Library).filter_by(identifier = attrs.get('identifier')).first()
+        l = db.query(Library).filter_by(type = type, identifier = attrs.get('identifier')).first()
         if not l:
             status = fireEvent('status.get', 'needs_update', single = True)
             l = Library(
+                type = type, 
+                primary_provider = primary_provider, 
                 year = attrs.get('year'),
                 identifier = attrs.get('identifier'),
                 plot = toUnicode(attrs.get('plot')),
                 tagline = toUnicode(attrs.get('tagline')),
                 status_id = status.get('id'),
                 info = {},
+                parent = None, 
             )
 
             title = LibraryTitle(
@@ -49,7 +55,7 @@ class LibraryPlugin(Plugin):
         # Update library info
         if update_after is not False:
             handle = fireEventAsync if update_after is 'async' else fireEvent
-            handle('library.update', identifier = l.identifier, default_title = toUnicode(attrs.get('title', '')))
+            handle('library.update.movie', identifier = l.identifier, default_title = toUnicode(attrs.get('title', '')))
 
         library_dict = l.to_dict(self.default_dict)
 
@@ -70,20 +76,17 @@ class LibraryPlugin(Plugin):
 
         do_update = True
 
-        if library.status_id == done_status.get('id') and not force:
+        info = fireEvent('movie.info', merge = True, identifier = identifier)
-            do_update = False
-        else:
-            info = fireEvent('movie.info', merge = True, identifier = identifier)
 
-            # Don't need those here
+        # Don't need those here
-            try: del info['in_wanted']
+        try: del info['in_wanted']
-            except: pass
+        except: pass
-            try: del info['in_library']
+        try: del info['in_library']
-            except: pass
+        except: pass
 
-            if not info or len(info) == 0:
+        if not info or len(info) == 0:
-                log.error('Could not update, no movie info to work with: %s', identifier)
+            log.error('Could not update, no movie info to work with: %s', identifier)
-                return False
+            return False
 
         # Main info
         if do_update:

couchpotato/core/media/movie/searcher/main.py

@@ -100,7 +100,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
                     self.single(movie_dict, search_protocols)
                 except IndexError:
                     log.error('Forcing library update for %s, if you see this often, please report: %s', (movie_dict['library']['identifier'], traceback.format_exc()))
-                    fireEvent('library.update', movie_dict['library']['identifier'], force = True)
+                    fireEvent('library.update.movie', movie_dict['library']['identifier'], force = True)
                 except:
                     log.error('Search failed for %s: %s', (movie_dict['library']['identifier'], traceback.format_exc()))
 
@@ -133,7 +133,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
         db = get_session()
 
         pre_releases = fireEvent('quality.pre_releases', single = True)
-        release_dates = fireEvent('library.update_release_date', identifier = movie['library']['identifier'], merge = True)
+        release_dates = fireEvent('library.update.movie_release_date', identifier = movie['library']['identifier'], merge = True)
         available_status, ignored_status, failed_status = fireEvent('status.get', ['available', 'ignored', 'failed'], single = True)
 
         found_releases = []

couchpotato/core/plugins/library/__init__.py

@@ -1,6 +0,0 @@
-from .main import LibraryPlugin
-
-def start():
-    return LibraryPlugin()
-
-config = []

couchpotato/core/plugins/manage/main.py

@@ -182,7 +182,7 @@ class Manage(Plugin):
 
                 # Add it to release and update the info
                 fireEvent('release.add', group = group)
-                fireEventAsync('library.update', identifier = identifier, on_complete = self.createAfterUpdate(folder, identifier))
+                fireEventAsync('library.update.movie', identifier = identifier, on_complete = self.createAfterUpdate(folder, identifier))
             else:
                 self.in_progress[folder]['to_go'] = self.in_progress[folder]['to_go'] - 1
 

couchpotato/core/plugins/renamer/main.py

@@ -161,7 +161,7 @@ class Renamer(Plugin):
                 continue
             # Rename the files using the library data
             else:
-                group['library'] = fireEvent('library.update', identifier = group['library']['identifier'], single = True)
+                group['library'] = fireEvent('library.update.movie', identifier = group['library']['identifier'], single = True)
                 if not group['library']:
                     log.error('Could not rename, no library item to work with: %s', group_identifier)
                     continue

couchpotato/core/plugins/scanner/main.py

@@ -620,7 +620,7 @@ class Scanner(Plugin):
                     log.debug('Identifier to short to use for search: %s', identifier)
 
         if imdb_id:
-            return fireEvent('library.add', attrs = {
+            return fireEvent('library.add.movie', attrs = {
                 'identifier': imdb_id
             }, update_after = False, single = True)
 

couchpotato/core/providers/metadata/base.py

@@ -24,7 +24,7 @@ class MetaDataBase(Plugin):
 
         # Update library to get latest info
         try:
-            updated_library = fireEvent('library.update', group['library']['identifier'], force = True, single = True)
+            updated_library = fireEvent('library.update.movie', group['library']['identifier'], force = True, single = True)
             group['library'] = mergeDicts(group['library'], updated_library)
         except:
             log.error('Failed to update movie, before creating metadata: %s', traceback.format_exc())