Skip to content
Snippets Groups Projects

Resolve "remove tmp_dir_obj because not use memmap anymore"

All threads resolved!
Files
2
from __future__ import annotations
import os
from pathlib import Path
from tempfile import TemporaryDirectory
from typing import Optional, Union, List, Tuple, Dict
import traceback
@@ -14,7 +13,6 @@ from sohstationviewer.controller.util import \
display_tracking_info, get_valid_file_count, validate_file, validate_dir
from sohstationviewer.view.plotting.gps_plot.gps_point import GPSPoint
from sohstationviewer.view.util.enums import LogType
from sohstationviewer.database.process_db import execute_db
from sohstationviewer.model.general_data.general_data_helper import \
retrieve_data_time_from_data_dict, retrieve_gaps_from_data_dict, \
combine_data, sort_data, squash_gaps, apply_convert_factor_to_data_dict, \
@@ -148,14 +146,6 @@ class GeneralData():
"""
self.gaps: Dict[DataKey, List[List[float]]] = {}
"""
tmp_dir: dir to keep memmap files. Deleted when object is deleted
"""
self.tmp_dir_obj: TemporaryDirectory = TemporaryDirectory()
self.tmp_dir = self.tmp_dir_obj.name
if not on_unittest:
self.save_temp_data_folder_to_database()
self._pauser = QtCore.QSemaphore()
self.pause_response = None
@@ -279,17 +269,6 @@ class GeneralData():
self.selected_key = self.keys[ret]
return True
def __del__(self):
print("delete dataType Object")
try:
del self.tmp_dir_obj
except OSError as e:
self.track_info(
"Error deleting %s : %s" % (self.tmp_dir, e.strerror),
LogType.ERROR)
print("Error deleting %s : %s" % (self.tmp_dir, e.strerror))
print("finish deleting")
def track_info(self, text: str, type: LogType) -> None:
"""
Display tracking info in tracking_box.
@@ -361,10 +340,6 @@ class GeneralData():
"""
return cls.__new__(cls)
def save_temp_data_folder_to_database(self):
execute_db(f'UPDATE PersistentData SET FieldValue="{self.tmp_dir}" '
f'WHERE FieldName="tempDataDirectory"')
def sort_all_data(self):
"""
Sort traces by startTmEpoch on all data: waveform_data, mass_pos_data,
Loading