From 63bf62b223a86e7604a69ba41495e7e94ba47ada Mon Sep 17 00:00:00 2001 From: DiMartinoXBMC Date: Fri, 4 Mar 2016 12:46:26 +0300 Subject: [PATCH] fixes --- .idea/workspace.xml | 505 ++++++++++++------------- Anteoloader.py | 7 +- functions.py | 2 +- resources/language/English/strings.xml | 2 +- 4 files changed, 237 insertions(+), 279 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7977d23..84188cc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,11 +4,8 @@ - - - @@ -35,7 +32,7 @@ - + @@ -96,8 +93,8 @@ - - + + @@ -126,137 +123,119 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -482,7 +461,7 @@ - + @@ -615,11 +594,11 @@ @@ -654,6 +633,8 @@ + + @@ -750,8 +731,6 @@ - - @@ -763,13 +742,13 @@ - - - + + + @@ -933,12 +912,6 @@ @@ -1268,7 +1247,6 @@ - @@ -1293,11 +1271,12 @@ - - @@ -1816,9 +1795,17 @@ + + + + + + + + - + @@ -1852,63 +1839,26 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - - + + @@ -1937,97 +1887,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + + + + + + + + + + + diff --git a/Anteoloader.py b/Anteoloader.py index c6eed1a..1eab055 100644 --- a/Anteoloader.py +++ b/Anteoloader.py @@ -2,13 +2,12 @@ ''' Torrenter v2 plugin for XBMC/Kodi Copyright (C) 2012-2015 Vadim Skorba v1 - DiMartino v2 - https://forums.tvaddons.ag/addon-releases/29224-torrenter-v2.html This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -297,7 +296,6 @@ class AnteoPlayer(xbmc.Player): break self.contentId = self.next_contentId continue - log('[AnteoPlayer]: ************************************* NO! break') break @@ -508,7 +506,7 @@ class AnteoPlayer(xbmc.Player): xbmc.sleep(2000) # very important, do not edit this, podavan i = 0 - while not xbmc.abortRequested or not self.isPlaying() or i < 50: + while not xbmc.abortRequested and not self.isPlaying() and i < 50: xbmc.sleep(200) i += 1 @@ -519,7 +517,6 @@ class AnteoPlayer(xbmc.Player): if self.seek > 0: log('[AnteoPlayer]: seekTime - '+str(self.seek)) self.seekTime(self.seek) - return True def setup_subs(self): diff --git a/functions.py b/functions.py index de48248..6f0be69 100644 --- a/functions.py +++ b/functions.py @@ -566,7 +566,7 @@ def view_style(func): styles = {} num_skin = 0 view_style = int(__settings__.getSetting("skin_optimization")) - if view_style in [3, 2]: + if view_style in [3, 2, 6]: styles['searchOption'] = styles['History'] = styles['List'] = 'info' styles['drawContent'] = styles['drawtrackerList'] = styles['drawcontentList'] = 'info' styles['sectionMenu'] = styles['Seasons'] = 'list' diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml index 6b573d6..c4dc59f 100644 --- a/resources/language/English/strings.xml +++ b/resources/language/English/strings.xml @@ -56,7 +56,7 @@ Device configuration Average/Good PC Below average PC/router - Storage minimum size for auto clear (GB) + Storage size at least for auto clear (GB) Pause video after start Sort search results by Seeds