diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 34928eb..ce91045 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,10 @@
-
-
-
-
-
+
+
+
+
@@ -37,10 +36,10 @@
-
+
-
+
@@ -86,6 +85,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -103,7 +142,7 @@
-
+
@@ -125,11 +164,13 @@
@@ -183,6 +224,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -191,8 +264,27 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -314,7 +406,14 @@
-
+
+
+
+
+
+
+
+
@@ -338,7 +437,11 @@
1420802271541
1420802271541
-
+
+ 1420833581950
+ 1420833581950
+
+
@@ -363,9 +466,10 @@
-
+
-
+
+
@@ -373,13 +477,12 @@
-
+
-
@@ -407,13 +510,6 @@
-
-
-
-
-
-
-
@@ -440,7 +536,7 @@
-
+
@@ -448,7 +544,7 @@
-
+
@@ -493,6 +589,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/README.txt b/README.txt
index b9016bc..e736143 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,8 @@
-Official library`s website is http://www.rasterbar.com/products/libtorrent/
+Plugin helps you to watch videos from p2p torrent-networks, without full predownload (uses inner python-libtorrent) or Ace Stream. It also can add, control torrents and play downloaded files with external uTorrent, Transmisson or Vuse.
+Official forum thread: http://forum.kodi.tv/showthread.php?tid=214366
+
+[B]PYTHON-LIBTORRENT[/B]:
+Official library`s website is http://www.rasterbar.com/products/libtorrent/
Plugin requires python binding
--- INSTALLATION ---
@@ -12,7 +16,7 @@ No installation required, will be downloaded with plugin from repository as modu
or you could compile it:
-sudo apt-get install libboost-dev libboost-python-dev libboost-system-dev g++ libssl openssl autotool automake subversion
+sudo apt-get build-dep python-libtorrent
svn co https://libtorrent.svn.sourceforge.net/svnroot/libtorrent/trunk/ lt/
cd lt/
./autotool.sh
@@ -37,7 +41,7 @@ ________________________________________________________________________________
или компилируем:
-sudo apt-get install libboost-dev libboost-python-dev libboost-system-dev g++ libssl openssl autotool automake subversion
+sudo apt-get build-dep python-libtorrent
svn co https://libtorrent.svn.sourceforge.net/svnroot/libtorrent/trunk/ lt/
cd lt/
./autotool.sh
diff --git a/cal.py b/cal.py
index e28e732..8b9e065 100644
--- a/cal.py
+++ b/cal.py
@@ -9,4 +9,4 @@ if ROOT + os.sep + 'resources' + os.sep + 'contenters' not in sys.path:
sys.path.insert(0, ROOT + os.sep + 'resources' + os.sep + 'contenters')
searcherObject[searcher] = getattr(__import__(searcher), searcher)()
-#print str(searcherObject[searcher].get_contentList(category='search', subcategory='Hobbit'))
+#print str(searcherObject[searcher].get_contentList(category='search', subcategory='Hobbit'))
\ No newline at end of file
diff --git a/resources/searchers/ExtraTorrent.py b/resources/searchers/ExtraTorrent.py
index 9bdac0f..fb242da 100644
--- a/resources/searchers/ExtraTorrent.py
+++ b/resources/searchers/ExtraTorrent.py
@@ -85,10 +85,12 @@ class ExtraTorrent(SearcherABC.SearcherABC):
if None != response and 0 < len(response):
#print response
dat = re.compile(
- r'''.+?
(.+?) | (\d+) | (\d+) | ''',
+ r'''.+?(.+?) | .+?(.+?) | .+?(.+?) | ''',
re.DOTALL).findall(response)
for (link, title, size, seeds, leechers) in dat:
size = size.replace(' ', ' ')
+ seeds=seeds.replace('---', '0')
+ leechers=leechers.replace('---', '0')
image = sys.modules["__main__"].__root__ + self.searchIcon
link = 'http://extratorrent.cc/'+link
filesList.append((