commit to present

datahandling.py

@@ -98,13 +98,20 @@ class Datalogger():
                     logger.info('item is {}'.format(type(item)))
                     filename = item[0]
                     file = base64.b64decode(bytes(item[1],'ascii'))
+
+                    folder = os.path.join(self.photo_path, self._mt.mid)
+                    file_path = os.path.join(self.photo_path, folder , filename)
+
+                    if not os.path.exists(folder):
+                            os.makedirs(folder)
+
                     with open(os.path.join(self.photo_path, filename), 'wb') as f:
                         f.write(file)
                     # file.save(os.path.join(self.photo_path, filename))
+
                 return 'success'
 
 class Datareporter():
-    #Debug 2 sends from cell to server
     from lib.sim900.inetgsm import SimInetGSM
 
     def __init__(self,
@@ -262,21 +269,6 @@ class Record():
     def _get_dict(self):
         return self._transpondence
 
-    # def send(self):
-    #     # self._transpondence['mid'] = m.name
-    #     # self._transpondence['mt'] = m.now()
-    #     # print ('Send transpondence {}'.format(self._transpondence))
-    #
-    #     for k in self._transpondence.keys():
-    #         if self._transpondence[k] is not str: #basically, check if image
-    #             self._transpondence[k] = json.dumps(self._transpondence[k])
-    #
-    #     r = self._send(message=self._transpondence, message_type='transpondence')
-    #
-    #     #On error, do not clear transpondence
-    #     if not r:
-    #         self._transpondence = None
-