Merge remote-tracking branch 'origin/master'

specials/community.py

@@ -283,7 +283,7 @@ def episodios(item, json ='', key='', itemlist =[]):
     ep = 1
     season = infoLabels['season'] if 'season' in infoLabels else item.contentSeason if item.contentSeason else 1
 
-    if inspect.stack()[1][3] not in ['add_tvshow', 'get_episodes', 'update', 'find_episodes', 'search']:
+    if inspect.stack()[1][3] not in ['add_tvshow', 'get_episodes', 'update', 'find_episodes', 'search'] and not show_seasons:
         Pagination = int(defp) if defp.isdigit() else ''
     else: Pagination = ''
     pag = item.page if item.page else 1
@@ -314,7 +314,7 @@ def episodios(item, json ='', key='', itemlist =[]):
         title = ' - ' + option['title'] if 'title' in option else ''
         title = '%sx%s%s' % (season_number, episode_number, title)
         extra = set_extra_values(item, option, item.path)
-        if season_number == item.filterseason or not item.filterseason:
+        if not item.filterseason or season_number == int(item.filterseason):
             itemlist.append(Item(channel = item.channel,
                                  title = set_title(title, extra.language, extra.quality),
                                  fulltitle = item.fulltitle,

specials/move_videolibrary.py

@@ -153,6 +153,7 @@ def update_db(current_path, new_path, current_movies_folder, new_movies_folder,
         p += 5
         progress.update(90, config.get_localized_string(20000), config.get_localized_string(80013))
 
+
 def clear_videolibrary_db():
     log()
     progress = platformtools.dialog_progress_bg(config.get_localized_string(20000), config.get_localized_string(60601))
@@ -224,6 +225,8 @@ def clear_videolibrary_db():
 
 def set_new_path(old, new=''):
     log()
+    if new == old: return
+
     SOURCES_PATH = xbmc.translatePath("special://userdata/sources.xml")
     if filetools.isfile(SOURCES_PATH):
         xmldoc = minidom.parse(SOURCES_PATH)