diff --git a/src/search_engine/engines/torrentdownloads.png b/src/search_engine/engines/torrentdownloads.png
new file mode 100644
index 000000000..ce14cea48
Binary files /dev/null and b/src/search_engine/engines/torrentdownloads.png differ
diff --git a/src/search_engine/engines/torrentdownloads.py b/src/search_engine/engines/torrentdownloads.py
new file mode 100644
index 000000000..bbfb4de42
--- /dev/null
+++ b/src/search_engine/engines/torrentdownloads.py
@@ -0,0 +1,111 @@
+#VERSION: 1.01
+#AUTHORS: Christophe Dumez (chris@qbittorrent.org)
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of the author nor the names of its contributors may be
+# used to endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+from novaprinter import prettyPrinter
+from helpers import retrieve_url, download_file
+import sgmllib
+import re
+
+class torrentdownloads(object):
+ url = 'http://www.torrentdownloads.net'
+ name = 'TorrentDownloads'
+ supported_categories = {'all': '0', 'movies': '4', 'tv': '8', 'music': '5', 'games': '3', 'anime': '1', 'software': '7', 'books': '2'}
+
+ def __init__(self):
+ self.results = []
+ self.parser = self.SimpleSGMLParser(self.results, self.url)
+
+ def download_torrent(self, info):
+ print download_file(info)
+
+ class SimpleSGMLParser(sgmllib.SGMLParser):
+ def __init__(self, results, url, *args):
+ sgmllib.SGMLParser.__init__(self)
+ self.url = url
+ self.li_counter = None
+ self.current_item = None
+ self.results = results
+
+ def start_a(self, attr):
+ params = dict(attr)
+ #print params
+ if params.has_key('href') and params['href'].startswith("http://www.torrentdownloads.net/torrent/"):
+ self.current_item = {}
+ self.li_counter = 0
+ self.current_item['link']=params['href'].strip().replace('/torrent', '/download', 1)
+
+ def handle_data(self, data):
+ if self.li_counter == 0:
+ if not self.current_item.has_key('name'):
+ self.current_item['name'] = ''
+ self.current_item['name']+= data
+ elif self.li_counter == 1:
+ if not self.current_item.has_key('size'):
+ self.current_item['size'] = ''
+ self.current_item['size']+= data.strip().replace(" ", " ")
+ elif self.li_counter == 2:
+ if not self.current_item.has_key('seeds'):
+ self.current_item['seeds'] = ''
+ self.current_item['seeds']+= data.strip()
+ elif self.li_counter == 3:
+ if not self.current_item.has_key('leech'):
+ self.current_item['leech'] = ''
+ self.current_item['leech']+= data.strip()
+
+ def start_li(self,attr):
+ if isinstance(self.li_counter,int):
+ self.li_counter += 1
+ if self.li_counter > 3:
+ self.li_counter = None
+ # Display item
+ if self.current_item:
+ self.current_item['engine_url'] = self.url
+ if not self.current_item['seeds'].isdigit():
+ self.current_item['seeds'] = 0
+ if not self.current_item['leech'].isdigit():
+ self.current_item['leech'] = 0
+ prettyPrinter(self.current_item)
+ self.results.append('a')
+
+ def search(self, what, cat='all'):
+ ret = []
+ i = 1
+ while i<11:
+ results = []
+ parser = self.SimpleSGMLParser(results, self.url)
+ dat = retrieve_url(self.url+'/search/?page=%d&search=%s&s_cat=%s&srt=seeds&pp=50&order=desc'%(i, what, self.supported_categories[cat]))
+ results_re = re.compile('(?s)
.*')
+ for match in results_re.finditer(dat):
+ res_tab = match.group(0)
+ parser.feed(res_tab)
+ parser.close()
+ break
+ if len(results) <= 0:
+ break
+ i += 1
+
\ No newline at end of file
diff --git a/src/search_engine/engines/versions.txt b/src/search_engine/engines/versions.txt
index 9ff5f6d07..67457256c 100644
--- a/src/search_engine/engines/versions.txt
+++ b/src/search_engine/engines/versions.txt
@@ -3,3 +3,5 @@ torrentreactor: 1.20
btjunkie: 2.21
mininova: 1.40
piratebay: 1.30
+vertor: 1.0
+torrentdownloads: 1.01
diff --git a/src/search_engine/engines/vertor.png b/src/search_engine/engines/vertor.png
new file mode 100644
index 000000000..f9975f508
Binary files /dev/null and b/src/search_engine/engines/vertor.png differ
diff --git a/src/search_engine/engines/vertor.py b/src/search_engine/engines/vertor.py
new file mode 100755
index 000000000..41086e770
--- /dev/null
+++ b/src/search_engine/engines/vertor.py
@@ -0,0 +1,111 @@
+#VERSION: 1.0
+#AUTHORS: Christophe Dumez (chris@qbittorrent.org)
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of the author nor the names of its contributors may be
+# used to endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+from novaprinter import prettyPrinter
+from helpers import retrieve_url, download_file
+import sgmllib
+import re
+
+class vertor(object):
+ url = 'http://www.vertor.com'
+ name = 'vertor'
+ supported_categories = {'all': '0', 'movies': '5', 'tv': '8', 'music': '6', 'games': '3', 'anime': '1', 'software': '2'}
+
+ def __init__(self):
+ self.results = []
+ self.parser = self.SimpleSGMLParser(self.results, self.url)
+
+ def download_torrent(self, info):
+ print download_file(info)
+
+ class SimpleSGMLParser(sgmllib.SGMLParser):
+ def __init__(self, results, url, *args):
+ sgmllib.SGMLParser.__init__(self)
+ self.url = url
+ self.td_counter = None
+ self.current_item = None
+ self.results = results
+
+ def start_a(self, attr):
+ params = dict(attr)
+ #print params
+ if params.has_key('href') and params['href'].startswith("http://www.vertor.com/index.php?mod=download"):
+ self.current_item = {}
+ self.td_counter = 0
+ self.current_item['link']=params['href'].strip()
+
+ def handle_data(self, data):
+ if self.td_counter == 0:
+ if not self.current_item.has_key('name'):
+ self.current_item['name'] = ''
+ self.current_item['name']+= data.strip()
+ elif self.td_counter == 3:
+ if not self.current_item.has_key('size'):
+ self.current_item['size'] = ''
+ self.current_item['size']+= data.strip()
+ elif self.td_counter == 4:
+ if not self.current_item.has_key('seeds'):
+ self.current_item['seeds'] = ''
+ self.current_item['seeds']+= data.strip()
+ elif self.td_counter == 5:
+ if not self.current_item.has_key('leech'):
+ self.current_item['leech'] = ''
+ self.current_item['leech']+= data.strip()
+
+ def start_td(self,attr):
+ if isinstance(self.td_counter,int):
+ self.td_counter += 1
+ if self.td_counter > 6:
+ self.td_counter = None
+ # Display item
+ if self.current_item:
+ self.current_item['engine_url'] = self.url
+ if not self.current_item['seeds'].isdigit():
+ self.current_item['seeds'] = 0
+ if not self.current_item['leech'].isdigit():
+ self.current_item['leech'] = 0
+ prettyPrinter(self.current_item)
+ self.results.append('a')
+
+ def search(self, what, cat='all'):
+ ret = []
+ i = 0
+ while True and i<11:
+ results = []
+ parser = self.SimpleSGMLParser(results, self.url)
+ dat = retrieve_url(self.url+'/index.php?mod=search&words=%s&cid=%s&orderby=a.seeds&asc=0&search=&exclude=&p=%d'%(what, self.supported_categories[cat], i))
+ results_re = re.compile('(?s)Vertor search results.*')
+ for match in results_re.finditer(dat):
+ res_tab = match.group(0)
+ parser.feed(res_tab)
+ parser.close()
+ break
+ if len(results) <= 0:
+ break
+ i += 1
+
\ No newline at end of file