zeed-movs-viewer 0.0.0__py3-none-any.whl → 0.0.1__py3-none-any.whl

movsviewer/automation.py

@@ -1,6 +1,5 @@
 from contextlib import contextmanager
-from logging import info
-from os import listdir
+from logging import getLogger
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import TYPE_CHECKING
@@ -34,6 +33,8 @@ if TYPE_CHECKING:
 
     from selenium.webdriver.remote.webdriver import WebDriver
 
+logger = getLogger(__name__)
+
 
 def get_options(dtemp: str) -> Options:
     options = Options()
@@ -123,9 +124,11 @@ def get_movimenti(
         _c(wait, '#select>option[value=TESTO]')
         Select(_p(wait, '#select')).select_by_value('TESTO')
 
-        info('prima: %s', listdir(dtemp))
+        pdtemp = Path(dtemp)
+
+        logger.info('prima: %s', list(pdtemp.iterdir()))
         _c(wait, '#downloadApi').click()
         _i(wait, '.waiting')
-        info('dopo:  %s', listdir(dtemp))
+        logger.info('dopo:  %s', list(pdtemp.iterdir()))
 
-        yield Path(dtemp) / 'ListaMovimenti.txt'
+        yield pdtemp / 'ListaMovimenti.txt'

movsviewer/chartview.py

@@ -15,12 +15,17 @@ from typing import cast
 from typing import override
 
 from guilib.chartwidget.chartwidget import ChartWidget
+from guilib.chartwidget.model import Column
+from guilib.chartwidget.model import ColumnHeader
+from guilib.chartwidget.model import Info
+from guilib.chartwidget.model import InfoProto
 from guilib.chartwidget.modelgui import SeriesModel
 from guilib.chartwidget.modelgui import SeriesModelUnit
 from guilib.chartwidget.viewmodel import SortFilterViewModel
 from guilib.dates.converters import date2days
 from guilib.dates.converters import date2QDateTime
 from movslib.model import ZERO
+from movslib.reader import read
 from PySide6.QtCharts import QBarCategoryAxis
 from PySide6.QtCharts import QBarSeries
 from PySide6.QtCharts import QBarSet
@@ -30,15 +35,10 @@ from PySide6.QtCharts import QLineSeries
 from PySide6.QtCharts import QValueAxis
 from PySide6.QtCore import Qt
 
-from movsviewer.reader import read
-
 if TYPE_CHECKING:
     from collections.abc import Iterable
     from collections.abc import Sequence
 
-    from guilib.chartwidget.model import Column
-    from guilib.chartwidget.model import ColumnHeader
-    from guilib.chartwidget.model import Info
     from movslib.model import Row
     from PySide6.QtWidgets import QGraphicsSceneMouseEvent
     from PySide6.QtWidgets import QGraphicsSceneWheelEvent
@@ -226,43 +226,12 @@ class Chart(QChart):
     def mouseMoveEvent(self, event: 'QGraphicsSceneMouseEvent') -> None:
         super().mouseMoveEvent(event)
 
-        x_curr, y_curr = cast(tuple[float, float], event.pos().toTuple())
-        x_prev, y_prev = cast(tuple[float, float], event.lastPos().toTuple())
+        x_curr, y_curr = cast('tuple[float, float]', event.pos().toTuple())
+        x_prev, y_prev = cast('tuple[float, float]', event.lastPos().toTuple())
         self.scroll(x_prev - x_curr, y_curr - y_prev)
 
 
-class CH:
-    def __init__(self, name: str) -> None:
-        self.name = name
-
-    @override
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, CH):
-            return NotImplemented
-        return self.name == other.name
-
-
-class C:
-    def __init__(
-        self, header: 'ColumnHeader', howmuch: 'Decimal | None'
-    ) -> None:
-        self.header = header
-        self.howmuch = howmuch
-
-
-class I:  # noqa: E742
-    def __init__(self, when: 'date', columns: 'Sequence[Column]') -> None:
-        self.when = when
-        self.columns = columns
-
-    def howmuch(self, column_header: 'ColumnHeader') -> 'Decimal | None':
-        for column in self.columns:
-            if column.header == column_header:
-                return column.howmuch
-        return None
-
-
-MONEY_HEADER = CH('money')
+MONEY_HEADER = ColumnHeader('money')
 
 
 @dataclass
@@ -301,8 +270,7 @@ class SMFMoney(SMFHelper):
         howmuch_f: float,
     ) -> None:
         self.line_series.append(when_d, 0)
-        # TODO @me: fix hover to deal with a variable number of items in series
-        # TOD000
+        # TODO: fix hover to deal with a variable number of items in series
         self.line_series.append(when_d, howmuch_f)
 
         self.shared.y_min = min(howmuch, self.shared.y_min)
@@ -391,7 +359,7 @@ class SMFMoneyByYear(SMFHelper):
             self.shared.y_max = Decimal(self.acc)
 
 
-def series_model_factory(infos: 'Sequence[Info]') -> 'SeriesModel':
+def series_model_factory(infos: 'Sequence[InfoProto]') -> 'SeriesModel':
     """Extract money from info; accumulate and step; group by month / year."""
     shared = SMFShared(
         x_min=date.max,
@@ -449,7 +417,7 @@ class ChartWidgetWrapper(ChartWidget):
         _, data = read(self.data_path)
         # convert data to infos
         infos = [
-            I(row.date, [C(MONEY_HEADER, row.money)])
+            Info(row.date, [Column(MONEY_HEADER, row.money)])
             for row in sorted(data, key=lambda row: row.date)
         ]
         self.model.update(infos)

movsviewer/constants.py

@@ -12,5 +12,5 @@ SETTINGSUI_UI_PATH: Final = _resource('settingsui.ui')
 GECKODRIVER_PATH: Final = _resource('geckodriver.exe')
 
 SETTINGS_USERNAME: Final = 'username'
-SETTINGS_PASSWORD: Final = 'password'
+SETTINGS_PASSWORD: Final = 'password'  # noqa:S105
 SETTINGS_DATA_PATHS: Final = 'dataPaths'

movsviewer/mainui.py

@@ -4,7 +4,11 @@ from typing import TYPE_CHECKING
 from typing import Final
 from typing import cast
 
+from guilib.chartwidget.viewmodel import (
+    SortFilterViewModel as SortFilterViewModel2,
+)
 from guilib.multitabs.widget import MultiTabs
+from guilib.qwtplot.plot import Plot
 from guilib.searchsheet.widget import SearchSheet
 from PySide6.QtCore import QCoreApplication
 from PySide6.QtCore import QItemSelection
@@ -24,9 +28,9 @@ from PySide6.QtWidgets import QPlainTextEdit
 from PySide6.QtWidgets import QToolButton
 from PySide6.QtWidgets import QWidget
 
-from movsviewer.chartview import ChartWidgetWrapper
 from movsviewer.constants import MAINUI_UI_PATH
 from movsviewer.constants import SETTINGSUI_UI_PATH
+from movsviewer.plotutils import load_infos
 from movsviewer.settings import Settings
 from movsviewer.validator import Validator
 from movsviewer.viewmodel import SortFilterViewModel
@@ -75,7 +79,7 @@ def new_settingsui(settings: Settings) -> Settingsui:
         )
         _set_data_paths(settingsui.dataPaths, file_names)
 
-    settingsui = cast(Settingsui, QUiLoader().load(SETTINGSUI_UI_PATH))
+    settingsui = cast('Settingsui', QUiLoader().load(SETTINGSUI_UI_PATH))
     settingsui.usernameLineEdit.setText(settings.username)
     settingsui.passwordLineEdit.setText(settings.password)
     _set_data_paths(settingsui.dataPaths, settings.data_paths)
@@ -88,7 +92,7 @@ def new_settingsui(settings: Settings) -> Settingsui:
 
 class NewMainui:
     sheets_charts: Final[
-        dict[str, tuple[SearchSheet, ChartWidgetWrapper, int]]
+        dict[str, tuple[SearchSheet, SortFilterViewModel2, int]]
     ] = {}
 
     settings: Settings
@@ -97,7 +101,7 @@ class NewMainui:
 
     def __call__(self, settings: Settings, settingsui: Settingsui) -> QWidget:
         self.settings = settings
-        self.mainui = cast(Mainui, QUiLoader().load(MAINUI_UI_PATH))
+        self.mainui = cast('Mainui', QUiLoader().load(MAINUI_UI_PATH))
 
         self.multi_tabs = MultiTabs(self.mainui.centralwidget)
         self.mainui.gridLayout.addWidget(self.multi_tabs, 0, 0, 1, 1)
@@ -127,19 +131,21 @@ class NewMainui:
             return
 
         data_paths = self.settings.data_paths[:]
-        for data_path, (sheet, chart, idx) in self.sheets_charts.items():
+        for data_path, (sheet, model2, idx) in self.sheets_charts.items():
             if data_path in data_paths:
                 data_paths.remove(data_path)
                 sheet.reload()
-                chart.reload()
+                model2.update(load_infos((data_path, 'money')))
             else:
                 self.multi_tabs.remove_double_box(idx)
                 del self.sheets_charts[data_path]
         for data_path in data_paths:
             sheet, model = self.new_search_sheet(data_path)
-            chart = ChartWidgetWrapper(data_path)
-            idx = self.multi_tabs.add_double_box(sheet, chart, model.name)
-            self.sheets_charts[data_path] = (sheet, chart, idx)
+            model2 = SortFilterViewModel2()
+            plot = Plot(model2, None)
+            model2.update(load_infos((data_path, 'money')))
+            idx = self.multi_tabs.add_double_box(sheet, plot, model.name)
+            self.sheets_charts[data_path] = (sheet, model2, idx)
 
     def update_status_bar(
         self, model: SortFilterViewModel, selection_model: QItemSelectionModel

movsviewer/plotutils.py

@@ -0,0 +1,38 @@
+from collections import defaultdict
+from datetime import date
+from itertools import accumulate
+from operator import attrgetter
+from typing import TYPE_CHECKING
+
+from guilib.chartwidget.model import Column
+from guilib.chartwidget.model import ColumnHeader
+from guilib.chartwidget.model import ColumnProto
+from guilib.chartwidget.model import Info
+from guilib.chartwidget.model import InfoProto
+from movslib.movs import read_txt
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+    from decimal import Decimal
+
+    from movslib.model import Row
+    from movslib.model import Rows
+
+
+def _acc(rows: 'Rows') -> 'Iterable[tuple[date, Decimal]]':
+    def func(a: 'tuple[date, Decimal]', b: 'Row') -> 'tuple[date, Decimal]':
+        return (b.date, a[1] + b.money)
+
+    it = iter(sorted(rows, key=attrgetter('date')))
+    head = next(it)
+    return accumulate(it, func, initial=(head.date, head.money))
+
+
+def load_infos(*fn_names: tuple[str, str]) -> list[InfoProto]:
+    tmp = defaultdict[date, list[ColumnProto]](list)
+    for fn, name in fn_names:
+        _, rows = read_txt(fn, name)
+        ch = ColumnHeader(rows.name)
+        for d, m in _acc(rows):
+            tmp[d].append(Column(ch, m))
+    return [Info(d, tmp[d]) for d in sorted(tmp)]

movsviewer/settings.py

@@ -15,7 +15,7 @@ class Settings:
     @property
     def username(self) -> str:
         value = self.settings.value(SETTINGS_USERNAME)
-        return cast(str, value) if value is not None else ''
+        return cast('str', value) if value is not None else ''
 
     @username.setter
     def username(self, username: str) -> None:
@@ -24,7 +24,7 @@ class Settings:
     @property
     def password(self) -> str:
         value = self.settings.value(SETTINGS_PASSWORD)
-        return cast(str, value) if value is not None else ''
+        return cast('str', value) if value is not None else ''
 
     @password.setter
     def password(self, password: str) -> None:

movsviewer/validator.py

@@ -1,63 +1,13 @@
-from datetime import UTC
-from datetime import date
-from datetime import datetime
-from pathlib import Path
 from typing import TYPE_CHECKING
 
+from movsvalidator.movsvalidator import validate
 from PySide6.QtWidgets import QMessageBox
 from PySide6.QtWidgets import QWidget
 
-from movsviewer.reader import read
-
 if TYPE_CHECKING:
-    from movslib.model import KV
-    from movslib.model import Rows
-
     from movsviewer.settings import Settings
 
 
-def validate_saldo(kv: 'KV', csv: 'Rows', messages: list[str]) -> bool:
-    messages.append(f'bpol.saldo_al:                      {kv.saldo_al}')
-    if kv.saldo_al:
-        ultimo_update = (datetime.now(tz=UTC).date() - kv.saldo_al).days
-        messages.append(
-            f'ultimo update:                      {ultimo_update} giorni fa'
-        )
-    messages.append(
-        f'bpol.saldo_contabile:               {float(kv.saldo_contabile):_}'
-    )
-    messages.append(
-        f'bpol.saldo_disponibile:             {float(kv.saldo_disponibile):_}'
-    )
-
-    s = sum(item.money for item in csv)
-    messages.append(f'Σ (item.accredito - item.addebito): {float(s):_}')
-    ret = kv.saldo_contabile == s == kv.saldo_disponibile
-    if not ret:
-        delta = max(
-            [abs(kv.saldo_contabile - s), abs(s - kv.saldo_disponibile)]
-        )
-        messages.append(f'Δ:                                  {float(delta):_}')
-    return ret
-
-
-def validate_dates(csv: 'Rows', messages: list[str]) -> bool:
-    data_contabile: date | None = None
-    for row in csv:
-        if data_contabile is not None and data_contabile < row.data_contabile:
-            messages.append(f'{data_contabile} < {row.data_contabile}!')
-            return False
-    return True
-
-
-def validate(fn: str, messages: list[str]) -> bool:
-    messages.append(fn)
-    kv, csv = read(fn, Path(fn).stem)
-    return all(
-        [validate_saldo(kv, csv, messages), validate_dates(csv, messages)]
-    )
-
-
 class Validator:
     def __init__(self, parent: QWidget, settings: 'Settings') -> None:
         self.parent = parent

movsviewer/viewmodel.py

@@ -13,6 +13,7 @@ from guilib.searchsheet.model import SearchableModel
 from movslib.model import ZERO
 from movslib.model import Row
 from movslib.model import Rows
+from movslib.reader import read
 from PySide6.QtCore import QAbstractTableModel
 from PySide6.QtCore import QItemSelectionModel
 from PySide6.QtCore import QModelIndex
@@ -22,8 +23,6 @@ from PySide6.QtCore import Qt
 from PySide6.QtGui import QBrush
 from PySide6.QtGui import QColor
 
-from movsviewer.reader import read
-
 if TYPE_CHECKING:
     from PySide6.QtWidgets import QStatusBar
 
@@ -96,7 +95,7 @@ class ViewModel(QAbstractTableModel):
         if role == Qt.ItemDataRole.BackgroundRole:
             max_, min_, val = self._max, self._min, _abs(self._data[row])
             perc = (
-                (val - min_) / (max_ - min_) if max_ != min_ else Decimal(0.5)
+                (val - min_) / (max_ - min_) if max_ != min_ else Decimal('0.5')
             )
 
             hue = int(perc * 120)  # 0..359 ; red=0, green=120
@@ -106,7 +105,9 @@ class ViewModel(QAbstractTableModel):
             return QBrush(QColor.fromHsl(hue, saturation, lightness))
 
         if role == Qt.ItemDataRole.UserRole:
-            return cast(T_FIELDS, getattr(self._data[row], FIELD_NAMES[column]))
+            return cast(
+                'T_FIELDS', getattr(self._data[row], FIELD_NAMES[column])
+            )
 
         return None
 
@@ -148,7 +149,7 @@ class SortFilterViewModel(SearchableModel):
 
     @override
     def sourceModel(self) -> ViewModel:
-        return cast(ViewModel, super().sourceModel())
+        return cast('ViewModel', super().sourceModel())
 
     @override
     def sort(