Merge remote-tracking branch 'origin/master'

# Conflicts:
#	resources/settings.xml
This commit is contained in:
marco
2020-04-09 13:37:41 +02:00
11 changed files with 276 additions and 215 deletions
+2 -2
View File
@@ -28,9 +28,9 @@ VIDEOLIBRARY_PATH = config.get_videolibrary_path()
MOVIES_PATH = filetools.join(VIDEOLIBRARY_PATH, FOLDER_MOVIES)
TVSHOWS_PATH = filetools.join(VIDEOLIBRARY_PATH, FOLDER_TVSHOWS)
if not FOLDER_MOVIES or not FOLDER_TVSHOWS or not VIDEOLIBRARY_PATH \
"""if not FOLDER_MOVIES or not FOLDER_TVSHOWS or not VIDEOLIBRARY_PATH \
or not filetools.exists(MOVIES_PATH) or not filetools.exists(TVSHOWS_PATH):
config.verify_directories_created()
config.verify_directories_created()"""
addon_name = "plugin://plugin.video.%s/" % config.PLUGIN_NAME