ukamnya
/
plugin.video.torrenter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Исправление ошибки слияния

sandbox1
inpos 2016-03-17 19:32:12 +03:00
parent 57a15f6822
commit 73a3d5ea25
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Anteoloader.py
View File

@ -165,23 +165,16 @@ class AnteoLoader:
self.setup_engine() self.setup_engine()
files = [] files = []
filelist = [] filelist = []
<<<<<<< HEAD
with closing(self.engine):
#self.engine.start()
=======
try: try:
self.engine.start() self.engine.start()
>>>>>>> 1974c5a41ad9cbfa5eb82d5848e79387701b9c92
#media_types=[MediaType.VIDEO, MediaType.AUDIO, MediaType.SUBTITLES, MediaType.UNKNOWN] #media_types=[MediaType.VIDEO, MediaType.AUDIO, MediaType.SUBTITLES, MediaType.UNKNOWN]
iterator = 0 iterator = 0
text = Localization.localize('Magnet-link is converting') if self.magnetLink\ text = Localization.localize('Magnet-link is converting') if self.magnetLink\
else Localization.localize('Opening torrent file') else Localization.localize('Opening torrent file')
while not files and not xbmc.abortRequested and iterator < 100: while not files and not xbmc.abortRequested and iterator < 100:
#files = self.engine.list() files = self.engine.list()
files = self.engine.list_from_info() self.engine.check_torrent_error()
#self.engine.check_torrent_error()
if len(files) == 0: break
if iterator==4: if iterator==4:
progressBar = xbmcgui.DialogProgress() progressBar = xbmcgui.DialogProgress()
progressBar.create(Localization.localize('Please Wait'), progressBar.create(Localization.localize('Please Wait'),