Merge pull request #144 from cliffordwhansen/master

A couple of new settings
RGPaul · May 31, 2012 · 1e59d75 · 1e59d75
2 parents 17ef66c + ff6cc1c
commit 1e59d75
Show file tree

Hide file tree

Showing 16 changed files with 117 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-*.pyo
+*.pyo
+*.pyc
diff --git a/friends.py b/friends.py
@@ -15,12 +15,17 @@
 __settings__ = xbmcaddon.Addon( "script.TraktUtilities" )
 __language__ = __settings__.getLocalizedString
 
-apikey = '48dfcb4813134da82152984e8c4f329bc8b8b46a'
+apikey = __settings__.getSetting('apikey')
 username = __settings__.getSetting("username")
 pwd = sha.new(__settings__.getSetting("password")).hexdigest()
 debug = __settings__.getSetting( "debug" )
+https = __settings__.getSetting( "https" )
+
+if (https == 'true'):
+    conn = httplib.HTTPSConnection('api.trakt.tv')
+else:
+    conn = httplib.HTTPConnection('api.trakt.tv')
 
-conn = httplib.HTTPConnection('api.trakt.tv')
 headers = {"Content-type": "application/x-www-form-urlencoded", "Accept": "text/plain"}
 
 def showFriends():

diff --git a/nbhttpsconnection.py b/nbhttpsconnection.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+# 
+
+import os, sys
+import time, socket
+import urllib
+import thread
+import threading
+
+try:
+    # Python 3.0 +
+    import http.client as httplib
+except ImportError:
+    # Python 2.7 and earlier
+    import httplib
+
+try:
+  # Python 2.6 +
+  from hashlib import sha as sha
+except ImportError:
+  # Python 2.5 and earlier
+  import sha
+
+__author__ = "Ralph-Gordon Paul, Adrian Cowan"
+__credits__ = ["Ralph-Gordon Paul", "Adrian Cowan", "Justin Nemeth",  "Sean Rudford"]
+__license__ = "GPL"
+__maintainer__ = "Ralph-Gordon Paul"
+__email__ = "ralph-gordon.paul@uni-duesseldorf.de"
+__status__ = "Production"
+
+# Allows non-blocking http requests
+class NBHTTPSConnection():    
+    def __init__(self, host, port = None, strict = None, timeout = None):
+        self.rawConnection = httplib.HTTPSConnection(host, port, strict, timeout)
+        self.responce = None
+        self.responceLock = threading.Lock()
+        self.closing = False
+
+    def request(self, method, url, body = None, headers = {}):
+        self.rawConnection.request(method, url, body, headers);
+
+    def hasResult(self):
+        if self.responceLock.acquire(False):
+            self.responceLock.release()
+            return True
+        else:
+            return False
+
+    def getResult(self):
+        while not self.hasResult() and not self.closing:
+            time.sleep(1)
+        return self.responce
+
+    def go(self):
+        self.responceLock.acquire()
+        thread.start_new_thread ( NBHTTPSConnection._run, ( self, ) )
+
+    def _run(self):
+        self.responce = self.rawConnection.getresponse()
+        self.responceLock.release()
+
+    def close(self):
+        self.closing = True
+        self.rawConnection.close()
+
diff --git a/rating.py b/rating.py
@@ -16,7 +16,7 @@
 __settings__ = xbmcaddon.Addon( "script.TraktUtilities" )
 __language__ = __settings__.getLocalizedString
 
-apikey = '0a698a20b222d0b8637298f6920bf03a'
+apikey = __settings__.getSetting('apikey')
 username = __settings__.getSetting("username")
 pwd = sha.new(__settings__.getSetting("password")).hexdigest()
 debug = __settings__.getSetting( "debug" )

diff --git a/recommend.py b/recommend.py
@@ -15,12 +15,17 @@
 __settings__ = xbmcaddon.Addon( "script.TraktUtilities" )
 __language__ = __settings__.getLocalizedString
 
-apikey = '48dfcb4813134da82152984e8c4f329bc8b8b46a'
+apikey = __settings__.getSetting('apikey')
 username = __settings__.getSetting("username")
 pwd = sha.new(__settings__.getSetting("password")).hexdigest()
 debug = __settings__.getSetting( "debug" )
+https = __settings__.getSetting('https')
+
+if (https == 'true'):
+    conn = httplib.HTTPSConnection('api.trakt.tv')
+else:
+    conn = httplib.HTTPConnection('api.trakt.tv')
 
-conn = httplib.HTTPConnection('api.trakt.tv')
 headers = {"Content-type": "application/x-www-form-urlencoded", "Accept": "text/plain"}
 
 # list reccomended movies

diff --git a/resources/language/Dutch/string.xml b/resources/language/Dutch/string.xml
@@ -6,6 +6,8 @@
 	<string id="1012">API Key (te vinden op trakt -&gt; Settings -&gt; API)</string>
 	<string id="1013">Gebruikersnaam</string>
 	<string id="1014">Wachtwoord</string>
+        <string id="1015">API Key</string>
+        <string id="1016">HTTPS</string>
 
 	<string id="1020">Automatisch synchroniseren</string>
 	<string id="1021">Automatisch bijwerken Film Collectie bij opstarten</string>

diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
@@ -6,6 +6,8 @@
     <string id="1012">API Key (found on trakt --&gt; Settings --&gt; API)</string>
     <string id="1013">Username</string>
     <string id="1014">Password</string>
+    <string id="1015">API Key</string>
+        <string id="1016">HTTPS</string>
 
     <string id="1020">Auto Syncing</string>
     <string id="1021">Auto update Movies Collection at startup</string>

diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
@@ -5,6 +5,8 @@
     <string id="1002">API Key</string>
     <string id="1003">Benutzername</string>
     <string id="1004">Passwort</string>
+    <string id="1015">API Key</string>
+        <string id="1016">HTTPS</string>
     <string id="1005">Aktualisiere Filmsammlung beim start</string>
     <string id="1006">Aktualisiere Seriensammlung beim start</string>
     <string id="1007">Synchronisiere gesehene Filme beim start</string>

diff --git a/resources/language/Polish/strings.xml b/resources/language/Polish/strings.xml
@@ -10,6 +10,8 @@
   <string id="1012">Klucz API (dostępny na trakt --&gt; Ustawienia --&gt; API)</string>
   <string id="1013">Użytkownik</string>
   <string id="1014">Hasło</string>
+  <string id="1015">Klucz API</string>
+        <string id="1016">HTTPS</string>
   <string id="1020">Auto synchronizacja</string>
   <string id="1021">Auto aktualizacja Kolekcji Filmów przy starcie</string>
   <string id="1022">Auto aktualizacja Kolekcji Seriali przy starcie</string>

diff --git a/resources/language/Portuguese (Brazil)/strings.xml b/resources/language/Portuguese (Brazil)/strings.xml
@@ -6,6 +6,8 @@
     <string id="1012">Chave API (encontre em trakt --&gt; Settings --&gt; API)</string>
     <string id="1013">Usuário</string>
     <string id="1014">Senha</string>
+    <string id="1015">Chave API</string>
+        <string id="1016">HTTPS</string>
 
     <string id="1020">Auto Sincronia</string>
     <string id="1021">Auto atualizar Coleção de Filmes ao iniciar</string>

diff --git a/resources/settings.xml b/resources/settings.xml
@@ -3,7 +3,9 @@
     <category label="1010"><!-- General -->
         <setting id="username" type="text" label="1013" default="" />
         <setting id="password" type="text" option="hidden" label="1014" default="" />
+        <setting id="apikey" type="text" label="1015" default="" />
         <setting id="debug" type="bool" label="1011" default="false"/>
+        <setting id="https" type="bool" label="1016" default="false"/>
     </category>
     <category label="1020"><!-- Auto Sync -->
         <setting id="autosync_moviecollection" type="bool" label="1021" default="false"/>

diff --git a/scrobbler.py b/scrobbler.py
@@ -20,7 +20,7 @@
 __settings__ = xbmcaddon.Addon( "script.TraktUtilities" )
 __language__ = __settings__.getLocalizedString
 
-apikey = '0a698a20b222d0b8637298f6920bf03a'
+apikey = __settings__.getSetting('apikey')
 username = __settings__.getSetting("username")
 pwd = sha.new(__settings__.getSetting("password")).hexdigest()
 debug = __settings__.getSetting( "debug" )

diff --git a/sync_update.py b/sync_update.py
@@ -31,7 +31,7 @@
 __settings__ = xbmcaddon.Addon( "script.TraktUtilities" )
 __language__ = __settings__.getLocalizedString
 
-apikey = '48dfcb4813134da82152984e8c4f329bc8b8b46a'
+apikey = __settings__.getSetting('apikey')
 username = __settings__.getSetting("username")
 pwd = sha.new(__settings__.getSetting("password")).hexdigest()
 debug = __settings__.getSetting( "debug" )

diff --git a/trending.py b/trending.py
@@ -35,12 +35,17 @@
 __settings__ = xbmcaddon.Addon( "script.TraktUtilities" )
 __language__ = __settings__.getLocalizedString
 
-apikey = '48dfcb4813134da82152984e8c4f329bc8b8b46a'
+apikey = __settings__.getSetting('apikey')
 username = __settings__.getSetting("username")
 pwd = sha.new(__settings__.getSetting("password")).hexdigest()
 debug = __settings__.getSetting( "debug" )
+https = __settings__.getSetting('https')
+
+if (https == 'true'):
+    conn = httplib.HTTPSConnection('api.trakt.tv')
+else:
+    conn = httplib.HTTPConnection('api.trakt.tv')
 
-conn = httplib.HTTPConnection('api.trakt.tv')
 headers = {"Content-type": "application/x-www-form-urlencoded", "Accept": "text/plain"}
 
 def showTrendingMovies():

diff --git a/utilities.py b/utilities.py
@@ -9,6 +9,7 @@
 except ImportError: import json
 
 from nbhttpconnection import *
+from nbhttpsconnection import *
 
 import urllib, re
 
@@ -37,7 +38,7 @@
 __settings__ = xbmcaddon.Addon( "script.TraktUtilities" )
 __language__ = __settings__.getLocalizedString
 
-apikey = '48dfcb4813134da82152984e8c4f329bc8b8b46a'
+apikey = __settings__.getSetting('apikey')
 username = __settings__.getSetting("username")
 pwd = sha.new(__settings__.getSetting("password")).hexdigest()
 debug = __settings__.getSetting( "debug" )
@@ -90,8 +91,12 @@ def xcp(s):
 
 # get a connection to trakt
 def getTraktConnection():
+    https = __settings__.getSetting('https')
     try:
-        conn = NBHTTPConnection('api.trakt.tv')
+        if (https == 'true'):
+            conn = NBHTTPSConnection('api.trakt.tv')
+        else:
+            conn = NBHTTPConnection('api.trakt.tv')
     except socket.timeout:
         Debug("getTraktConnection: can't connect to trakt - timeout")
         notification("Trakt Utilities", __language__(1108).encode( "utf-8", "ignore" ) + ": timeout") # can't connect to trakt

diff --git a/watchlist.py b/watchlist.py
@@ -35,12 +35,17 @@
 __settings__ = xbmcaddon.Addon( "script.TraktUtilities" )
 __language__ = __settings__.getLocalizedString
 
-apikey = '48dfcb4813134da82152984e8c4f329bc8b8b46a'
+apikey = __settings__.getSetting('apikey')
 username = __settings__.getSetting("username")
 pwd = sha.new(__settings__.getSetting("password")).hexdigest()
 debug = __settings__.getSetting( "debug" )
+https = __settings__.getSetting('https')
+
+if (https == 'true'):
+    conn = httplib.HTTPSConnection('api.trakt.tv')
+else:
+    conn = httplib.HTTPConnection('api.trakt.tv')
 
-conn = httplib.HTTPConnection('api.trakt.tv')
 headers = {"Content-type": "application/x-www-form-urlencoded", "Accept": "text/plain"}
 
 # list watchlist movies