From abc6841eb323be07605b005a205feb3234b854f5 Mon Sep 17 00:00:00 2001
From: echel0n <justin.tabish@gmail.com>
Date: Sat, 26 Apr 2014 14:14:38 -0700
Subject: [PATCH] Fix for DownloadStation issues. Added season and episode
 formatting options for XEM scene numbering.

---
 .../default/config_postProcessing.tmpl        | 20 +++++
 sickbeard/clients/download_station.py         | 77 +++++++++----------
 2 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/gui/slick/interfaces/default/config_postProcessing.tmpl b/gui/slick/interfaces/default/config_postProcessing.tmpl
index 92af7816..bda37130 100644
--- a/gui/slick/interfaces/default/config_postProcessing.tmpl
+++ b/gui/slick/interfaces/default/config_postProcessing.tmpl
@@ -328,6 +328,16 @@
                                           <td>%0S</td>
                                           <td>02</td>
                                         </tr>
+                                        <tr class="even">
+                                          <td class="align-right"><b>XEM Season Number:</b></td>
+                                          <td>%XMS</td>
+                                          <td>2</td>
+                                        </tr>
+                                        <tr>
+                                          <td>&nbsp;</td>
+                                          <td>%0XMS</td>
+                                          <td>02</td>
+                                        </tr>
                                         <tr class="even">
                                           <td class="align-right"><b>Episode Number:</b></td>
                                           <td>%E</td>
@@ -338,6 +348,16 @@
                                           <td>%0E</td>
                                           <td>03</td>
                                         </tr>
+                                        <tr class="even">
+                                          <td class="align-right"><b>XEM Episode Number:</b></td>
+                                          <td>%XME</td>
+                                          <td>3</td>
+                                        </tr>
+                                        <tr>
+                                          <td>&nbsp;</td>
+                                          <td>%0XME</td>
+                                          <td>03</td>
+                                        </tr>
                                         <tr class="even">
                                           <td class="align-right"><b>Episode Name:</b></td>
                                           <td>%EN</td>
diff --git a/sickbeard/clients/download_station.py b/sickbeard/clients/download_station.py
index a1017cb6..179c5a02 100644
--- a/sickbeard/clients/download_station.py
+++ b/sickbeard/clients/download_station.py
@@ -1,4 +1,6 @@
-# Authors: Mr_Orange & Jens Timmerman <jens.timmerman@gmail.com>
+# Authors:
+# Pedro Jose Pereira Vieito <pvieito@gmail.com> (Twitter: @pvieito)
+#
 # URL: https://github.com/mr-orange/Sick-Beard
 #
 # This file is part of Sick Beard.
@@ -15,64 +17,55 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Sick Beard. If not, see <http://www.gnu.org/licenses/>.
+#
+# Uses the Synology Download Station API: http://download.synology.com/download/other/Synology_Download_Station_Official_API_V3.pdf.
 
 import sickbeard
-from sickbeard import logger
 from sickbeard.clients.generic import GenericClient
 
-
 class DownloadStationAPI(GenericClient):
-    
+
     def __init__(self, host=None, username=None, password=None):
-        
+
         super(DownloadStationAPI, self).__init__('DownloadStation', host, username, password)
-      
+
         self.url = self.host + 'webapi/DownloadStation/task.cgi'
 
     def _get_auth(self):
-        
-        params = {'api': 'SYNO.API.Auth',
-                  'version': '2',
-                  'method': 'login',
-                  'account': self.username,
-                  'passwd': self.password,
-                  'session': 'SickBeard',
-                  'format': 'sid',
-                  }
 
-        self.response = self.session.get(self.host + 'webapi/auth.cgi', params=params)
-        
-        if not self.response.json["success"]:
+        auth_url = self.host + 'webapi/auth.cgi?api=SYNO.API.Auth&version=2&method=login&account=' + self.username + '&passwd=' + self.password + '&session=DownloadStation&format=sid'
+
+        try:
+            self.response = self.session.get(auth_url)
+            self.auth = self.response.json()['data']['sid']
+        except:
             return None
 
-        self.auth = self.response.json["data"]["sid"]
-        
         return self.auth
 
     def _add_torrent_uri(self, result):
 
-        params = {'api': 'SYNO.DownloadStation.Task',
-                  'version': '1',
-                  'method': 'create',
-                  '_sid': self.auth,
-                  'uri': result.url,
-                  }
-        
-        self._request(method='get', params=params)
-        
-        return self.response.json["success"]
-            
+        data = {'api':'SYNO.DownloadStation.Task',
+                'version':'1', 'method':'create',
+                'session':'DownloadStation',
+                '_sid':self.auth,
+                'uri':result.url
+                }
+        self._request(method='post', data=data)
+
+        return self.response.json()['success']
+
     def _add_torrent_file(self, result):
 
-        params = {'api': 'SYNO.DownloadStation.Task',
-                  'version': '1',
-                  'method': 'create',
-                  '_sid': self.auth,
-                  'file': 'tv.torrent',
-                  }
-        
-        self._request(method='get', params=params, files={'file': result.content})
-    
-        return self.response.json["success"]
-    
+        data = {'api':'SYNO.DownloadStation.Task',
+                'version':'1',
+                'method':'create',
+                'session':'DownloadStation',
+                '_sid':self.auth
+                }
+        files = {'file':(result.name + '.torrent', result.content)}
+        self._request(method='post', data=data, files=files)
+
+        return self.response.json()['success']
+
 api = DownloadStationAPI()
\ No newline at end of file