[debug] fix final data loss & flag stop after writer write

python/biopro/recording/file.py

@@ -1131,14 +1131,17 @@ class RecordingFileWriter:
         self._splitting_size = 0
         return None
 
-    def close(self):
-        # if self._recording_file is not None:
-        #     self._recording_file.close()
-        #     self._recording_file = None
-        print('close1')
+    def close(self, mqtt_thread):
         self._close = True
         if len(self._recording_file_dict) > 0:
             for ch in self._data_db.keys():
+                if len(self._data_rl[ch]) > 0:
+                    self._data_rl[ch].append(str(int(self._time_now)))
+                    mes = ' '.join(self._data_rl[ch])
+                    mqtt_thread[ch].on_message(mes)
+                    self._data_rl[ch].clear()
+                    self._send_data[ch] = False
+
                 if self._recording_file_dict[ch]._status:
                     _data = ' '.join(self._data_db[ch])
                     self._raw_save['data'][ch] = _data

python/biopro/server/recording.py

@@ -229,25 +229,6 @@ class RecordingProcess(Process):
                 #     except:
                 #         pass
 
-                try:
-                    time_duration = self._meta_file.configuration.get_parameter('TIME_DURATION')
-                    if time_duration and time_duration is not 0 and time() - self._start_time >= time_duration:
-                        self._queue_msg.put(['ds', self._device, 'interrupt'])
-                        return None
-
-                    if isinstance(self._decoder, I4V4Z4T4DataDecoder) or isinstance(self._decoder, EISZeroOneDataDecoder):
-                        if self._decoder.isFinishMode is not None and self._decoder.isFinishMode() == 1:
-                            self._queue_msg.put(['ds', self._device, 'interrupt'])
-                            return None
-                            # content = {}
-                            # content['header'] = 'device_instruction/0'
-                            # content['device'] = result.device
-                            # content['instruction'] = 'interrupt'
-                            # self._mqtt_thread.publish('device_instruction',json_stringify(content), True)
-                            # self.server.stop_sync(self.device)
-                except RuntimeError as e:
-                    print(e)
-
                 if result is not None:
                     ##
                     if len(self._mqtt_send_data_ch_level) == 0:
@@ -264,9 +245,27 @@ class RecordingProcess(Process):
                 self._writer.channels_update(ret[0].channels())
             self._writer.write(ret, self._mqtt_send_data_ch_level)
         # print('write time: ', time() - ctime1)
-
         # print(ret)
 
+        try:
+            time_duration = self._meta_file.configuration.get_parameter('TIME_DURATION')
+            if time_duration and time_duration is not 0 and time() - self._start_time >= time_duration:
+                self._queue_msg.put(['ds', self._device, 'interrupt'])
+                return None
+
+            if isinstance(self._decoder, I4V4Z4T4DataDecoder) or isinstance(self._decoder, EISZeroOneDataDecoder):
+                if self._decoder.isFinishMode is not None and self._decoder.isFinishMode() == 1:
+                    self._queue_msg.put(['ds', self._device, 'interrupt'])
+                    return None
+                    # content = {}
+                    # content['header'] = 'device_instruction/0'
+                    # content['device'] = result.device
+                    # content['instruction'] = 'interrupt'
+                    # self._mqtt_thread.publish('device_instruction',json_stringify(content), True)
+                    # self.server.stop_sync(self.device)
+        except RuntimeError as e:
+            print(e)
+
         del ret
         del data
         return 
@@ -607,7 +606,7 @@ class RecordingProcess(Process):
 
     def final_write(self):
         if self._writer is not None:
-            return self._writer.close()
+            return self._writer.close(self._mqtt_send_data_ch_level)
         else:
             return False