perf(database): remove records older than 12 hours

Author: Ladbaby

app/common/RouterInfo.py

@@ -481,6 +481,7 @@ def get_month_statistics_dic(self):
         return self.month_statistics_dic
 
     def get_battery_history_dic(self):
+        self.db.remove_battery_history()
         battery_history_list = self.db.read_battery_history()
         battery_history_dic = {
             "time": [x[0] for x in battery_history_list],

app/common/config.py

@@ -34,10 +34,10 @@ class Config(QConfig):
     """ Config of application """
 
     # folders
-    musicFolders = ConfigItem(
-        "Folders", "LocalMusic", [], FolderListValidator())
-    downloadFolder = ConfigItem(
-        "Folders", "Download", "app/download", FolderValidator())
+    # musicFolders = ConfigItem(
+    #     "Folders", "LocalMusic", [], FolderListValidator())
+    # downloadFolder = ConfigItem(
+    #     "Folders", "Download", "app/download", FolderValidator())
 
     # main window
     dpiScale = OptionsConfigItem(

app/common/database.py

@@ -1,4 +1,5 @@
 import os
+import time
 import sqlite3
 from typing import Dict
 
@@ -49,19 +50,14 @@ def write_battery_history(self, battery_history_record: Dict[int, int]):
 
     def remove_battery_history(self):
         try:
-            # return a list of tuple, each representing a record
-            records = self.read_battery_history()
-
-            # Check if the number of records is greater than 1440
-            if len(records) > 1440:
-                # Get the timestamps of the latest 1440 records
-                latest_timestamps = [record[0] for record in records]
+            # Calculate the timestamp 12 hours ago
+            twelve_hours_ago = int(time.time()) - (12 * 60 * 60)
 
-                # Delete records with timestamps not in the latest 1440
-                self.db_cache_cursor.execute('''
-                    DELETE FROM battery WHERE timestamp NOT IN ({})
-                '''.format(','.join('?' for _ in latest_timestamps)), latest_timestamps)
-                self.db_cache_conn.commit()
+            # Delete records with timestamps older than twelve_hours_ago
+            self.db_cache_cursor.execute('''
+                DELETE FROM battery WHERE timestamp < ?
+            ''', (twelve_hours_ago,))
+            self.db_cache_conn.commit()
 
             return True
         except Exception as e:

app/components/battery_history_card.py

@@ -1,5 +1,6 @@
 # coding:utf-8
 from datetime import datetime
+from time import perf_counter
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QWidget, QFrame, QLabel, QVBoxLayout, QHBoxLayout
@@ -78,28 +79,29 @@ def updateBatteryHistory(self, battery_history_dic):
         self.graphWidget.axes.set_facecolor(background_color)
         self.graphWidget.figure.patch.set_facecolor(background_color)
 
-        x_ticks = [int(x / 60) for x in battery_history_dic["time"]]
+        x_list = [int(x / 60) for x in battery_history_dic["time"]]
         y_labels_list = [10 * x for x in range(11)]
-        # vertical lines with color indicating charging status
-        for x, y, charging in zip(x_ticks, battery_history_dic["battery"], battery_history_dic["charging"]):
+        battery_history_time_list = []
+        x_ticks = []
+        for x, y, charging, time in zip(x_list, battery_history_dic["battery"], battery_history_dic["charging"], battery_history_dic["time"]):
+            # vertical lines with color indicating charging status
             if charging:
                 # green
                 color = (0 / 255, 255 / 255, 54 / 255)
             else:
                 # blue
                 color = (53 / 255, 193 / 255, 241 / 255)
             self.graphWidget.axes.axvline(x=x, color=color, linestyle='-', linewidth=1, ymax=y / 100)
-        self.graphWidget.axes.plot(x_ticks, battery_history_dic["battery"], color=front_color)
 
-        battery_history_time_list = []
-        x_ticks = []
-        for x in battery_history_dic["time"]:
-            timestamp_xx00, timestamp_xx30 = self.calculate_x_ticks(x)
+            # calculate x ticks
+            timestamp_xx00, timestamp_xx30 = self.calculate_x_ticks(time)
             if timestamp_xx00 not in battery_history_dic["time"]:
                 battery_history_time_list.append(self.convert_time(timestamp_xx00))
                 battery_history_time_list.append(self.convert_time(timestamp_xx30))
                 x_ticks.append(int(timestamp_xx00 / 60))
                 x_ticks.append(int(timestamp_xx30 / 60))
+        self.graphWidget.axes.plot(x_list, battery_history_dic["battery"], color=front_color)
+        
         self.graphWidget.axes.set_xticks(x_ticks)
         self.graphWidget.axes.set_xticklabels(battery_history_time_list, rotation=45, ha='right', color=front_color)
 
@@ -116,7 +118,7 @@ def updateBatteryHistory(self, battery_history_dic):
                 spine.set_visible(False)
             else:
                 spine.set_edgecolor(front_color)
-
+        
         self.graphWidget.draw()
 
 class MplCanvas(FigureCanvasQTAgg):

app/view/setting_interface.py

@@ -19,9 +19,9 @@ class SettingInterface(ScrollArea):
     """ Setting interface """
 
     checkUpdateSig = pyqtSignal()
-    musicFoldersChanged = pyqtSignal(list)
+    # musicFoldersChanged = pyqtSignal(list)
     acrylicEnableChanged = pyqtSignal(bool)
-    downloadFolderChanged = pyqtSignal(str)
+    # downloadFolderChanged = pyqtSignal(str)
     minimizeToTrayChanged = pyqtSignal(bool)
 
     def __init__(self, parent=None):
@@ -77,22 +77,22 @@ def __init__(self, parent=None):
         )
 
         # music folders
-        self.musicInThisPCGroup = SettingCardGroup(
-            self.tr("Music on this PC"), self.scrollWidget)
-        self.musicFolderCard = FolderListSettingCard(
-            cfg.musicFolders,
-            self.tr("Local music library"),
-            directory=QStandardPaths.writableLocation(
-                QStandardPaths.MusicLocation),
-            parent=self.musicInThisPCGroup
-        )
-        self.downloadFolderCard = PushSettingCard(
-            self.tr('Choose folder'),
-            FIF.DOWNLOAD,
-            self.tr("Download directory"),
-            cfg.get(cfg.downloadFolder),
-            self.musicInThisPCGroup
-        )
+        # self.musicInThisPCGroup = SettingCardGroup(
+        #     self.tr("Music on this PC"), self.scrollWidget)
+        # self.musicFolderCard = FolderListSettingCard(
+        #     cfg.musicFolders,
+        #     self.tr("Local music library"),
+        #     directory=QStandardPaths.writableLocation(
+        #         QStandardPaths.MusicLocation),
+        #     parent=self.musicInThisPCGroup
+        # )
+        # self.downloadFolderCard = PushSettingCard(
+        #     self.tr('Choose folder'),
+        #     FIF.DOWNLOAD,
+        #     self.tr("Download directory"),
+        #     cfg.get(cfg.downloadFolder),
+        #     self.musicInThisPCGroup
+        # )
 
         # personalization
         self.personalGroup = SettingCardGroup(
@@ -224,8 +224,8 @@ def __initLayout(self):
         self.deviceGroup.addSettingCard(self.deviceNameCard)
 
         # add cards to group
-        self.musicInThisPCGroup.addSettingCard(self.musicFolderCard)
-        self.musicInThisPCGroup.addSettingCard(self.downloadFolderCard)
+        # self.musicInThisPCGroup.addSettingCard(self.musicFolderCard)
+        # self.musicInThisPCGroup.addSettingCard(self.downloadFolderCard)
 
         self.personalGroup.addSettingCard(self.themeCard)
         self.personalGroup.addSettingCard(self.themeColorCard)
@@ -247,7 +247,7 @@ def __initLayout(self):
         self.expandLayout.setContentsMargins(36, 10, 36, 0)
         self.expandLayout.addWidget(self.batteryGroup)
         self.expandLayout.addWidget(self.deviceGroup)
-        self.expandLayout.addWidget(self.musicInThisPCGroup)
+        # self.expandLayout.addWidget(self.musicInThisPCGroup)
         self.expandLayout.addWidget(self.personalGroup)
         self.expandLayout.addWidget(self.materialGroup)
         self.expandLayout.addWidget(self.updateSoftwareGroup)
@@ -263,26 +263,26 @@ def __showRestartTooltip(self):
             parent=self
         )
 
-    def __onDownloadFolderCardClicked(self):
-        """ download folder card clicked slot """
-        folder = QFileDialog.getExistingDirectory(
-            self, self.tr("Choose folder"), "./")
-        if not folder or cfg.get(cfg.downloadFolder) == folder:
-            return
+    # def __onDownloadFolderCardClicked(self):
+    #     """ download folder card clicked slot """
+    #     folder = QFileDialog.getExistingDirectory(
+    #         self, self.tr("Choose folder"), "./")
+    #     if not folder or cfg.get(cfg.downloadFolder) == folder:
+    #         return
 
-        cfg.set(cfg.downloadFolder, folder)
-        self.downloadFolderCard.setContent(folder)
+    #     cfg.set(cfg.downloadFolder, folder)
+    #     self.downloadFolderCard.setContent(folder)
 
     def __connectSignalToSlot(self):
         """ connect signal to slot """
         cfg.appRestartSig.connect(self.__showRestartTooltip)
         cfg.themeChanged.connect(setTheme)
 
         # music in the pc
-        self.musicFolderCard.folderChanged.connect(
-            self.musicFoldersChanged)
-        self.downloadFolderCard.clicked.connect(
-            self.__onDownloadFolderCardClicked)
+        # self.musicFolderCard.folderChanged.connect(
+        #     self.musicFoldersChanged)
+        # self.downloadFolderCard.clicked.connect(
+        #     self.__onDownloadFolderCardClicked)
 
         # personalization
         self.themeColorCard.colorChanged.connect(setThemeColor)

main.py

@@ -1,6 +1,7 @@
 import os
 import sys
 import asyncio
+from time import perf_counter
 
 from PyQt5.QtCore import Qt, QTranslator, QTimer, QTime
 from PyQt5.QtGui import QFont, QIcon
@@ -51,9 +52,12 @@
 
     def show_window(button):
         if button == QSystemTrayIcon.Trigger:
+            # t1_start = perf_counter() 
             w.show()
             w.update_monitoring_status()
             # w.update_month_statistics()
+            # t1_stop = perf_counter() 
+            # logger.info(f"Elapsed time during the whole program in seconds: {t1_stop-t1_start}")
         else:
             pass