changed makeRequest to use KIO

ku1ik · Apr 14, 2009 · 944ea51 · 944ea51
1 parent 15cc875
commit 944ea51
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/contents/code/main.py b/contents/code/main.py
@@ -30,7 +30,7 @@
 import sys
 sys.path.append(os.path.dirname(__file__))
 import rubytime
-import workers
+#import workers
 
 
 class RubytimeApplet(plasmascript.Applet):
@@ -43,7 +43,8 @@ def init(self):
 
     # create session
     self.api = rubytime.RubytimeSession(str(self.cfg.readEntry('hostname', 'http://localhost:4000')),
-                                        str(self.cfg.readEntry('username', 'dev1')), str(self.cfg.readEntry('password', 'password')))
+                                        str(self.cfg.readEntry('username', 'dev1')),
+                                        str(self.cfg.readEntry('password', 'password')), self)
 
     # setup notifications proxy
     self.sessionBus = dbus.SessionBus()
@@ -277,10 +278,11 @@ def setActivities(self, activities):
 
   def updateActivities(self):
     self.applet.setBusy(True)
-    self.updateActivitiesThread = workers.ActivitiesWorker(self)
-    self.connect(self.updateActivitiesThread, SIGNAL("finished()"), self.workerFinished)
+#    self.updateActivitiesThread = workers.ActivitiesWorker(self)
+#    self.connect(self.updateActivitiesThread, SIGNAL("finished()"), self.workerFinished)
 #    self.connect(self.updateActivitiesThread, SIGNAL("terminated()"), self.workerFinished)
-    self.updateActivitiesThread.start()
+#    self.updateActivitiesThread.start()
+    self.api.getActivities()
 
   def updateProjects(self):
     pass

diff --git a/contents/code/rubytime.py b/contents/code/rubytime.py
@@ -2,12 +2,15 @@
 import urllib2
 import base64
 import simplejson
-
+from PyQt4.QtCore import *
+from PyKDE4.kdecore import *
+from PyKDE4.kio import *
 
 class RubytimeSession:
 
-  def __init__(self, url, username, passwd):
+  def __init__(self, url, username, passwd, applet):
     self.url, self.username, self.password = url, username, passwd
+    self.applet = applet
     pass
 
   def getProjects(self):
@@ -22,6 +25,18 @@ def addActivity(self, activity):
     return self.makeRequest('/activities.json', data)
 
   def makeRequest(self, path, data=None):
+    if data:
+      pass
+    else:
+      job = KIO.storedGet(KUrl(self.url + path))
+      job.addMetaData("content-type", "application/x-www-form-urlencoded")
+      QObject.connect(job, SIGNAL("result(KJob*)"), self.jobFinished)
+    return [False, None]
+
+  def jobFinished(self, job):
+    print "job finished", job.error(), job.data()
+
+  def makeRequest2(self, path, data=None):
     base64string = base64.encodestring('%s:%s' % (self.username, self.password))[:-1]
     authheader =  "Basic %s" % base64string
     if data:
@@ -38,13 +53,11 @@ def makeRequest(self, path, data=None):
         status, content = False, simplejson.JSONDecoder().decode(e.fp.read())
       else:
         raise e
-    #except Exception, e:
-    #  return None
     return [status, content]
 
 if __name__ == "__main__":
   session = RubytimeSession("http://localhost:4000", "dev1", "password")
-#  print session.getActivities()
+  print session.getActivities()
 #  print session.getProjects()
-  print session.addActivity({ 'date': '2009-04-14', 'project_id': 1, 'hours': '31.5', 'comments': 'blaa' })
+#  print session.addActivity({ 'date': '2009-04-14', 'project_id': 1, 'hours': '31.5', 'comments': 'blaa' })