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 
Conflicts:
	couchpotato/core/loader.py
This commit is contained in:
Ruud
2013-08-24 20:22:55 +02:00
parent 2ed53df008 65896497fb
commit 96089074ce
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
couchpotato/core/loader.py
View File

@@ -37,11 +37,7 @@ class Loader(object):
self.addPath(root, ['couchpotato', 'core', 'providers'], 25, recursive = False)
# Add media to loader
self.addPath(root, ['couchpotato', 'core', 'media'], 25, recursive = False)
# Add Libraries to loader
self.addPath(root, ['couchpotato', 'core', 'media', 'movie'], 1, recursive = False)
self.addPath(root, ['couchpotato', 'core', 'media', 'show'], 1, recursive = False)
self.addPath(root, ['couchpotato', 'core', 'media'], 25, recursive = True)
for plugin_type, plugin_tuple in self.paths.iteritems():
priority, module, dir_name = plugin_tuple