diff --git a/channels/cineblog01.py b/channels/cineblog01.py
index fdce9082..33f542a5 100644
--- a/channels/cineblog01.py
+++ b/channels/cineblog01.py
@@ -152,7 +152,7 @@ def peliculas(item):
action = 'findvideos'
else:
# debug = True
- patron = r'div class="card-image">.*?
(?P
.*?)(?P(?:[Ss][Uu][Bb]-)?[Ii][Tt][Aa])?<\/a>.*?(?:(?P[^<>0-9(]+)\((?P[0-9]{4}).*?(?:p|div)>(?P.*?))?.*?
(?P.*?)(?: – (?:[SS]tagione \d|\d).*?)?(?P(?:[Ss][Uu][Bb]-)?[Ii][Tt][Aa])?<\/a>.*?(?:(?P[^<>0-9(]+)\((?P[0-9]{4}).*?(?:p|div)>(?P.*?))?= 3: PY3 = True; unicode = str; unichr = chr; long = int
addon = xbmcaddon.Addon('plugin.video.kod')
+addonname = addon.getAddonInfo('name')
_hdr_pat = re.compile("^@@ -(\d+),?(\d+)? \+(\d+),?(\d+)? @@.*")
@@ -43,7 +44,7 @@ def loadCommits(page=1):
except:
xbmc.sleep(1000)
else:
- platformtools.dialog_notification('Kodi on Demand', 'impossibile controllare gli aggiornamenti')
+ platformtools.dialog_notification(addonname, config.get_localized_string(70675))
ret = None
return ret
diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py
index 5377e848..8e5219d8 100644
--- a/platformcode/xbmc_videolibrary.py
+++ b/platformcode/xbmc_videolibrary.py
@@ -1034,6 +1034,28 @@ def execute_sql_kodi(sql):
return nun_records, records
+def check_sources(new_movies_path='', new_tvshows_path=''):
+ logger.info()
+
+ try:
+ SOURCES_PATH = xbmc.translatePath("special://userdata/sources.xml")
+ if filetools.isfile(SOURCES_PATH):
+ xmldoc = minidom.parse(SOURCES_PATH)
+
+ # collect nodes
+ # nodes = xmldoc.getElementsByTagName("video")
+ video_node = xmldoc.childNodes[0].getElementsByTagName("video")[0]
+ paths_node = video_node.getElementsByTagName("path")
+
+ # check paths
+ list_path = [p.firstChild.data for p in paths_node]
+ if new_movies_path in list_path or new_tvshows_path in list_path:
+ return True
+ return False
+ except:
+ return True
+
+
def update_sources(new='', old=''):
logger.info()
if new == old: return True
diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index 8546ac19..ff7e3874 100644
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -76,15 +76,15 @@ msgid "Password"
msgstr ""
msgctxt "#30017"
-msgid "Download path"
+msgid "Download path*"
msgstr ""
msgctxt "#30018"
-msgid "Download list path"
+msgid "Download list path*"
msgstr ""
msgctxt "#30019"
-msgid "Filter channels by language"
+msgid "Channels language"
msgstr ""
msgctxt "#30020"
@@ -204,7 +204,7 @@ msgid "Unsopported Server"
msgstr ""
msgctxt "#30067"
-msgid "Path"
+msgid "Path*"
msgstr ""
msgctxt "#30068"
@@ -1561,7 +1561,7 @@ msgid "Information"
msgstr ""
msgctxt "#60349"
-msgid "Go to the Main Menu"
+msgid "Go to the main menu"
msgstr ""
msgctxt "#60350"
@@ -1581,7 +1581,7 @@ msgid "Add movie to video library"
msgstr ""
msgctxt "#60354"
-msgid "Download Movie"
+msgid "Download movie"
msgstr ""
msgctxt "#60355"
@@ -1589,19 +1589,19 @@ msgid "Download TV show"
msgstr ""
msgctxt "#60356"
-msgid "Download Episode"
+msgid "Download episode"
msgstr ""
msgctxt "#60357"
-msgid "Download Season"
+msgid "Download season"
msgstr ""
msgctxt "#60358"
-msgid "Open Configuration"
+msgid "Open configuration"
msgstr ""
msgctxt "#60359"
-msgid "Search Trailer"
+msgid "Search trailer"
msgstr ""
msgctxt "#60360"
@@ -1609,7 +1609,7 @@ msgid "Show quick menu"
msgstr ""
msgctxt "#60361"
-msgid "Super Favourites Menu"
+msgid "Super favourites menu"
msgstr ""
msgctxt "#60362"
@@ -1817,8 +1817,8 @@ msgid "Channels included in the global search "
msgstr ""
msgctxt "#60422"
-msgid "Search "
-msgstr ""
+msgid "Channels search"
+msgstr "Ricerca canali"
msgctxt "#60423"
msgid "Search"
@@ -2849,7 +2849,7 @@ msgid "Reload"
msgstr ""
msgctxt "#70009"
-msgid "Classic Menu"
+msgid "Main menu"
msgstr ""
msgctxt "#70010"
@@ -2925,7 +2925,7 @@ msgid "Search engine settings"
msgstr ""
msgctxt "#70028"
-msgid "Most Popular"
+msgid "Most popular"
msgstr ""
msgctxt "#70029"
@@ -3213,7 +3213,7 @@ msgid "Video library %s configured"
msgstr ""
msgctxt "#70104"
-msgid "The Kodi video library has been configured correctly"
+msgid "The Kodi video library has been successfully configured"
msgstr ""
msgctxt "#70105"
@@ -3269,15 +3269,15 @@ msgid "Confirm new password"
msgstr ""
msgctxt "#70118"
-msgid "TV shows folder"
+msgid "TV shows folder*"
msgstr ""
msgctxt "#70119"
-msgid "Movies folder"
+msgid "Movies folder*"
msgstr ""
msgctxt "#70120"
-msgid "Add KoD content to Kodi video library"
+msgid "Add KoD content to Kodi video library*"
msgstr ""
msgctxt "#70121"
@@ -3405,11 +3405,11 @@ msgid "Show ExtendedInfo"
msgstr ""
msgctxt "#70153"
-msgid "KoD shortcut"
+msgid "Shortcut"
msgstr ""
msgctxt "#70154"
-msgid "TMDB search options"
+msgid "TMDB search"
msgstr ""
msgctxt "#70155"
@@ -5001,15 +5001,15 @@ msgid "Select color:"
msgstr ""
msgctxt "#70559"
-msgid "Now in Theatres "
+msgid "Now in theatres "
msgstr ""
msgctxt "#70560"
-msgid "Movies by Genre"
+msgid "Movies by genre"
msgstr ""
msgctxt "#70561"
-msgid "Search Similar"
+msgid "Search similar"
msgstr ""
msgctxt "#70562"
@@ -5081,7 +5081,7 @@ msgid "Torrents"
msgstr ""
msgctxt "#70579"
-msgid "KoD update"
+msgid "Updates"
msgstr ""
msgctxt "#70580"
@@ -5476,7 +5476,7 @@ msgid "KoD updates"
msgstr ""
msgctxt "#70675"
-msgid "Error checking updates"
+msgid "Impossible to check the updates"
msgstr ""
msgctxt "#70676"
@@ -5628,11 +5628,11 @@ msgid "Modify "
msgstr " "
msgctxt "#70715"
-msgid "Customized homepage"
+msgid "Customized main menu"
msgstr ""
msgctxt "#70716"
-msgid "Homepage categories"
+msgid "Main menu items"
msgstr ""
msgctxt "#70717"
@@ -5784,7 +5784,7 @@ msgid "Playback"
msgstr ""
msgctxt "#70754"
-msgid "Display mode"
+msgid "View types"
msgstr ""
msgctxt "#70755"
@@ -5911,14 +5911,30 @@ msgctxt "#70785"
msgid "Install Quasar"
msgstr ""
+msgctxt "#70786"
+msgid "Autostart"
+msgstr ""
+
+msgctxt "#70787"
+msgid "Network"
+msgstr ""
+
+msgctxt "#70788"
+msgid "Logging"
+msgstr ""
+
+msgctxt "#70789"
+msgid "* Change by opening the settings from the main menu of KoD"
+msgstr ""
+
# DNS start [ settings and declaration ]
msgctxt "#707401"
-msgid "Enable DNS Check Alert"
+msgid "Enable DNS check alert"
msgstr ""
msgctxt "#707402"
-msgid "Connection or DNS problems"
+msgid "Connection or DNS problem"
msgstr ""
msgctxt "#707403"
@@ -6159,4 +6175,8 @@ msgstr ""
msgctxt "#80027"
msgid "You will be asked to configure The Movie Database for movies and The TVDB for TV shows"
+msgstr ""
+
+msgctxt "#80028"
+msgid "The path and/or the folders you selected are already used by the Kodi library. Please select other ones"
msgstr ""
\ No newline at end of file
diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po
index edac832a..c731831f 100644
--- a/resources/language/Italian/strings.po
+++ b/resources/language/Italian/strings.po
@@ -76,16 +76,16 @@ msgid "Password"
msgstr "Password"
msgctxt "#30017"
-msgid "Download path"
-msgstr "Percorso download"
+msgid "Download path*"
+msgstr "Percorso download*"
msgctxt "#30018"
-msgid "Download list path"
-msgstr "Percorso lista downloads"
+msgid "Download list path*"
+msgstr "Percorso lista downloads*"
msgctxt "#30019"
-msgid "Filter channels by language"
-msgstr "Filtra canale per lingua"
+msgid "Channels language"
+msgstr "Lingua canali"
msgctxt "#30020"
msgid "Check if the links exist"
@@ -105,7 +105,7 @@ msgstr "NO"
msgctxt "#30024"
msgid "Contextual menu"
-msgstr "Menu contestuale"
+msgstr "Menù contestuale"
msgctxt "#30025"
msgid "Show KoD settings"
@@ -204,8 +204,8 @@ msgid "Unsopported Server"
msgstr "Server non supportato"
msgctxt "#30067"
-msgid "Path"
-msgstr "Percorso"
+msgid "Path*"
+msgstr "Percorso*"
msgctxt "#30068"
msgid "Filter by servers"
@@ -305,7 +305,7 @@ msgstr "Il film "%s" è stato aggiunto alla videoteca"
msgctxt "#30136"
msgid "Original version"
-msgstr "Versione Originale"
+msgstr "Versione originale"
msgctxt "#30137"
msgid "Direct"
@@ -1560,8 +1560,8 @@ msgid "Information"
msgstr "Informazione"
msgctxt "#60349"
-msgid "Go to the Main Menu"
-msgstr "Andare al Menu Principale"
+msgid "Go to the main menu"
+msgstr "Andare al menù principale"
msgctxt "#60350"
msgid "Search in other channels"
@@ -1580,36 +1580,36 @@ msgid "Add movie to video library"
msgstr "Aggiungi film alla videoteca"
msgctxt "#60354"
-msgid "Download Movie"
-msgstr "Scarica Film"
+msgid "Download movie"
+msgstr "Scarica film"
msgctxt "#60355"
msgid "Download TV show"
msgstr "Scarica serie TV"
msgctxt "#60356"
-msgid "Download Episode"
-msgstr "Scarica Episodio"
+msgid "Download episode"
+msgstr "Scarica episodio"
msgctxt "#60357"
-msgid "Download Season"
-msgstr "Scarica Stagione"
+msgid "Download season"
+msgstr "Scarica stagione"
msgctxt "#60358"
-msgid "Open Configuration"
-msgstr "Apri Configurazione"
+msgid "Open configuration"
+msgstr "Apri configurazione"
msgctxt "#60359"
-msgid "Search Trailer"
-msgstr "Cerca Trailer"
+msgid "Search trailer"
+msgstr "Cerca trailer"
msgctxt "#60360"
msgid "Show quick menu"
-msgstr "Mostra menu rapido"
+msgstr "Mostra menù rapido"
msgctxt "#60361"
-msgid "Super Favourites Menu"
-msgstr "Super Favourites Menu"
+msgid "Super favourites menu"
+msgstr "Menù super favoriti"
msgctxt "#60362"
msgid "You can't watch this video because..."
@@ -1816,8 +1816,8 @@ msgid "Channels included in the global search "
msgstr "Canali inclusi nella ricerca globale: "
msgctxt "#60422"
-msgid "Search "
-msgstr "Ricerca "
+msgid "Channels search"
+msgstr "Ricerca canali"
msgctxt "#60423"
msgid "Search"
@@ -2389,7 +2389,7 @@ msgstr "Ripristina videoteca (strm, nfo e json)"
msgctxt "#60568"
msgid "Search for new episodes and update video library"
-msgstr "Cerca nuovi episodi e aggiorna videoteca"
+msgstr "Cerca nuovi episodi ed aggiorna videoteca"
msgctxt "#60569"
msgid " - There are no default settings"
@@ -2848,8 +2848,8 @@ msgid "Reload"
msgstr "Ricarica"
msgctxt "#70009"
-msgid "Classic Menu"
-msgstr "Menu Principale"
+msgid "Main menu"
+msgstr "Menù principale"
msgctxt "#70010"
msgid "Where To Search"
@@ -2924,8 +2924,8 @@ msgid "Search engine settings"
msgstr "Impostazioni motori di ricerca"
msgctxt "#70028"
-msgid "Most Popular"
-msgstr "Più Popolari"
+msgid "Most popular"
+msgstr "Più popolari"
msgctxt "#70029"
msgid "Top rated"
@@ -3212,7 +3212,7 @@ msgid "Video library %s configured"
msgstr "Videoteca %s configurata"
msgctxt "#70104"
-msgid "The Kodi video library has been configured correctly"
+msgid "The Kodi video library has been successfully configured"
msgstr "La libreria di Kodi è stata configurata correttamente"
msgctxt "#70105"
@@ -3268,16 +3268,16 @@ msgid "Confirm new password"
msgstr "Conferma nuova password"
msgctxt "#70118"
-msgid "TV shows folder"
-msgstr "Cartella serie TV"
+msgid "TV shows folder*"
+msgstr "Cartella serie TV*"
msgctxt "#70119"
-msgid "Movies folder"
-msgstr "Cartella film"
+msgid "Movies folder*"
+msgstr "Cartella film*"
msgctxt "#70120"
-msgid "Add KoD content to Kodi video library"
-msgstr "Aggiungi i contenuti di KoD alla videoteca di Kodi"
+msgid "Add KoD content to Kodi video library*"
+msgstr "Aggiungi i contenuti di KoD alla videoteca di Kodi*"
msgctxt "#70121"
msgid "Activate"
@@ -3404,12 +3404,12 @@ msgid "Show ExtendedInfo"
msgstr "Mostra ExtendedInfo"
msgctxt "#70153"
-msgid "KoD shortcut"
-msgstr "Scorciatoia KoD"
+msgid "Shortcut"
+msgstr "Scorciatoia"
msgctxt "#70154"
-msgid "TMDB search options"
-msgstr "Opzioni di ricerca TMDB"
+msgid "TMDB search"
+msgstr "Ricerca TMDB"
msgctxt "#70155"
msgid "Simultaneous searches"
@@ -5000,16 +5000,16 @@ msgid "Select color:"
msgstr "Seleziona colore:"
msgctxt "#70559"
-msgid "Now in Theatres "
-msgstr "Oggi in Sala"
+msgid "Now in theatres "
+msgstr "Oggi in sala"
msgctxt "#70560"
-msgid "Movies by Genre"
+msgid "Movies by genre"
msgstr "Per genere"
msgctxt "#70561"
-msgid "Search Similar"
-msgstr "Cerca Simili"
+msgid "Search similar"
+msgstr "Cerca simili"
msgctxt "#70562"
msgid "Enable AutoPlay on all supported channels"
@@ -5080,8 +5080,8 @@ msgid "Torrents"
msgstr "Torrent"
msgctxt "#70579"
-msgid "KoD update"
-msgstr "Aggiornamento KoD"
+msgid "Updates"
+msgstr "Aggiornamenti"
msgctxt "#70580"
msgid "Server answer timeout (seconds)"
@@ -5476,8 +5476,8 @@ msgid "KoD updates"
msgstr "Aggiornamenti KoD"
msgctxt "#70675"
-msgid "Error checking updates"
-msgstr "Errore durante il controllo degli aggiornamenti"
+msgid "Impossible to check the updates"
+msgstr "Impossibile controllare gli aggiornamenti"
msgctxt "#70676"
msgid "Add a channel"
@@ -5628,12 +5628,12 @@ msgid "Modify "
msgstr "Modifica "
msgctxt "#70715"
-msgid "Customized homepage"
-msgstr "Homepage personalizzata"
+msgid "Customized main menu"
+msgstr "Menù principale personalizzato"
msgctxt "#70716"
-msgid "Homepage categories"
-msgstr "Categorie homepage"
+msgid "Main menu items"
+msgstr "Elementi menù principale"
msgctxt "#70717"
msgid "Are all the special episodes present?"
@@ -5717,7 +5717,7 @@ msgstr "Serie TV completa"
msgctxt "#70737"
msgid "Show side menu"
-msgstr "Mostra menu laterale"
+msgstr "Mostra menù laterale"
msgctxt "#70738"
msgid "Ready channels %d/%d"
@@ -5784,8 +5784,8 @@ msgid "Playback"
msgstr "Riproduzione"
msgctxt "#70754"
-msgid "Display mode"
-msgstr "Modalità visualizzazione"
+msgid "View types"
+msgstr "Tipi di vista"
msgctxt "#70755"
msgid "Default"
@@ -5911,11 +5911,27 @@ msgctxt "#70785"
msgid "Install Quasar"
msgstr "Installa Quasar"
+msgctxt "#70786"
+msgid "Autostart"
+msgstr "Avvio automatico"
+
+msgctxt "#70787"
+msgid "Network"
+msgstr "Rete"
+
+msgctxt "#70788"
+msgid "Logging"
+msgstr "Logging"
+
+msgctxt "#70789"
+msgid "* Change by opening the settings from the main menu of KoD"
+msgstr "* Cambia aprendo le impostazioni dal menù principale di KoD"
+
# DNS start [ settings and declaration ]
msgctxt "#707401"
-msgid "Enable DNS Check Alert"
-msgstr "Abilita Avviso Check DNS"
+msgid "Enable DNS check alert"
+msgstr "Abilita avviso check DNS"
msgctxt "#707402"
msgid "Connection or DNS problems"
@@ -6138,16 +6154,16 @@ msgid "Folder name for TV shows"
msgstr "Nome della cartella per le serie TV"
msgctxt "#80022"
-msgid "You can configure the Kodi video library later from the Settings menu inside KoD"
-msgstr "Potrai configurare la libreria di Kodi in seguito dal menu Impostazioni all'interno di KoD"
+msgid "You can configure the Kodi video library later from the settings menu inside KoD"
+msgstr "Potrai configurare la libreria di Kodi in seguito dal menu impostazioni all'interno di KoD"
msgctxt "#80023"
msgid "You will be asked to choose and configure the information providers for movies and TV shows"
msgstr "Ti verrà chiesto di scegliere e configurare i provider delle informazioni per film e serie TV"
msgctxt "#80024"
-msgid "An error has occurred during the configuration of the Kodi video library. Please check the log and try again from the Settings menu inside KoD"
-msgstr "Si è verificato un errore durante la configurazione della libreria di Kodi. Si prega di controllare il log e riprovare dal menu Impostazioni all'interno di KoD"
+msgid "An error has occurred during the configuration of the Kodi video library. Please check the log and try again from the settings menu inside KoD"
+msgstr "Si è verificato un errore durante la configurazione della libreria di Kodi. Si prega di controllare il log e riprovare dal menu impostazioni all'interno di KoD"
msgctxt "#80025"
msgid "Cleaning database..."
@@ -6159,4 +6175,8 @@ msgstr "Configurazione della libreria di Kodi"
msgctxt "#80027"
msgid "You will be asked to configure The Movie Database for movies and The TVDB for TV shows"
-msgstr "Ti verrà chiesto di configurare The Movie Database per i film e The TVDB per le serie TV"
\ No newline at end of file
+msgstr "Ti verrà chiesto di configurare The Movie Database per i film e The TVDB per le serie TV"
+
+msgctxt "#80028"
+msgid "The path and/or the folders you selected are already used by the Kodi library. Please select other ones"
+msgstr "Il percorso e/o le cartelle selezionate sono già utilizzati dalla libreria di Kodi. Si prega di selezionarne altri"
\ No newline at end of file
diff --git a/resources/settings.xml b/resources/settings.xml
index 805837cb..1b697b46 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -2,14 +2,15 @@
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -27,16 +28,17 @@
-
+
+
-
+
@@ -45,79 +47,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -139,18 +71,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -158,14 +86,79 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/servers/wstream.py b/servers/wstream.py
index c80043ec..8a1b03ec 100644
--- a/servers/wstream.py
+++ b/servers/wstream.py
@@ -52,8 +52,11 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
keys = json.loads(data)
for key in keys:
- video_urls.append(['%s [%sp]' % (key['type'].replace('video/', ''), key['label']),
- key['src'].replace('https', 'http') + '|' + _headers])
+ if 'label' in key:
+ video_urls.append(['%s [%sp]' % (key['type'].replace('video/', ''), key['label']),
+ key['src'].replace('https', 'http') + '|' + _headers])
+ else:
+ video_urls.append([key['src'].split('.')[-1], key['src'].replace('https', 'http') + '|' + _headers])
except:
pass
diff --git a/specials/downloads.py b/specials/downloads.py
index eeb75366..8d0a1b1a 100644
--- a/specials/downloads.py
+++ b/specials/downloads.py
@@ -348,18 +348,15 @@ def menu(item):
def move_to_libray(item):
- title = item.fulltitle
- if config.get_setting("lowerize_title", "videolibrary"):
- title = title.lower()
if item.contentType == 'movie':
FOLDER = FOLDER_MOVIES
- path_title = "%s [%s]" % (title, item.infoLabels['IMDBNumber'])
+ path_title = "%s [%s]" % (item.contentTitle.strip() if item.contentTitle else item.fulltitle.strip() , item.infoLabels['IMDBNumber'])
move_path = filetools.join(config.get_videolibrary_path(), FOLDER, path_title)
else:
FOLDER = FOLDER_TVSHOWS
- path_title = "%s [%s]" % (title, item.infoLabels['IMDBNumber'])
+ path_title = os.path.dirname(item.downloadFilename)
move_path = filetools.join(config.get_videolibrary_path(), FOLDER)
download_path = filetools.join(DOWNLOAD_PATH, item.downloadFilename)
@@ -389,6 +386,7 @@ def move_to_libray(item):
for File in list_item:
filename = File.lower()
name = name.lower()
+
if filename.startswith(name) and (filename.endswith('.strm') or filename.endswith('.json') or filename.endswith('.nfo')):
clean = True
logger.info('Delete File: ' + str(filetools.join(config.get_videolibrary_path(), FOLDER, path_title, File)))
@@ -815,7 +813,7 @@ def start_download(item):
def get_episodes(item):
logger.info("contentAction: %s | contentChannel: %s | contentType: %s" % (
item.contentAction, item.contentChannel, item.contentType))
-
+
if 'dlseason' in item:
season = True
season_number = item.dlseason
diff --git a/specials/videolibrary.py b/specials/videolibrary.py
index 6f406228..99ebc7b3 100644
--- a/specials/videolibrary.py
+++ b/specials/videolibrary.py
@@ -704,6 +704,17 @@ def move_videolibrary(current_path, new_path, current_movies_folder, new_movies_
current_tvshows_path = os.path.join(current_path, current_tvshows_folder)
new_tvshows_path = os.path.join(new_path, new_tvshows_folder)
+ from platformcode import xbmc_videolibrary
+ if xbmc_videolibrary.check_sources(new_movies_path+'\\', new_tvshows_path+'\\'):
+ config.set_setting("videolibrarypath", current_path)
+ config.set_setting("folder_movies", current_movies_folder)
+ config.set_setting("folder_tvshows", current_tvshows_folder)
+ progress.update(100)
+ xbmc.sleep(1000)
+ progress.close()
+ platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(80028))
+ return
+
config.verify_directories_created()
progress.update(10, config.get_localized_string(20000), config.get_localized_string(80012))
if current_movies_path != new_movies_path:
@@ -721,7 +732,6 @@ def move_videolibrary(current_path, new_path, current_movies_folder, new_movies_
if current_path != new_path and not filetools.listdir(current_path) and not "plugin.video.kod\\videolibrary" in current_path:
filetools.rmdirtree(current_path)
- from platformcode import xbmc_videolibrary
xbmc_videolibrary.update_sources(backup_new_path, backup_current_path)
if config.is_xbmc() and config.get_setting("videolibrary_kodi"):
xbmc_videolibrary.update_db(backup_current_path, backup_new_path, current_movies_folder, new_movies_folder, current_tvshows_folder, new_tvshows_folder, progress)