userinterface nimmt nun auch providerwünsche entgegen
authorSandro Knauß <knauss@netzguerilla.net>
Wed, 28 Oct 2009 03:36:27 +0100
changeset 10 4a33882f3a49
parent 8 cec27aeb7e69
child 11 f25033cf93e0
userinterface nimmt nun auch providerwünsche entgegen
iro/joblist.py
iro/user.py
--- a/iro/joblist.py	Wed Oct 28 03:03:46 2009 +0100
+++ b/iro/joblist.py	Wed Oct 28 03:36:27 2009 +0100
@@ -35,25 +35,25 @@
         self.queue.put(job)
         return id
 
-    def newSMS(self,message,recipients):
+    def newSMS(self,message,recipients,provider="default"):
         '''
         creates a new SMS
         '''
-        job=self.manager.MessageJob(self.providerlist.getProvider("sms"),message, content.SMS(message),recipients)
+        job=self.manager.MessageJob(self.providerlist.getProvider("sms",provider),message, content.SMS(message),recipients)
         return self.__registerJob__(job)
 
-    def newFAX(self,subject, fax,recipients):
+    def newFAX(self,subject, fax,recipients,provider="default"):
         '''
         creates a new Fax
         '''
-        job=self.manager.MessageJob(self.providerlist.getProvider("fax"),subject, content.FAX(subject, fax),recipients)
+        job=self.manager.MessageJob(self.providerlist.getProvider("fax",provider),subject, content.FAX(subject, fax),recipients)
         return self.__registerJob__(job)
 
-    def newMail(self,subject, body,recipients):
+    def newMail(self,subject, body,recipients,provider="default"):
         '''
         creates a new Mail
         '''
-        job=self.manager.MessageJob(self.providerlist.getProvider("mail"),subject, content.Mail(subject, body),recipients)
+        job=self.manager.MessageJob(self.providerlist.getProvider("mail",provider),subject, content.Mail(subject, body),recipients)
         return self.__registerJob__(job) 
 
     def _createID(self):
--- a/iro/user.py	Wed Oct 28 03:03:46 2009 +0100
+++ b/iro/user.py	Wed Oct 28 03:36:27 2009 +0100
@@ -58,18 +58,18 @@
         job.stop()
 
     
-    def startSMS(self,message,recipients):
+    def startSMS(self,message,recipients,provider="default"):
         '''
         starts the SMS with message to recipients
         '''
         if not "sms" in self.features:
             raise NotSupportedFeature("sms")
-        id = self.jobqueue.newSMS(message,recipients)
+        id = self.jobqueue.newSMS(message,recipients,provider)
         self.jobs[id]=self.jobqueue[id]
         return id
     
     
-    def startFAX(self):
+    def startFAX(self,provider="default"):
         '''
         starts the FAX - not implemented
         '''
@@ -77,10 +77,10 @@
 
     
         
-    def startMail(self,subject,  body , recipients):
+    def startMail(self,subject,  body , recipients,provider="default"):
         if not "mail" in self.features:
             raise NotSupportedFeature("mail")
-        id = self.jobqueue.newMail(subject,  body ,recipients)
+        id = self.jobqueue.newMail(subject,  body ,recipients,provider)
         self.jobs[id]=self.jobqueue[id]
         return id