From 02e864ccdbe5bf4dc5945451e2690f6be97da85d Mon Sep 17 00:00:00 2001
From: newt-sc <47229722+newt-sc@users.noreply.github.com>
Date: Sun, 30 May 2021 17:15:52 +0300
Subject: [PATCH] release: v2.61.0

---
 CHANGELOG.md                                  |  6 ++++++
 meta.json                                     |  2 +-
 providerModules/a4kScrapers/scrapers.py       |  8 ++++++--
 providerModules/a4kScrapers/source_utils.py   |  4 ++--
 providerModules/a4kScrapers/urls.json         | 11 ++++++++---
 providers/a4kScrapers/en/torrent/7torrents.py |  7 +++++++
 6 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 providers/a4kScrapers/en/torrent/7torrents.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d7664d..9d9461c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+* [v2.61.0](https://github.com/a4k-openproject/a4kScrapers/releases/tag/a4kScrapers-2.61.0):
+  * add 7torrents
+  * exclude more keywords for movie titles
+  * remove dead url for extratorrent
+  * sort solidtorrents by size
+
 * [v2.60.0](https://github.com/a4k-openproject/a4kScrapers/releases/tag/a4kScrapers-2.60.0):
   * allow only movie results where the expected title is followed by the expected year
   * add additional check if the movie result is actually an episode
diff --git a/meta.json b/meta.json
index ad95e7e..40d5165 100644
--- a/meta.json
+++ b/meta.json
@@ -1,6 +1,6 @@
 {
   "author": "Unknown",
-  "version":"2.60.0",
+  "version":"2.61.0",
   "name":"a4kScrapers",
   "update_directory": "https://github.com/a4k-openproject/a4kScrapers/archive/",
   "remote_meta": "https://raw.githubusercontent.com/newt-sc/a4kScrapers/master/meta.json",
diff --git a/providerModules/a4kScrapers/scrapers.py b/providerModules/a4kScrapers/scrapers.py
index a2ca802..aa4cf77 100644
--- a/providerModules/a4kScrapers/scrapers.py
+++ b/providerModules/a4kScrapers/scrapers.py
@@ -25,6 +25,9 @@ def __init__(self, title):
 
     def _parse_rows(self, response, row_tag):
         results = []
+        if row_tag not in response:
+            return results
+
         rows = response.split(row_tag)
         for row in rows:
             torrent = self._parse_torrent(row, row_tag)
@@ -110,10 +113,11 @@ def soup_filter(self, response):
         response = normalize(response.text)
 
         return (
+            self._parse_rows(response, row_tag='<div class="media"') + #7torrents
+            self._parse_rows(response, row_tag='tgxtablerow') + #torrentgalaxy
             self._parse_rows(response, row_tag='<tr') +
             self._parse_rows(response, row_tag='<dl') +
-            self._parse_rows(response, row_tag='<ul') +
-            self._parse_rows(response, row_tag='tgxtablerow') #torrentgalaxy
+            self._parse_rows(response, row_tag='<ul')
         )
 
     def title_filter(self, result):
diff --git a/providerModules/a4kScrapers/source_utils.py b/providerModules/a4kScrapers/source_utils.py
index ed8e71e..b6c91d3 100644
--- a/providerModules/a4kScrapers/source_utils.py
+++ b/providerModules/a4kScrapers/source_utils.py
@@ -78,7 +78,7 @@ def log(msg, level):
     "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36"
 ]
 
-exclusions = ['soundtrack', 'gesproken']
+exclusions = ['soundtrack', 'gesproken', 'sample', 'trailer', 'extras only', 'ost']
 release_groups_blacklist = ['lostfilm', 'coldfilm', 'newstudio', 'hamsterstudio', 'jaskier', 'ideafilm', 'lakefilms', 'gears media', 'profix media', 'baibako', 'alexfilm', 'kerob', 'omskbird', 'kb 1080p', 'tvshows', '400p octopus', '720p octopus', '1080p octopus', 'dilnix']
 adult_movie_tags = ['porn', 'xxx', 'adult', 'nude', 'ass', 'anal', 'threesome', 'blowjob', 'sex', 'fuck', 'squirt', 'hardcore', 'dick', 'cock', 'cum', 'orgasm', 'pussy']
 country_codes = {'afghanistan':'af','albania':'al','algeria':'dz','american samoa':'as','andorra':'ad','angola':'ao','anguilla':'ai','antarctica':'aq','antigua and barbuda':'ag','argentina':'ar','armenia':'am','aruba':'aw','australia':'au','austria':'at','azerbaijan':'az','bahamas':'bs','bahrain':'bh','bangladesh':'bd','barbados':'bb','belarus':'by','belgium':'be','belize':'bz','benin':'bj','bermuda':'bm','bhutan':'bt','bolivia, plurinational state of':'bo','bonaire, sint eustatius and saba':'bq','bosnia and herzegovina':'ba','botswana':'bw','bouvet island':'bv','brazil':'br','british indian ocean territory':'io','brunei darussalam':'bn','bulgaria':'bg','burkina faso':'bf','burundi':'bi','cambodia':'kh','cameroon':'cm','canada':'ca','cape verde':'cv','cayman islands':'ky','central african republic':'cf','chad':'td','chile':'cl','china':'cn','christmas island':'cx','cocos (keeling) islands':'cc','colombia':'co','comoros':'km','congo':'cg','congo, the democratic republic of the':'cd','cook islands':'ck','costa rica':'cr','country name':'code','croatia':'hr','cuba':'cu','curaçao':'cw','cyprus':'cy','czech republic':'cz','côte d\'ivoire':'ci','denmark':'dk','djibouti':'dj','dominica':'dm','dominican republic':'do','ecuador':'ec','egypt':'eg','el salvador':'sv','equatorial guinea':'gq','eritrea':'er','estonia':'ee','ethiopia':'et','falkland islands (malvinas)':'fk','faroe islands':'fo','fiji':'fj','finland':'fi','france':'fr','french guiana':'gf','french polynesia':'pf','french southern territories':'tf','gabon':'ga','gambia':'gm','georgia':'ge','germany':'de','ghana':'gh','gibraltar':'gi','greece':'gr','greenland':'gl','grenada':'gd','guadeloupe':'gp','guam':'gu','guatemala':'gt','guernsey':'gg','guinea':'gn','guinea-bissau':'gw','guyana':'gy','haiti':'ht','heard island and mcdonald islands':'hm','holy see (vatican city state)':'va','honduras':'hn','hong kong':'hk','hungary':'hu','iso 3166-2:gb':'(.uk)','iceland':'is','india':'in','indonesia':'id','iran, islamic republic of':'ir','iraq':'iq','ireland':'ie','isle of man':'im','israel':'il','italy':'it','jamaica':'jm','japan':'jp','jersey':'je','jordan':'jo','kazakhstan':'kz','kenya':'ke','kiribati':'ki','korea, democratic people\'s republic of':'kp','korea, republic of':'kr','kuwait':'kw','kyrgyzstan':'kg','lao people\'s democratic republic':'la','latvia':'lv','lebanon':'lb','lesotho':'ls','liberia':'lr','libya':'ly','liechtenstein':'li','lithuania':'lt','luxembourg':'lu','macao':'mo','macedonia, the former yugoslav republic of':'mk','madagascar':'mg','malawi':'mw','malaysia':'my','maldives':'mv','mali':'ml','malta':'mt','marshall islands':'mh','martinique':'mq','mauritania':'mr','mauritius':'mu','mayotte':'yt','mexico':'mx','micronesia, federated states of':'fm','moldova, republic of':'md','monaco':'mc','mongolia':'mn','montenegro':'me','montserrat':'ms','morocco':'ma','mozambique':'mz','myanmar':'mm','namibia':'na','nauru':'nr','nepal':'np','netherlands':'nl','new caledonia':'nc','new zealand':'nz','nicaragua':'ni','niger':'ne','nigeria':'ng','niue':'nu','norfolk island':'nf','northern mariana islands':'mp','norway':'no','oman':'om','pakistan':'pk','palau':'pw','palestine, state of':'ps','panama':'pa','papua new guinea':'pg','paraguay':'py','peru':'pe','philippines':'ph','pitcairn':'pn','poland':'pl','portugal':'pt','puerto rico':'pr','qatar':'qa','romania':'ro','russian federation':'ru','rwanda':'rw','réunion':'re','saint barthélemy':'bl','saint helena, ascension and tristan da cunha':'sh','saint kitts and nevis':'kn','saint lucia':'lc','saint martin (french part)':'mf','saint pierre and miquelon':'pm','saint vincent and the grenadines':'vc','samoa':'ws','san marino':'sm','sao tome and principe':'st','saudi arabia':'sa','senegal':'sn','serbia':'rs','seychelles':'sc','sierra leone':'sl','singapore':'sg','sint maarten (dutch part)':'sx','slovakia':'sk','slovenia':'si','solomon islands':'sb','somalia':'so','south africa':'za','south georgia and the south sandwich islands':'gs','south sudan':'ss','spain':'es','sri lanka':'lk','sudan':'sd','suriname':'sr','svalbard and jan mayen':'sj','swaziland':'sz','sweden':'se','switzerland':'ch','syrian arab republic':'sy','taiwan, province of china':'tw','tajikistan':'tj','tanzania, united republic of':'tz','thailand':'th','timor-leste':'tl','togo':'tg','tokelau':'tk','tonga':'to','trinidad and tobago':'tt','tunisia':'tn','turkey':'tr','turkmenistan':'tm','turks and caicos islands':'tc','tuvalu':'tv','uganda':'ug','ukraine':'ua','united arab emirates':'ae','united kingdom':'gb','united states':'us','united states minor outlying islands':'um','uruguay':'uy','uzbekistan':'uz','vanuatu':'vu','venezuela, bolivarian republic of':'ve','viet nam':'vn','virgin islands, british':'vg','virgin islands, u.s.':'vi','wallis and futuna':'wf','western sahara':'eh','yemen':'ye','zambia':'zm','zimbabwe':'zw','åland islands':'ax'}
@@ -368,7 +368,7 @@ def filter_movie_title(org_release_title, release_title, movie_title, simple_inf
         log('movieepisode]: %s' % release_title, 'notice')
         return False
 
-    if any(i in release_title for i in exclusions):
+    if any((' %s ' % i) in release_title for i in exclusions):
         log('movieexcluded]: %s' % release_title, 'notice')
         return False
 
diff --git a/providerModules/a4kScrapers/urls.json b/providerModules/a4kScrapers/urls.json
index 75b3e7b..b359be7 100644
--- a/providerModules/a4kScrapers/urls.json
+++ b/providerModules/a4kScrapers/urls.json
@@ -1,6 +1,12 @@
 {
   "trackers": {
     "cached": { "search": "", "domains": [{ "base": "" }] },
+      "7torrents": {
+          "search": "/search?query=%s&sort=seeders",
+          "domains": [
+              { "base": "https://www.7torrents.cc" }
+          ]
+      },
       "bitlord": {
           "search": "/get_list",
           "domains": [
@@ -42,8 +48,7 @@
       "extratorrent": {
           "search": "/search/?new=1&search=%s",
           "domains": [
-              { "base": "https://extratorrents.it" },
-              { "base": "https://extratorrent.si" }
+              { "base": "https://extratorrents.it" }
           ]
       },
       "eztv": {
@@ -146,7 +151,7 @@
           ]
       },
       "solidtorrents": {
-          "search": "/api/v1/search?q=%s&category=video&sort=seeders",
+          "search": "/api/v1/search?q=%s&category=video&sort=size",
           "domains": [
               { "base": "https://solidtorrents.net" }
           ]
diff --git a/providers/a4kScrapers/en/torrent/7torrents.py b/providers/a4kScrapers/en/torrent/7torrents.py
new file mode 100644
index 0000000..1fdc4c4
--- /dev/null
+++ b/providers/a4kScrapers/en/torrent/7torrents.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+from providerModules.a4kScrapers import core
+
+class sources(core.DefaultSources):
+    def __init__(self, *args, **kwargs):
+        super(sources, self).__init__(__name__, *args, **kwargs)