[plugin.video.wakanim] 0.6.0

13 files changed, 138 insertions, 33 deletions

diff --git a/plugin.video.wakanim/README.md b/plugin.video.wakanim/README.md
index ea4a596..9a68f1a 100644
--- a/plugin.video.wakanim/README.md
+++ b/plugin.video.wakanim/README.md
@@ -4,25 +4,13 @@ Wakanim a KODI (XBMC) plugin for Wakanim.tv.
 
 Git repo: https://github.com/MrKrabat/plugin.video.wakanim
 
-Forum posting: https://www.kodinerds.net/index.php/Thread/58348-Release-Wakanim-tv/
+Forum posting: https://forum.kodi.tv/showthread.php?tid=322763
 
 **WARNING: You MUST be a PREMIUM member OR buy videos to use this plugin!**
 ***
 
-Compatibility
-
-| Device  | Kodi | Status |
-| ------------- | ------------- | ------------- |
-| Windows | 17.x  | Yes  |
-| Linux | 17.x  | Yes  |
-| MacOS | 17.x  | untested  |
-| Android | 17.x  | Yes  |
-| iOS | 17.x  | untested  |
-| RaspberryPi | 17.x  | Yes  |
-***
-
 What this plugin currently can do:
-- [x] Supports Wakanim France, Germany and Nordic
+- [x] Supports Wakanim France, Germany, Nordic and Russia
 - [x] Login with your account
 - [x] Search for animes
 - [x] Show "My Downloads"
@@ -30,10 +18,11 @@ What this plugin currently can do:
 - [x] Show/browse all available anime
 - [x] Show/browse all seasons/arcs of an anime
 - [x] Show/browse all episodes of an season/arc
-- [x] Display various informations (Kodi displays not all we provide)
+- [x] Display various informations
 - [x] Reactivate videos/streams
 - [x] Watch videos you have bought
 - [x] Watch videos with premium subscription
+- [x] Watch anime trailer (requires YouTube plugin)
 ***
 
 _This website and addon is not affiliated with Wakanim._
diff --git a/plugin.video.wakanim/addon.xml b/plugin.video.wakanim/addon.xml
index f5a8412..436cdaf 100644
--- a/plugin.video.wakanim/addon.xml
+++ b/plugin.video.wakanim/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.wakanim" name="Wakanim" version="0.5.2" provider-name="MrKrabat">
+<addon id="plugin.video.wakanim" name="Wakanim" version="0.6.0" provider-name="MrKrabat">
     <requires>
         <import addon="xbmc.python" version="2.25.0"/>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
@@ -9,19 +9,22 @@
     </extension>
     <extension point="xbmc.addon.metadata">
         <platform>all</platform>
-        <language>en de fr</language>
+        <language>en de fr ru</language>
         <summary lang="en_GB">Wakanim.tv - Anime streaming live from japan</summary>
         <summary lang="de_DE">Wakanim.tv - Anime Streaming live aus Japan</summary>
         <summary lang="fr_FR">Wakanim.tv - Streaming d'animes VOSTFR en direct du Japon</summary>
+        <summary lang="ru_RU">Wakanim.tv - Прямая трансляция аниме из Японии</summary>
         <description lang="en_GB">A constantly growing selection of subtitled animes, which can be discovered - new and popular titles.</description>
         <description lang="de_DE">Eine stetig wachsende Auswahl deutsch untertitelter Animes, die es zu entdecken gilt - neue und beliebte Titel.</description>
         <description lang="fr_FR">Des dizaines d'animes VOSTFR en streaming à découvrir - nouveautés et séries les plus prisées.</description>
+        <description lang="ru_RU">Ваши любимые аниме онгоинги прямо из Японии. Смотрите любимые и новые аниме онлайн в высоком качестве и без рекламы столько, сколько хотите.</description>
         <disclaimer lang="en_GB">WARNING: You MUST be a PREMIUM member or BUY videos to use this plugin</disclaimer>
         <disclaimer lang="de_DE">HINWEIS: Du MUSST PREMIUM Mitglied sein oder Videos KAUFEN um dieses Plugin zu benutzen</disclaimer>
         <disclaimer lang="fr_FR">AVERTISSEMENT: VOUS DEVEZ être un membre PREMIUM ou ACHETER des vidéos pour utiliser ce plugin</disclaimer>
-        <news>v0.5.2 (2017.12.27)[CR]- Fix Wakanim website change[CR]- Updated language</news>
+        <disclaimer lang="ru_RU">ВНИМАНИЕ: Для использования этого плагина Вы должны оформить подписку или купить аниме</disclaimer>
+        <news>v0.6.0 (2018.01.14)[CR]- Added Wakanim Russia (thanks AkariDN)</news>
         <license>GNU Affero General Public License, v3</license>
-        <forum>https://www.kodinerds.net/index.php/Thread/58348-Release-Wakanim-tv/</forum>
+        <forum>https://forum.kodi.tv/showthread.php?tid=322763</forum>
         <website>https://www.wakanim.tv/</website>
         <source>https://github.com/MrKrabat/plugin.video.wakanim</source>
         <email></email>
diff --git a/plugin.video.wakanim/changelog.txt b/plugin.video.wakanim/changelog.txt
index 8d37730..ab9843d 100644
--- a/plugin.video.wakanim/changelog.txt
+++ b/plugin.video.wakanim/changelog.txt
@@ -1,3 +1,6 @@
+v0.6.0 (2018.01.14)
+- Added Wakanim Russia (thanks AkariDN)
+
 v0.5.2 (2017.12.27)
 - Fix Wakanim website change
 - Updated language
diff --git a/plugin.video.wakanim/resources/language/resource.language.de_de/strings.po b/plugin.video.wakanim/resources/language/resource.language.de_de/strings.po
index b719f66..27af5cd 100644
--- a/plugin.video.wakanim/resources/language/resource.language.de_de/strings.po
+++ b/plugin.video.wakanim/resources/language/resource.language.de_de/strings.po
@@ -40,6 +40,9 @@ msgctxt "#30013"
 msgid "Sweden, Norway, Iceland, Finland, Denmark"
 msgstr "Schweden, Norwegen, Island, Finnland, Dänemark"
 
+msgctxt "#30014"
+msgid "Russia"
+msgstr "Russland"
 
 # Wakanim Menue
 
diff --git a/plugin.video.wakanim/resources/language/resource.language.en_gb/strings.po b/plugin.video.wakanim/resources/language/resource.language.en_gb/strings.po
index 3ce7aff..a64c829 100644
--- a/plugin.video.wakanim/resources/language/resource.language.en_gb/strings.po
+++ b/plugin.video.wakanim/resources/language/resource.language.en_gb/strings.po
@@ -40,11 +40,10 @@ msgctxt "#30013"
 msgid "Sweden, Norway, Iceland, Finland, Denmark"
 msgstr ""
 
-msgctxt "#30024"
-msgid "Watch trailer"
+msgctxt "#30014"
+msgid "Russia"
 msgstr ""
 
-
 # Wakanim Menue
 
 msgctxt "#30020"
@@ -63,6 +62,9 @@ msgctxt "#30023"
 msgid "My collection"
 msgstr ""
 
+msgctxt "#30024"
+msgid "Watch trailer"
+msgstr ""
 
 # Wakanim Messages
 
diff --git a/plugin.video.wakanim/resources/language/resource.language.fr_fr/strings.po b/plugin.video.wakanim/resources/language/resource.language.fr_fr/strings.po
index 14870b8..c3e091f 100644
--- a/plugin.video.wakanim/resources/language/resource.language.fr_fr/strings.po
+++ b/plugin.video.wakanim/resources/language/resource.language.fr_fr/strings.po
@@ -40,6 +40,9 @@ msgctxt "#30013"
 msgid "Sweden, Norway, Iceland, Finland, Denmark"
 msgstr "Suède, Norvège, Islande, Finlande, Danemark"
 
+msgctxt "#30014"
+msgid "Russia"
+msgstr "Russie"
 
 # Wakanim Menue
 
diff --git a/plugin.video.wakanim/resources/language/resource.language.he_il/strings.po b/plugin.video.wakanim/resources/language/resource.language.he_il/strings.po
index dc247ea..970d17e 100644
--- a/plugin.video.wakanim/resources/language/resource.language.he_il/strings.po
+++ b/plugin.video.wakanim/resources/language/resource.language.he_il/strings.po
@@ -14,7 +14,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.4\n"
 
+
 # Wakanim Settings
+
 msgctxt "#30001"
 msgid "Username"
 msgstr "שם משתמש"
@@ -39,11 +41,12 @@ msgctxt "#30013"
 msgid "Sweden, Norway, Iceland, Finland, Denmark"
 msgstr "שוודיה, נורבגיה, איסלנד, פינלנד, דנמרק"
 
-msgctxt "#30024"
-msgid "Watch trailer"
-msgstr "צפה בקדימון"
+msgctxt "#30014"
+msgid "Russia"
+msgstr "רוסיה"
 
 # Wakanim Menue
+
 msgctxt "#30020"
 msgid "Catalog"
 msgstr "קטלוג"
@@ -60,7 +63,12 @@ msgctxt "#30023"
 msgid "My collection"
 msgstr "האוסף שלי"
 
+msgctxt "#30024"
+msgid "Watch trailer"
+msgstr "צפה בקדימון"
+
 # Wakanim Messages
+
 msgctxt "#30040"
 msgid "Login failed"
 msgstr "הכניסה נכשלה"
diff --git a/plugin.video.wakanim/resources/language/resource.language.ru_ru/strings.po b/plugin.video.wakanim/resources/language/resource.language.ru_ru/strings.po
new file mode 100644
index 0000000..534e050
--- /dev/null
+++ b/plugin.video.wakanim/resources/language/resource.language.ru_ru/strings.po
@@ -0,0 +1,89 @@
+# Kodi Media Center language file
+msgid ""
+msgstr ""
+"Project-Id-Version: Kodi Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@kodi.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+
+# Wakanim Settings
+
+msgctxt "#30001"
+msgid "Username"
+msgstr "Имя пользователя"
+
+msgctxt "#30002"
+msgid "Password"
+msgstr "Пароль"
+
+msgctxt "#30010"
+msgid "Region"
+msgstr "Регион"
+
+msgctxt "#30011"
+msgid "Germany, Austria, Switzerland"
+msgstr "Германия, Австрия, Швейцария"
+
+msgctxt "#30012"
+msgid "France, Switzerland, Monaco, Benelux Union, Franco-Canadians, Overseas France, Africa"
+msgstr "Франция, Швейцария, Монако, Бенилюкс, Франкоканадцы, Заморские территории Франции, Африка"
+
+msgctxt "#30013"
+msgid "Sweden, Norway, Iceland, Finland, Denmark"
+msgstr "Швеция, Норвегия, Исландия, Финляндия, Дания"
+
+msgctxt "#30014"
+msgid "Russia"
+msgstr "Россия"
+
+# Wakanim Menue
+
+msgctxt "#30020"
+msgid "Catalog"
+msgstr "Каталог"
+
+msgctxt "#30021"
+msgid "Search"
+msgstr "Поиск"
+
+msgctxt "#30022"
+msgid "My downloads"
+msgstr "Мои загрузки"
+
+msgctxt "#30023"
+msgid "My collection"
+msgstr "Моя коллекция"
+
+msgctxt "#30024"
+msgid "Watch trailer"
+msgstr "Смотреть трейлер"
+
+# Wakanim Messages
+
+msgctxt "#30040"
+msgid "Login failed"
+msgstr "Ошибка авторизации"
+
+msgctxt "#30041"
+msgid "An error occurred"
+msgstr "Произошла ошибка"
+
+msgctxt "#30042"
+msgid "Reactivation failed of this video"
+msgstr "Не удалось выполнить повторную активацию этого видео"
+
+msgctxt "#30043"
+msgid "You need to be a premium member or own this video"
+msgstr "Вы должны оформить подписку или купить это видео"
+
+msgctxt "#30044"
+msgid "Failed to play video"
+msgstr "Не удалось воспроизвести видео"
diff --git a/plugin.video.wakanim/resources/lib/login.py b/plugin.video.wakanim/resources/lib/login.py
index 4d92a54..2ead064 100644
--- a/plugin.video.wakanim/resources/lib/login.py
+++ b/plugin.video.wakanim/resources/lib/login.py
@@ -51,7 +51,7 @@ def login(username, password, args):
         response = urllib2.urlopen("https://www.wakanim.tv/" + args._country + "/v2/catalogue")
         html = response.read()
 
-        if ("Meine Benachrichtigungen verwalten" in html) or ("Gérer mes notifications" in html) or ("Manage my notifications" in html):
+        if ("Meine Benachrichtigungen verwalten" in html) or ("Gérer mes notifications" in html) or ("Manage my notifications" in html) or ("Настройки уведомлений" in html):
             # session is valid
             return True
 
@@ -70,7 +70,7 @@ def login(username, password, args):
     # check for login string
     html = response.read()
 
-    if ("Meine Benachrichtigungen verwalten" in html) or ("Gérer mes notifications" in html) or ("Manage my notifications" in html):
+    if ("Meine Benachrichtigungen verwalten" in html) or ("Gérer mes notifications" in html) or ("Manage my notifications" in html) or ("Настройки уведомлений" in html):
         # save session to disk
         cj.save(cookiepath, ignore_discard=True)
         return True
diff --git a/plugin.video.wakanim/resources/lib/netapi.py b/plugin.video.wakanim/resources/lib/netapi.py
index 1fd5e6f..e169796 100644
--- a/plugin.video.wakanim/resources/lib/netapi.py
+++ b/plugin.video.wakanim/resources/lib/netapi.py
@@ -246,7 +246,7 @@ def startplayback(args):
     soup = BeautifulSoup(html, "html.parser")
 
     # check if not premium
-    if ("Diese Folge ist für Abonnenten reserviert" in html) or ("Cet épisode est reservé à nos abonnés" in html) or ("This episode is reserved for our subscribers" in html):
+    if ("Diese Folge ist für Abonnenten reserviert" in html) or ("Cet épisode est reservé à nos abonnés" in html) or ("This episode is reserved for our subscribers" in html) or ("Эта серия зарезервирована для наших подписчиков" in html):
         xbmc.log("[PLUGIN] %s: You need to own this video or be a premium member '%s'" % (args._addonname, args.url), xbmc.LOGERROR)
         xbmcgui.Dialog().ok(args._addonname, args._addon.getLocalizedString(30043))
         return
@@ -270,9 +270,9 @@ def startplayback(args):
             return
 
     # using stream with hls+aes
-    if ("Benutzer wechseln" in html) or ("Changer de lecteur" in html) or ("Change user" in html):
+    if ("Benutzer wechseln" in html) or ("Changer de lecteur" in html) or ("Change user" in html) or ("Переключить плеер" in html):
         # streaming is only for premium subscription
-        if (("<span>Kostenlos</span>" in html) or ("<span>Gratuit</span>" in html) or ("<span>Free</span>" in html)) and not ("episode_premium_title" in html):
+        if (("<span>Kostenlos</span>" in html) or ("<span>Gratuit</span>" in html) or ("<span>Free</span>" in html) or ("<span>Бесплатный аккаунт</span>" in html)) and not ("episode_premium_title" in html):
             xbmc.log("[PLUGIN] %s: You need to own this video or be a premium member '%s'" % (args._addonname, args.url), xbmc.LOGERROR)
             xbmcgui.Dialog().ok(args._addonname, args._addon.getLocalizedString(30043))
             return
diff --git a/plugin.video.wakanim/resources/lib/view.py b/plugin.video.wakanim/resources/lib/view.py
index c8a00ff..75f7e58 100644
--- a/plugin.video.wakanim/resources/lib/view.py
+++ b/plugin.video.wakanim/resources/lib/view.py
@@ -76,6 +76,9 @@ def add_item(args, info, isFolder=True, total_items=0, mediatype="video"):
                                 totalItems = total_items)
 
 
+def quote_value(value):
+    return urllib.quote_plus(value.encode("utf8") if isinstance(value, unicode) else value)
+
 def build_url(args, info):
     """Create url
     """
@@ -83,12 +86,12 @@ def build_url(args, info):
     # step 1 copy new information from info
     for key, value in info.iteritems():
         if value:
-            s = s + "&" + key + "=" + urllib.quote_plus(value)
+            s = s + "&" + key + "=" + quote_value(value)
 
     # step 2 copy old information from args, but don't append twice
     for key, value in args.__dict__.iteritems():
         if value and key in types and not "&" + str(key) + "=" in s:
-            s = s + "&" + key + "=" + urllib.quote_plus(value)
+            s = s + "&" + key + "=" + quote_value(value)
 
     return sys.argv[0] + "?" + s[1:]
 
diff --git a/plugin.video.wakanim/resources/lib/wakanim.py b/plugin.video.wakanim/resources/lib/wakanim.py
index 3c53fcb..688ce39 100644
--- a/plugin.video.wakanim/resources/lib/wakanim.py
+++ b/plugin.video.wakanim/resources/lib/wakanim.py
@@ -44,6 +44,8 @@ def main():
         args._country = "fr"
     elif args._country == "2":
         args._country = "sc"
+    elif args._country == "3":
+        args._country = "ru"
     else:
         args._country = "de"
 
diff --git a/plugin.video.wakanim/resources/settings.xml b/plugin.video.wakanim/resources/settings.xml
index bc00cb9..c62cd17 100644
--- a/plugin.video.wakanim/resources/settings.xml
+++ b/plugin.video.wakanim/resources/settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
-    <setting id="country" type="select" lvalues="30011|30012|30013" label="30010" default="0" />
+    <setting id="country" type="select" lvalues="30011|30012|30013|30014" label="30010" default="0" />
     <setting type="sep" />
     <setting id="wakanim_username" type="text" label="30001" default=""/>
     <setting id="wakanim_password" type="text" label="30002" option="hidden" default=""/>