improvements to TPB controller and Query

3 files changed, 13 insertions, 7 deletions

diff --git a/tpblite/models/torrents.py b/tpblite/models/torrents.py
index 9fd40c4..7852c28 100644
--- a/tpblite/models/torrents.py
+++ b/tpblite/models/torrents.py
@@ -63,8 +63,8 @@ class Torrents(object):
     torrent list or dict. Has methods to select items from
     torrent list.
     '''
-    def __init__(self, webpage):
-        self.webpage = webpage
+    def __init__(self, html_source):
+        self.html_source = html_source
         self.list = self._createTorrentList()
         
     def __str__(self):
@@ -74,7 +74,7 @@ class Torrents(object):
         return iter(self.list)    
         
     def _createTorrentList(self):
-        soup = BeautifulSoup(self.webpage, features='html.parser')
+        soup = BeautifulSoup(self.html_source, features='html.parser')
         rows = self.__getRows(soup)
         torrents = []
         for row in rows:
diff --git a/tpblite/models/utils.py b/tpblite/models/utils.py
index 977672b..200982f 100644
--- a/tpblite/models/utils.py
+++ b/tpblite/models/utils.py
@@ -10,9 +10,10 @@ class Query(object):
     '''
     def __init__(self, query, base_url, page, order, category):
         self.base_url = base_url
+        print('category is {} {}'.format(category,str(category)))
         segments = ('search', query, str(page), str(order), str(category))
         self.url = URL(base_url, segments)
-        self.webpage = self._sendRequest()
+        self.html_source = self._sendRequest()
      
     def _sendRequest(self):
         req = Request(self.url, headers=headers())
diff --git a/tpblite/tpblite.py b/tpblite/tpblite.py
index c99bfd2..0bee91a 100644
--- a/tpblite/tpblite.py
+++ b/tpblite/tpblite.py
@@ -5,10 +5,15 @@ class TPB(object):
     
     def __init__(self, base_url='https://tpb.party'):
         self.base_url = base_url
+        self.search_url = None
         
-    def search(self, query, base_url, page=0, order=99, category=0):
-        webpage = Query(query, base_url, page=0, order=99, category=0)
-        return Torrents(webpage)
+    def __str__(self):
+        return 'TPB Object, base URL: {}'.format(self.base_url)
+        
+    def search(self, query, page=0, order=99, category=0):
+        q = Query(query, self.base_url, page, order, category)
+        self.search_url = q.url
+        return Torrents(q.html_source)
         
 def run():
     q = Query('avengers endgame 1080p')