From b900f135e7155e6ec68452b3dba69fb1f32cff93 Mon Sep 17 00:00:00 2001
From: JackDandy <jackdandy@users.noreply.github.com>
Date: Tue, 7 May 2019 12:15:21 +0100
Subject: [PATCH] Fix Milkie torrent provider.

---
 CHANGES.md                                         |  9 ++++++--
 gui/slick/interfaces/default/config_providers.tmpl |  2 +-
 sickbeard/nzbget.py                                |  6 +++---
 sickbeard/providers/milkie.py                      | 24 ++++++++++++++++------
 sickbeard/search.py                                |  2 +-
 5 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index fd6ef24..def86a3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,11 +1,16 @@
-### 0.18.22 (2019-05-06 19:25:00 UTC)
+### 0.18.23 (2019-05-07 12:15:00 UTC)
+
+* Fix Milkie torrent provider
+
+
+### 0.18.22 (2019-05-06 19:25:00 UTC)
 
 * Update UnRar for Windows 5.70 to 5.71 x64
 * Change improve clarity for media provider search task
 * Add Milkie torrent provider
 * Change check manual search of illegal UNKNOWN status and change it to SKIPPED
 * Change set status for shows without location
-* Change set status to SKIPPED/UNARIED when update is exited early
+* Change set status to SKIPPED/UNAIRED when update is exited early
 
 
 ### 0.18.21 (2019-04-26 09:35:00 UTC)
diff --git a/gui/slick/interfaces/default/config_providers.tmpl b/gui/slick/interfaces/default/config_providers.tmpl
index dbe33fb..482daeb 100644
--- a/gui/slick/interfaces/default/config_providers.tmpl
+++ b/gui/slick/interfaces/default/config_providers.tmpl
@@ -568,7 +568,7 @@
             #set $user_value = $getattr($cur_torrent_provider, $user_type) or ''
 						<div class="field-pair">
 							<label for="$prov_type">
-								<span class="component-title">$user_type.capitalize():</span>
+								<span class="component-title">#if $hasattr($cur_torrent_provider, 'email')#User email#else#$user_type.capitalize():#end if#</span>
 								<span class="component-desc">
 									<input type="text" name="$prov_type" id="$prov_type" value="$user_value" class="form-control input-sm input350" />
 								</span>
diff --git a/sickbeard/nzbget.py b/sickbeard/nzbget.py
index 3b0f461..6766d84 100644
--- a/sickbeard/nzbget.py
+++ b/sickbeard/nzbget.py
@@ -98,13 +98,13 @@ def send_nzb(nzb):
         data = nzb.get_data()
         if not data:
             return False
-        nzbcontent64 = standard_b64encode(data)
+        nzbcontent64 = standard_b64encode(data).decode('utf-8')
     elif 'Anizb' == nzb.provider.name and 'nzb' == nzb.resultType:
         gen_provider = GenericProvider('')
         data = gen_provider.get_url(nzb.url)
         if None is data:
             return result
-        nzbcontent64 = standard_b64encode(data)
+        nzbcontent64 = standard_b64encode(data).decode('utf-8')
 
     logger.log(u'Sending NZB to NZBGet: %s' % nzb.name)
 
@@ -139,7 +139,7 @@ def send_nzb(nzb):
                     if None is data:
                         return result
 
-                    nzbcontent64 = standard_b64encode(data)
+                    nzbcontent64 = standard_b64encode(data).decode('utf-8')
                 nzbget_result = rpc_client.append('%s.nzb' % nzb.name, sickbeard.NZBGET_CATEGORY,
                                                   add_to_top, nzbcontent64)
         else:
diff --git a/sickbeard/providers/milkie.py b/sickbeard/providers/milkie.py
index c20083f..77faf08 100644
--- a/sickbeard/providers/milkie.py
+++ b/sickbeard/providers/milkie.py
@@ -18,6 +18,7 @@
 # along with SickGear.  If not, see <http://www.gnu.org/licenses/>.
 
 from . import generic
+from sickbeard import logger
 from sickbeard.helpers import tryInt
 from lib.unidecode import unidecode
 
@@ -32,10 +33,11 @@ class MilkieProvider(generic.TorrentProvider):
         
         self.api = self.url_base + 'api/v1/'
         self.urls = {'config_provider_home_uri': self.url_base,
-                     'login': self.api + 'auth/sessions', 'get': self.api + 'torrents/%s',
+                     'login': self.api + 'auth/sessions', 'auth': self.api + 'auth',
+                     'get': self.api + 'torrents/%s/torrent?key=%s',
                      'search': self.api + 'torrents?pi=0&ps=100&query=%s&categories=2&mode=release'}
 
-        self.username, self.password, self.minseed, self.minleech, self._token = 5 * [None]
+        self.username, self.email, self.password, self.minseed, self.minleech, self._token, self._dkey = 7 * [None]
 
     def _authorised(self, **kwargs):
 
@@ -46,6 +48,10 @@ class MilkieProvider(generic.TorrentProvider):
     def logged_in(self, resp=None):
         
         self._token = resp and resp.get('token')
+        if self._token:
+            resp = self.get_url(self.urls['auth'], skip_auth=True,
+                                headers=dict(Authorization='Bearer %s' % self._token), json=True)
+            self._dkey = isinstance(resp, dict) and resp.get('user', {}).get('downloadKey')
         return bool(self._token)
 
     def _search_provider(self, search_params, **kwargs):
@@ -61,19 +67,25 @@ class MilkieProvider(generic.TorrentProvider):
                 search_string = isinstance(search_string, unicode) and unidecode(search_string) or search_string
                 search_url = self.urls['search'] % search_string
 
-                data_json = self.get_url(search_url, headers=dict(Authorization='Bearer %s' % self._token), json=True)
+                data_json, sess = self.get_url(search_url, headers=dict(Authorization='Bearer %s' % self._token),
+                                               resp_sess=True, json=True)
                 if self.should_skip():
                     return results
 
                 cnt = len(items[mode])
-                if data_json:
-                    for tr in data_json.get('releases'):
+                if isinstance(data_json, dict):
+                    for tr in data_json.get('torrents') or data_json.get('releases') or []:
                         seeders, leechers, size = (tryInt(n, n) for n in [
                             tr.get(x) for x in ('seeders', 'leechers', 'size')])
                         if not self._reject_item(seeders, leechers):
-                            title, download_url = tr.get('releaseName'), self._link(tr.get('shortId'))
+                            title = tr.get('releaseName')
+                            download_id = tr.get('id') or tr.get('shortId')
+                            download_url = download_id and self.urls.get('get') % (download_id, self._dkey)
                             if title and download_url:
                                 items[mode].append((title, download_url, seeders, self._bytesizer(size)))
+                elif 200 != getattr(sess, 'response', {}).get('status_code', 0):
+                    logger.log('The site search is not working, skipping')
+                    break
 
                 self._log_search(mode, len(items[mode]) - cnt, search_url)
 
diff --git a/sickbeard/search.py b/sickbeard/search.py
index db79c58..1abfcb0 100644
--- a/sickbeard/search.py
+++ b/sickbeard/search.py
@@ -77,7 +77,7 @@ def _download_result(result):
             if not data:
                 new_result = False
             else:
-                with ek.ek(open, file_name, 'w') as file_out:
+                with ek.ek(open, file_name, 'wb') as file_out:
                     file_out.write(data)
 
                 helpers.chmodAsParent(file_name)