fix: исправлены связи между модулями

This commit is contained in:
Andrew 2025-01-22 18:24:19 +03:00
parent 67d237e4ed
commit 38b9778431
24 changed files with 7 additions and 6 deletions

View File

@ -52,6 +52,7 @@ class FileManager(BaseFileManager):
self._monitor.stop() self._monitor.stop()
self._paths_library.clear() self._paths_library.clear()
self._paths_library.add('') self._paths_library.add('')
print(self._paths_library)
self._mediator.notify(self, list(self._paths_library)) self._mediator.notify(self, list(self._paths_library))
case 2: # Режим онлайн-мониторинга папки case 2: # Режим онлайн-мониторинга папки
@ -65,14 +66,14 @@ class FileManager(BaseFileManager):
if not os.path.exists(directory_path): if not os.path.exists(directory_path):
logger.error(f"Путь {directory_path} не существует.") logger.error(f"Путь {directory_path} не существует.")
raise FileNotFoundError(f"Путь {directory_path} не существует.") #raise FileNotFoundError(f"Путь {directory_path} не существует.")
if update_time <= 0.01: if update_time <= 0.01:
logger.error(f"Путь {directory_path} не существует.") logger.error(f"Путь {directory_path} не существует.")
if self._monitor.isActive: self._monitor.pause() if self._monitor.isActive: self._monitor.pause()
self._monitor.directory_path = directory_path self._monitor._directory_path = directory_path
self._monitor.update_time = update_time self._monitor._update_time = update_time
if self._monitor.isActive: self._monitor.start() if self._monitor.isActive: self._monitor.start()
def add_new_paths(self, paths): def add_new_paths(self, paths):

View File

@ -3,7 +3,7 @@ from typing import Union
import pandas as pd import pandas as pd
from PyQt5.QtWidgets import QWidget from PyQt5.QtWidgets import QWidget
from base.base import (BaseMediator, BaseDirectoryMonitor, from base.base import (BaseMediator, BaseFileManager,
BaseDataConverter, BasePlotWidget, BaseDataConverter, BasePlotWidget,
BasePointPassportFormer, BasePointPassportFormer,
BaseController) BaseController)
@ -12,10 +12,10 @@ from base.base import (BaseMediator, BaseDirectoryMonitor,
class Mediator(BaseMediator): class Mediator(BaseMediator):
def notify(self, def notify(self,
source: Union[BaseDirectoryMonitor, BaseDataConverter, BasePointPassportFormer, BasePlotWidget, BaseController], source: Union[BaseFileManager, BaseDataConverter, BasePointPassportFormer, BasePlotWidget, BaseController],
data: Union[list[str], list[pd.DataFrame], list[list], list[QWidget], list[dict]]): data: Union[list[str], list[pd.DataFrame], list[list], list[QWidget], list[dict]]):
if issubclass(source.__class__, BaseDirectoryMonitor): if issubclass(source.__class__, BaseFileManager):
self._controller.update_status("CSV found! Calculating...") self._controller.update_status("CSV found! Calculating...")
self._converter.convert_data(data) self._converter.convert_data(data)

Binary file not shown.

Binary file not shown.

Binary file not shown.