Merge branch 'beta-version'

This commit is contained in:
croneter 2018-06-24 16:26:37 +02:00
commit d0999aec42
4 changed files with 17 additions and 14 deletions

View file

@ -1,5 +1,5 @@
[![stable version](https://img.shields.io/badge/stable_version-2.1.2-blue.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/stable/repository.plexkodiconnect/repository.plexkodiconnect-1.0.2.zip)
[![beta version](https://img.shields.io/badge/beta_version-2.2.4-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip)
[![beta version](https://img.shields.io/badge/beta_version-2.2.5-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip)
[![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/Installation)
[![FAQ](https://img.shields.io/badge/wiki-FAQ-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/faq)

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.2.4" provider-name="croneter">
<addon id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.2.5" provider-name="croneter">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.requests" version="2.9.1" />
@ -67,7 +67,10 @@
<summary lang="ru_RU">Нативная интеграция сервера Plex в Kodi</summary>
<description lang="ru_RU">Подключите Kodi к своему серверу Plex. Плагин предполагает что вы управляете своими видео с помощью Plex (а не в Kodi). Вы можете потерять текущие базы данных музыки и видео в Kodi (так как плагин напрямую их изменяет). Используйте на свой страх и риск</description>
<disclaimer lang="ru_RU">Используйте на свой страх и риск</disclaimer>
<news>version 2.2.4 (beta only):
<news>version 2.2.5 (beta only):
- Fix AttributeError and add_update has crashed
version 2.2.4 (beta only):
- Fix LibrarySync crashing due to Plex Companion messages
version 2.2.3 (beta only):

View file

@ -1,3 +1,6 @@
version 2.2.5 (beta only):
- Fix AttributeError and add_update has crashed
version 2.2.4 (beta only):
- Fix LibrarySync crashing due to Plex Companion messages

View file

@ -33,7 +33,6 @@ from logging import getLogger
from re import sub
from urllib import urlencode, unquote
from xbmcgui import ListItem
from xbmcvfs import exists
from .downloadutils import DownloadUtils as DU
from . import clientinfo
@ -1594,22 +1593,20 @@ class API(object):
# exist() needs a / or \ at the end to work for directories
if folder is False:
# files
check = exists(utils.try_encode(path))
check = path_ops.exists(path)
else:
# directories
checkpath = utils.try_encode(path)
if b"\\" in checkpath:
if not checkpath.endswith('\\'):
if "\\" in path:
if not path.endswith('\\'):
# Add the missing backslash
check = utils.exists_dir(checkpath + "\\")
check = path_ops.exists(path + "\\")
else:
check = utils.exists_dir(checkpath)
check = path_ops.exists(path)
else:
if not checkpath.endswith('/'):
check = utils.exists_dir(checkpath + "/")
if not path.endswith('/'):
check = path_ops.exists(path + "/")
else:
check = utils.exists_dir(checkpath)
check = path_ops.exists(path)
if not check:
if force_check is False:
# Validate the path is correct with user intervention