#2 #6 furture cleaning up the methods to create properties and channels

ChannelFinder · Dec 14, 2015 · e3a2cba · e3a2cba
1 parent 1696b62
commit e3a2cba
Show file tree

Hide file tree

Showing 2 changed files with 170 additions and 92 deletions.
diff --git a/channelfinder/ChannelFinderClient.py b/channelfinder/ChannelFinderClient.py
@@ -186,25 +186,11 @@ def __handleMultipleAddParameters(self, **kwds):
                          headers=copy(self.__jsonheader), \
                          verify=False, \
                          auth=self.__auth).raise_for_status()
-        elif 'property' in kwds and 'channelName' in kwds:
-            channels = [{u'name':kwds['channelName'].strip(), u'owner':self.__userName, u'properties':[kwds['property']]}]
-            self.__session.put(self.__baseURL + self.__propertiesResource + '/' + kwds['property'][u'name'], \
-                         data=JSONEncoder().encode(self.__encodeProperty(kwds['property'], withChannels=channels)), \
-                         headers=copy(self.__jsonheader), \
-                         verify=False, \
-                         auth=self.__auth).raise_for_status()
-        elif 'property' in kwds and 'channelNames' in kwds:
-            channels = []
-            for eachChannel in kwds['channelNames']:
-                channels.append({u'name':eachChannel, u'owner':self.__userName, u'properties':[kwds['property']]})
-            self.__session.put(self.__baseURL + self.__propertiesResource + '/' + kwds['property'][u'name'], \
-                         data=JSONEncoder().encode(self.__encodeProperty(kwds['property'], withChannels=channels)), \
-                         headers=copy(self.__jsonheader), \
-                         verify=False, \
-                         auth=self.__auth).raise_for_status()
         elif 'property' in kwds and 'channels' in kwds:
+            data = kwds['property']
+            data['property']['channels'] = kwds['channels']
             self.__session.put(self.__baseURL + self.__propertiesResource + '/' + kwds['property'][u'name'], \
-                         data=JSONEncoder().encode(self.__encodeProperty(kwds['property'], withChannels=kwds['channels'])), \
+                         data=JSONEncoder().encode(data), \
                          headers=copy(self.__jsonheader), \
                          verify=False, \
                          auth=self.__auth).raise_for_status()
@@ -524,15 +510,15 @@ def __handleSingleUpdateParameter(self, **kwds):
         if 'channel' in kwds:
             ch = kwds['channel']
             r = self.__session.post(self.__baseURL + self.__channelsResource + '/' + ch[u'name'], \
-                                     data=JSONEncoder().encode(self.__encodeChannel(ch)), \
+                                     data=JSONEncoder().encode(ch), \
                                      headers=copy(self.__jsonheader), \
                                      verify=False, \
                                      auth=self.__auth)
             r.raise_for_status()
         elif 'property' in kwds:
             property = kwds['property']
             r = self.__session.post(self.__baseURL + self.__propertiesResource + '/' + property[u'name'], \
-                                     data=JSONEncoder().encode(self.__encodeProperty(property)), \
+                                     data=JSONEncoder().encode(property), \
                                      headers=copy(self.__jsonheader), \
                                      verify=False, \
                                      auth=self.__auth)