Update README.md

Provider fixes/addons

Contents/Code/__init__.py

@@ -28,6 +28,8 @@ def getLangList():
     langList = {Language.fromietf(Prefs["langPref1"])}
     if(Prefs["langPref2"] != "None"):
         langList.update({Language.fromietf(Prefs["langPref2"])})
+    if(Prefs["langPref3"] != "None"):
+        langList.update({Language.fromietf(Prefs["langPref3"])})
         
     return langList
 
@@ -42,7 +44,8 @@ def getProviders():
 
 def getProviderSettings():
     provider_settings = {'addic7ed': {'username': Prefs['provider.addic7ed.username'], 
-                                      'password': Prefs['provider.addic7ed.password']
+                                      'password': Prefs['provider.addic7ed.password'],
+				      'use_random_agents': Prefs['provider.addic7ed.use_random_agents'],
                                       },
                          }
     return provider_settings
@@ -80,10 +83,7 @@ def downloadBestSubtitles(videos):
     hearing_impaired = Prefs['subtitles.search.hearingImpaired']
     Log.Debug("Download best subtitles using settings: min_score: %s, hearing_impaired: %s" %(min_score, hearing_impaired))
     
-    # patch subliminal's ProviderPool
-    subliminal.api.ProviderPool = subliminal_patch.PatchedProviderPool
-
-    return subliminal.api.download_best_subtitles(videos, getLangList(), min_score, hearing_impaired, provider_configs=getProviderSettings())
+    return subliminal.api.download_best_subtitles(videos, getLangList(), min_score, hearing_impaired, providers=getProviders(), provider_configs=getProviderSettings())
 
 def saveSubtitles(videos, subtitles):
     if Prefs['subtitles.save.filesystem']:

Contents/DefaultPrefs.json

@@ -13,21 +13,34 @@
                 "default": "",
                 "secure": "true" 
         },
+	{
+                "id": "provider.addic7ed.use_random_agents",
+                "label": "Addic7ed: Use random user agents (should not be necessary)",
+                "type": "bool",
+                "default": "false"
+        },
         {
                 "id": "langPref1",
                 "label": "Subtitle Language (1)",
                 "type": "enum",
-                "values": ["sq","ar","be","bs","bg","ca","zh","cs","da","nl","en","et","fi","fr","de","el","he","hi","hu","is","id","it","ja","ko","lv","lt","mk","ms","no","pl","pt","ro","ru","sr","sk","sl","es","sv","th","tr","uk","vi","hr"],
+                "values": ["sq","ar","be","bs","bg","ca","zh","cs","da","nl","en","et","fi","fr","de","el","he","hi","hu","is","id","it","ja","ko","lv","lt","mk","ms","no","fa","pl","pt","pt-br","ro","ru","sr","sk","sl","es","sv","th","tr","uk","vi","hr"],
                 "default": "en"
         },
         {
                 "id": "langPref2",
                 "label": "Subtitle Language (2)",
                 "type": "enum",
-                "values": ["None", "sq","ar","be","bs","bg","ca","zh","cs","da","nl","en","et","fi","fr","de","el","he","hi","hu","is","id","it","ja","ko","lv","lt","mk","ms","no","pl","pt","ro","ru","sr","sk","sl","es","sv","th","tr","uk","vi","hr"],
+                "values": ["None", "sq","ar","be","bs","bg","ca","zh","cs","da","nl","en","et","fi","fr","de","el","he","hi","hu","is","id","it","ja","ko","lv","lt","mk","ms","no","fa","pl","pt","pt-br","ro","ru","sr","sk","sl","es","sv","th","tr","uk","vi","hr"],
                 "default": "None"
-        },        
-		{
+        },
+	{
+                "id": "langPref3",
+                "label": "Subtitle Language (3)",
+                "type": "enum",
+                "values": ["None", "sq","ar","be","bs","bg","ca","zh","cs","da","nl","en","et","fi","fr","de","el","he","hi","hu","is","id","it","ja","ko","lv","lt","mk","ms","no","fa","pl","pt","pt-br","ro","ru","sr","sk","sl","es","sv","th","tr","uk","vi","hr"],
+                "default": "None"
+        },
+	{
                 "id": "provider.opensubtitles.enabled",
                 "label": "Provider: Enable OpenSubtitles",
                 "type": "bool",
@@ -59,13 +72,13 @@
         },
         {
                 "id": "subtitles.scan.embedded",
-                "label": "Scan: include embedded subtitles",
+                "label": "Scan: include embedded subtitles (skip if existing)",
                 "type": "bool",
                 "default": "false"
         },
         {
                 "id": "subtitles.scan.external",
-                "label": "Scan: include external subtitles",
+                "label": "Scan: include external subtitles (skip if existing)",
                 "type": "bool",
                 "default": "false"
         },

Contents/Libraries/Shared/babelfish/HISTORY.rst

@@ -1,113 +0,0 @@
-Changelog
-=========
-
-0.5.3
------
-**release date:** 2014-06-22
-
-* Better equality semantics for Language, Country, Script
-
-0.5.2
------
-**release date:** 2014-05-25
-
-* Babelfish objects (Language, Country, Script) are now picklable
-* Added support for Python 3.4
-
-
-0.5.1
------
-**release date:** 2014-01-26
-
-* Add a register method to ConverterManager to register without loading
-
-
-0.5.0
------
-**release date:** 2014-01-25
-
-**WARNING:** Backward incompatible changes
-
-* Simplify converter management with ConverterManager class
-* Make babelfish usable in place
-* Add Python 2.6 / 3.2 compatibility
-
-
-0.4.0
------
-**release date:** 2013-11-21
-
-**WARNING:** Backward incompatible changes
-
-* Add converter support for Country
-* Language/country reverse name detection is now case-insensitive
-* Add alpha3t, scope and type converters
-* Use lazy loading of converters
-
-
-0.3.0
------
-**release date:** 2013-11-09
-
-* Add support for scripts
-* Improve built-in converters
-* Add support for ietf
-
-
-0.2.1
------
-**release date:** 2013-11-03
-
-* Fix reading of data files
-
-
-0.2.0
------
-**release date:** 2013-10-31
-
-* Add str method
-* More explicit exceptions
-* Change repr format to use ascii only
-
-
-0.1.5
------
-**release date:** 2013-10-21
-
-* Add a fromcode method on Language class
-* Add a codes attribute on converters
-
-
-0.1.4
------
-**release date:** 2013-10-20
-
-* Fix converters not raising NoConversionError
-
-
-0.1.3
------
-**release date:** 2013-09-29
-
-* Fix source distribution
-
-
-0.1.2
------
-**release date:** 2013-09-29
-
-* Add missing files to source distribution
-
-
-0.1.1
------
-**release date:** 2013-09-28
-
-* Fix python3 support
-
-
-0.1
----
-**release date:** 2013-09-28
-
-* Initial version

Contents/Libraries/Shared/babelfish/LICENSE

@@ -1,25 +0,0 @@
-Copyright (c) 2013, by the respective authors (see AUTHORS file).
-All rights reserved.
-
-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 BabelFish authors 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.

Contents/Libraries/Shared/babelfish/README.rst

@@ -1,16 +0,0 @@
-BabelFish
-=========
-
-BabelFish is a Python library to work with countries and languages.
-
-.. image:: https://travis-ci.org/Diaoul/babelfish.png?branch=master
-    :target: https://travis-ci.org/Diaoul/babelfish
-
-.. image:: https://coveralls.io/repos/Diaoul/babelfish/badge.png
-    :target: https://coveralls.io/r/Diaoul/babelfish
-
-License
--------
-
-BabelFish is licensed under the `3-clause BSD license <http://opensource.org/licenses/BSD-3-Clause>`_.
-Copyright (c) 2013, the BabelFish authors and contributors.

Contents/Libraries/Shared/babelfish/__init__.py

@@ -5,10 +5,10 @@
 # that can be found in the LICENSE file.
 #
 __title__ = 'babelfish'
-__version__ = '0.5.3'
+__version__ = '0.5.5-dev'
 __author__ = 'Antoine Bertin'
 __license__ = 'BSD'
-__copyright__ = 'Copyright 2013 the BabelFish authors'
+__copyright__ = 'Copyright 2015 the BabelFish authors'
 
 import sys
 

Contents/Libraries/Shared/babelfish/converters/__init__.py

@@ -241,7 +241,14 @@ class ConverterManager(object):
                 return self.converters[ep.name]
         for ep in (EntryPoint.parse(c) for c in self.registered_converters + self.internal_converters):
             if ep.name == name:
-                self.converters[ep.name] = ep.load(require=False)()
+                # `require` argument of ep.load() is deprecated in newer versions of setuptools
+                if hasattr(ep, 'resolve'):
+                    plugin = ep.resolve()
+                elif hasattr(ep, '_load'):
+                    plugin = ep._load()
+                else:
+                    plugin = ep.load(require=False)
+                self.converters[ep.name] = plugin()
                 return self.converters[ep.name]
         raise KeyError(name)
 

Contents/Libraries/Shared/babelfish/data/get_files.py

@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2013 the BabelFish authors. All rights reserved.
+# Use of this source code is governed by the 3-clause BSD license
+# that can be found in the LICENSE file.
+#
+from __future__ import unicode_literals
+import os.path
+import tempfile
+import zipfile
+import requests
+
+
+DATA_DIR = os.path.dirname(__file__)
+
+# iso-3166-1.txt
+print('Downloading ISO-3166-1 standard (ISO country codes)...')
+with open(os.path.join(DATA_DIR, 'iso-3166-1.txt'), 'w') as f:
+    r = requests.get('http://www.iso.org/iso/home/standards/country_codes/country_names_and_code_elements_txt.htm')
+    f.write(r.content.strip())
+
+# iso-639-3.tab
+print('Downloading ISO-639-3 standard (ISO language codes)...')
+with tempfile.TemporaryFile() as f:
+    r = requests.get('http://www-01.sil.org/iso639-3/iso-639-3_Code_Tables_20130531.zip')
+    f.write(r.content)
+    with zipfile.ZipFile(f) as z:
+        z.extract('iso-639-3.tab', DATA_DIR)
+
+# iso-15924
+print('Downloading ISO-15924 standard (ISO script codes)...')
+with tempfile.TemporaryFile() as f:
+    r = requests.get('http://www.unicode.org/iso15924/iso15924.txt.zip')
+    f.write(r.content)
+    with zipfile.ZipFile(f) as z:
+        z.extract('iso15924-utf8-20131012.txt', DATA_DIR)
+
+# opensubtitles supported languages
+print('Downloading OpenSubtitles supported languages...')
+with open(os.path.join(DATA_DIR, 'opensubtitles_languages.txt'), 'w') as f:
+    r = requests.get('http://www.opensubtitles.org/addons/export_languages.php')
+    f.write(r.content)
+
+print('Done!')

Contents/Libraries/Shared/babelfish/data/iso-3166-1.txt

@@ -1,250 +1,250 @@
-Country Name;ISO 3166-1-alpha-2 code
-AFGHANISTAN;AF
-ÅLAND ISLANDS;AX
-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
-CÔTE D'IVOIRE;CI
-CROATIA;HR
-CUBA;CU
-CURAÇAO;CW
-CYPRUS;CY
-CZECH REPUBLIC;CZ
-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
-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
-RÉUNION;RE
-ROMANIA;RO
-RUSSIAN FEDERATION;RU
-RWANDA;RW
-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
+Country Name;ISO 3166-1-alpha-2 code
+AFGHANISTAN;AF
+ÅLAND ISLANDS;AX
+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
+CÔTE D'IVOIRE;CI
+CROATIA;HR
+CUBA;CU
+CURAÇAO;CW
+CYPRUS;CY
+CZECH REPUBLIC;CZ
+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
+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
+RÉUNION;RE
+ROMANIA;RO
+RUSSIAN FEDERATION;RU
+RWANDA;RW
+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

Contents/Libraries/Shared/subliminal/providers/addic7ed.py

@@ -17,7 +17,6 @@ logger = logging.getLogger(__name__)
 
 series_year_re = re.compile('^(?P<series>[ \w]+)(?: \((?P<year>\d{4})\))?$')
 
-
 class Addic7edSubtitle(Subtitle):
     provider_name = 'addic7ed'
 
@@ -32,13 +31,6 @@ class Addic7edSubtitle(Subtitle):
         self.version = version
         self.download_link = download_link
 
-    def compute_score(self, video):
-        score = super(Addic7edSubtitle, self).compute_score(video)
-        if score > 60:
-            #logger.info("addic7ed found! %s" % score)
-            score += 2
-        return score
-
     @property
     def id(self):
         return self.download_link

Contents/Libraries/Shared/subliminal/providers/podnapisi.py

@@ -24,7 +24,6 @@ from ..video import Episode, Movie
 
 logger = logging.getLogger(__name__)
 
-
 class PodnapisiSubtitle(Subtitle):
     provider_name = 'podnapisi'
 

Contents/Libraries/Shared/subliminal/providers/thesubdb.py

@@ -12,7 +12,6 @@ from ..subtitle import Subtitle, fix_line_ending
 
 logger = logging.getLogger(__name__)
 
-
 class TheSubDBSubtitle(Subtitle):
     provider_name = 'thesubdb'
 

Contents/Libraries/Shared/subliminal/providers/tvsubtitles.py

@@ -20,7 +20,6 @@ logger = logging.getLogger(__name__)
 link_re = re.compile('^(?P<series>.+?)(?: \(?\d{4}\)?| \((?:US|UK)\))? \((?P<first_year>\d{4})-\d{4}\)$')
 episode_id_re = re.compile('^episode-\d+\.html$')
 
-
 class TVsubtitlesSubtitle(Subtitle):
     provider_name = 'tvsubtitles'
 

Contents/Libraries/Shared/subliminal_patch/__init__.py

@@ -1,2 +1,16 @@
+# coding=utf-8
 
-from .patch import PatchedProviderPool
+from .patch_provider_pool import PatchedProviderPool
+from .patch_providers import PatchedAddic7edProvider
+import subliminal
+import babelfish
+
+# patch subliminal's ProviderPool 
+subliminal.api.ProviderPool = PatchedProviderPool
+
+# patch subliminal's Addic7edProvider
+subliminal.providers.addic7ed.Addic7edProvider = PatchedAddic7edProvider
+
+# add language converters
+babelfish.language_converters.register('addic7ed = subliminal_patch.patch_language:PatchedAddic7edConverter')
+babelfish.language_converters.register('tvsubtitles = subliminal.converters.tvsubtitles:TVsubtitlesConverter')

Contents/Libraries/Shared/subliminal_patch/patch_language.py

@@ -0,0 +1,13 @@
+# coding=utf-8
+
+from subliminal.converters.addic7ed import Addic7edConverter
+
+class PatchedAddic7edConverter(Addic7edConverter):
+    def __init__(self):
+	super(PatchedAddic7edConverter, self).__init__()
+	self.from_addic7ed.update({
+	    "French (Canadian)": ("fra", "CA"),
+	})
+	self.to_addic7ed.update({
+	    ("fra", "CA"): "French (Canadian)",
+	})

Contents/Libraries/Shared/subliminal_patch/patch_provider_pool.py

@@ -1,6 +1,11 @@
 # coding=utf-8
 
 import logging
+import traceback
+import requests
+import socket
+from babelfish.exceptions import LanguageReverseError
+
 from pkg_resources import EntryPoint, iter_entry_points
 
 from subliminal.api import ProviderPool
@@ -35,7 +40,7 @@ class LegacyProviderManager(object):
     """
     entry_point = 'subliminal.providers'
 
-    def __init__(self):
+    def __init__(self, enabled_providers=None):
         #: Registered providers with entry point syntax
         self.registered_providers = ['addic7ed = subliminal.providers.addic7ed:Addic7edProvider',
                                      'opensubtitles = subliminal.providers.opensubtitles:OpenSubtitlesProvider',
@@ -43,6 +48,8 @@ class LegacyProviderManager(object):
                                      'thesubdb = subliminal.providers.thesubdb:TheSubDBProvider',
                                      'tvsubtitles = subliminal.providers.tvsubtitles:TVsubtitlesProvider']
 
+	self.enabled_providers = enabled_providers or []
+
         #: Loaded providers
         self.providers = {}
 
@@ -57,14 +64,14 @@ class LegacyProviderManager(object):
     def __getitem__(self, name):
         """Get a provider, lazy loading it if necessary"""
 	
-        if name in self.providers:
+        if name in self.enabled_providers and name in self.providers:
             return self.providers[name]
         for ep in iter_entry_points(self.entry_point):
-            if ep.name == name:
+            if ep.name == name and name in self.enabled_providers:
                 self.providers[ep.name] = OldToNewProvider(ep.load())
                 return self.providers[ep.name]
         for ep in (EntryPoint.parse(c) for c in self.registered_providers):
-            if ep.name == name:
+            if ep.name == name and name in self.enabled_providers:
                 self.providers[ep.name] = OldToNewProvider(ep.load(require=False))
                 return self.providers[ep.name]
         raise KeyError(name)
@@ -127,6 +134,51 @@ class PatchedProviderPool(ProviderPool):
 
         #: Dedicated :data:`provider_manager` as :class:`~stevedore.enabled.EnabledExtensionManager`
         #self.manager = EnabledExtensionManager(provider_manager.namespace, lambda e: e.name in self.providers)
-	self.manager = provider_manager
+	self.manager = provider_manager if not providers else LegacyProviderManager(self.providers)
 	
+    def list_subtitles(self, video, languages):
+        """List subtitles.
+        :param video: video to list subtitles for.
+        :type video: :class:`~subliminal.video.Video`
+        :param languages: languages to search for.
+        :type languages: set of :class:`~babelfish.language.Language`
+        :return: found subtitles.
+        :rtype: list of :class:`~subliminal.subtitle.Subtitle`
+        """
+        subtitles = []
 
+        for name in self.providers:
+            # check discarded providers
+            if name in self.discarded_providers:
+                logger.debug('Skipping discarded provider %r', name)
+                continue
+
+            # check video validity
+            if not self.manager[name].plugin.check(video):
+                logger.info('Skipping provider %r: not a valid video', name)
+                continue
+
+            # check supported languages
+            provider_languages = self.manager[name].plugin.languages & languages
+            if not provider_languages:
+                logger.info('Skipping provider %r: no language to search for', name)
+                continue
+
+            # list subtitles
+            logger.info('Listing subtitles with provider %r and languages %r', name, provider_languages)
+            try:
+                provider_subtitles = self[name].list_subtitles(video, provider_languages)
+            except (requests.Timeout, socket.timeout):
+                logger.error('Provider %r timed out, discarding it', name)
+                self.discarded_providers.add(name)
+                continue
+	    except LanguageReverseError, e:
+		logger.exception("Unexpected language reverse error in %s, skipping. Error: %s", name, traceback.format_exc())
+		continue
+            except Exception, e:
+                logger.exception('Unexpected error in provider %r, discarding it, because of: %s', name, traceback.format_exc())
+                self.discarded_providers.add(name)
+                continue
+            subtitles.extend(provider_subtitles)
+
+        return subtitles

Contents/Libraries/Shared/subliminal_patch/patch_providers.py

@@ -0,0 +1,24 @@
+# coding=utf-8
+
+import logging
+from random import randint
+from subliminal.providers.addic7ed import Addic7edProvider
+
+logger = logging.getLogger(__name__)
+
+class PatchedAddic7edProvider(Addic7edProvider):
+    USE_ADDICTED_RANDOM_AGENTS = False
+
+    def __init__(self, username=None, password=None, use_random_agents=False):
+	super(PatchedAddic7edProvider, self).__init__(username=username, password=password)
+	self.USE_ADDICTED_RANDOM_AGENTS = use_random_agents
+
+    def initialize(self):
+	super(PatchedAddic7edProvider, self).initialize()
+	if self.USE_ADDICTED_RANDOM_AGENTS:
+	    from .utils import FIRST_THOUSAND_OR_SO_USER_AGENTS as AGENT_LIST
+	    logger.debug("addic7ed: using random user agents")
+	    self.session.headers = {
+        	'User-Agent': AGENT_LIST[randint(0, len(AGENT_LIST)-1)],
+        	'Referer': self.server_url,
+    	    }

Contents/Strings/en.json

@@ -12,6 +12,7 @@
   "nl":"Dutch",
   "en":"English",
   "et":"Estonian",
+  "fa":"Persian (Farsi)",
   "fi":"Finnish",
   "fr":"French",
   "de":"German",
@@ -31,6 +32,7 @@
   "no":"Norwegian",
   "pl":"Polish",
   "pt":"Portuguese",
+  "pt-br":"Portuguese (Brasil)",
   "ro":"Romanian",
   "ru":"Russian",
   "sr":"Serbian",

README.md

@@ -1,9 +1,16 @@
 pannal's fork:
 
-- increased score of addic7ed subtitles a bit
-- support for newest Subliminal and guessit
-- plugin now also works with com.plexapp.agents.thetvdbdvdorder
-- guessit's release-group detection bug fixed (not the correct way, though. has already been fixed in guessit itself, need to merge)
+- ~~increased score of addic7ed subtitles a bit~~ (not existing currently)
+- **support for newest Subliminal (1.0.1) and guessit (0.10.1)**
+- **plugin now also works with com.plexapp.agents.thetvdbdvdorder**
+- guessit's release-group detection bug fixed (*not the correct way, though. has already been fixed in guessit itself, need to merge*)
+- providers fixed for subliminal 1.0.1 (at least addic7ed)
+- support for addic7ed languages: French (Canadian)
+- support for additional languages: pt-br (Portuguese (Brasil)), fa (Persian (Farsi))
+- support for three (two optional) subtitle languages
+
+bugs:
+- skip existing subtitles (not in video's path - e.g. subFolder given) currently broken
 
 Subliminal.bundle
 =================