diff options
Diffstat (limited to 'tpblite')
| -rw-r--r-- | tpblite/__init__.py | 2 | ||||
| -rw-r--r-- | tpblite/models/torrents.py | 20 |
2 files changed, 9 insertions, 13 deletions
diff --git a/tpblite/__init__.py b/tpblite/__init__.py index e69de29..6a397d1 100644 --- a/tpblite/__init__.py +++ b/tpblite/__init__.py @@ -0,0 +1,2 @@ +from tpblite.tpblite import TPB +from tpblite.models.constants import ORDERS, CATEGORIES
\ No newline at end of file diff --git a/tpblite/models/torrents.py b/tpblite/models/torrents.py index 87a3b6b..eb007cb 100644 --- a/tpblite/models/torrents.py +++ b/tpblite/models/torrents.py @@ -2,7 +2,6 @@ import re import unicodedata from bs4 import BeautifulSoup -#TODO: implement a pretty print for Torrents object #TODO: write better comments def fileSizeStrToInt(size_str): @@ -73,7 +72,7 @@ class Torrents(object): self.__search_set = None self.html_source = html_source - self.list = self._createTorrentListMod() + self.list = self._createTorrentList() def __str__(self): return 'Torrents object: {} torrents'.format(len(self.list)) @@ -87,21 +86,16 @@ class Torrents(object): def __len__(self): return len(self.list) + def __getitem__(self,index): + return self.list[index] + @property - def search_set(self): + def _search_set(self): if self.__search_set == None: self.__search_set = set(filter(None, re.split(r'[\s.|\(|\)]',self.search_str.lower()))) return self.__search_set - - def _createTorrentList(self): - soup = BeautifulSoup(self.html_source, features='html.parser') - rows = self.__getRows(soup) - torrents = [] - for row in rows: - torrents.append(Torrent(row)) - return torrents - def _createTorrentListMod(self): + def _createTorrentList(self): soup = BeautifulSoup(self.html_source, features='html.parser') rows = soup.body.find_all('tr') torrents = [] @@ -109,7 +103,7 @@ class Torrents(object): # Get the lowercase unique set from the row text text_set = set(filter(None, re.split(r'[\s.|\(|\)]',row.text.lower()))) # Check if search string is subset - if self.search_set.issubset(text_set): + if self._search_set.issubset(text_set): torrents.append(Torrent(row)) return torrents |