not1mm 24.8.20__tar.gz → 24.9.3__tar.gz

{not1mm-24.8.20 → not1mm-24.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.8.20
+Version: 24.9.3
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -69,6 +69,7 @@ Requires-Dist: Levenshtein
       - [Fedora 38 \& 39](#fedora-38--39)
       - [Fedora 40](#fedora-40)
       - [Manjaro](#manjaro)
+      - [Mint](#mint)
     - [Python, PyPI, pip and pipx](#python-pypi-pip-and-pipx)
       - [Bootstrapping pipx](#bootstrapping-pipx)
       - [Installing with pipx](#installing-with-pipx)
@@ -99,6 +100,7 @@ Requires-Dist: Levenshtein
     - [Cluster](#cluster)
     - [N1MM Packets](#n1mm-packets)
     - [Bands](#bands)
+  - [Logging WSJT-X FT8/FT4 contacts](#logging-wsjt-x-ft8ft4-contacts)
   - [Sending CW](#sending-cw)
   - [Editing macro keys](#editing-macro-keys)
     - [Macro substitutions](#macro-substitutions)
@@ -209,6 +211,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - CQ World Wide CW
 - CQ World Wide SSB
 - CWOps CWT
+- Helvetia
 - IARU HF
 - ICWC MST
 - Japan International DX CW
@@ -223,9 +226,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [24-8-20] Added K1USN Slow Speed Test
-- [24-8-17-1] Did an oops. Fixed the oops.
-- [24-8-17] Removed some cruft. Made dockable widgets not floatable since Wayland breaks this.
+- [24-9-3] Added WSJT-X FT8 mode contacts to ARRL Field Day.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 
@@ -240,8 +241,14 @@ clue me into the black magic needed to get it to work.
 
 ### Prerequisites
 
-not1mm requires Python 3.9+, PyQt6 and libportaudio2. You should install these
-through your distribution's package manager before continuing.
+not1mm requires:
+
+- Python 3.9+
+- PyQt6
+- libportaudio2
+- libxcb-cursor0 (maybe... Depends on the distro)
+
+You should install these through your distribution's package manager before continuing.
 
 ### Common installation recipes for Ubuntu and Fedora
 
@@ -318,6 +325,20 @@ pip install not1mm
 pamac build not1mm-git 
 ```
 
+</details>
+
+<details>
+
+<summary><b>Mint 22</b></summary>
+
+#### Mint
+
+```bash
+sudo apt install python3-pip pipx libxcb-cursor0 
+pipx install not1mm
+pipx ensurepath
+```
+
 </details>
 <br>
 
@@ -429,7 +450,9 @@ qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it
 This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.
 ```
 
-To avoid this you can export an environment variable and launch the app like this:
+You can use your package manager to load libxcb-cursor0.
+
+If that's not an option, you can export an environment variable and launch the app like this:
 
 `mbridak@vm:~$ export QT_QPA_PLATFORM=wayland; not1mm`
 
@@ -580,6 +603,13 @@ appear. Those without will not.
 
 ![Bands Configuration Screen](https://github.com/mbridak/not1mm/raw/master/pic/configure_bands.png)
 
+## Logging WSJT-X FT8/FT4 contacts
+
+**Currently only working for ARRL Field Day.**
+
+not1mm listens for WSJT-X UDP traffic on the default localhost:2237. No setup is
+needed to be done on not1mm's side.
+
 ## Sending CW
 
 Other than sending CW by hand, you can also send predefined CW text messages by

{not1mm-24.8.20 → not1mm-24.9.3}/README.md

@@ -38,6 +38,7 @@
       - [Fedora 38 \& 39](#fedora-38--39)
       - [Fedora 40](#fedora-40)
       - [Manjaro](#manjaro)
+      - [Mint](#mint)
     - [Python, PyPI, pip and pipx](#python-pypi-pip-and-pipx)
       - [Bootstrapping pipx](#bootstrapping-pipx)
       - [Installing with pipx](#installing-with-pipx)
@@ -68,6 +69,7 @@
     - [Cluster](#cluster)
     - [N1MM Packets](#n1mm-packets)
     - [Bands](#bands)
+  - [Logging WSJT-X FT8/FT4 contacts](#logging-wsjt-x-ft8ft4-contacts)
   - [Sending CW](#sending-cw)
   - [Editing macro keys](#editing-macro-keys)
     - [Macro substitutions](#macro-substitutions)
@@ -178,6 +180,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - CQ World Wide CW
 - CQ World Wide SSB
 - CWOps CWT
+- Helvetia
 - IARU HF
 - ICWC MST
 - Japan International DX CW
@@ -192,9 +195,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [24-8-20] Added K1USN Slow Speed Test
-- [24-8-17-1] Did an oops. Fixed the oops.
-- [24-8-17] Removed some cruft. Made dockable widgets not floatable since Wayland breaks this.
+- [24-9-3] Added WSJT-X FT8 mode contacts to ARRL Field Day.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 
@@ -209,8 +210,14 @@ clue me into the black magic needed to get it to work.
 
 ### Prerequisites
 
-not1mm requires Python 3.9+, PyQt6 and libportaudio2. You should install these
-through your distribution's package manager before continuing.
+not1mm requires:
+
+- Python 3.9+
+- PyQt6
+- libportaudio2
+- libxcb-cursor0 (maybe... Depends on the distro)
+
+You should install these through your distribution's package manager before continuing.
 
 ### Common installation recipes for Ubuntu and Fedora
 
@@ -287,6 +294,20 @@ pip install not1mm
 pamac build not1mm-git 
 ```
 
+</details>
+
+<details>
+
+<summary><b>Mint 22</b></summary>
+
+#### Mint
+
+```bash
+sudo apt install python3-pip pipx libxcb-cursor0 
+pipx install not1mm
+pipx ensurepath
+```
+
 </details>
 <br>
 
@@ -398,7 +419,9 @@ qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it
 This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.
 ```
 
-To avoid this you can export an environment variable and launch the app like this:
+You can use your package manager to load libxcb-cursor0.
+
+If that's not an option, you can export an environment variable and launch the app like this:
 
 `mbridak@vm:~$ export QT_QPA_PLATFORM=wayland; not1mm`
 
@@ -549,6 +572,13 @@ appear. Those without will not.
 
 ![Bands Configuration Screen](https://github.com/mbridak/not1mm/raw/master/pic/configure_bands.png)
 
+## Logging WSJT-X FT8/FT4 contacts
+
+**Currently only working for ARRL Field Day.**
+
+not1mm listens for WSJT-X UDP traffic on the default localhost:2237. No setup is
+needed to be done on not1mm's side.
+
 ## Sending CW
 
 Other than sending CW by hand, you can also send predefined CW text messages by

{not1mm-24.8.20 → not1mm-24.9.3}/not1mm/__main__.py

@@ -23,6 +23,7 @@ import threading
 import uuid
 
 from json import dumps, loads
+from json.decoder import JSONDecodeError
 from pathlib import Path
 from shutil import copyfile
 
@@ -35,9 +36,9 @@ except OSError as exception:
     print("portaudio is not installed")
     sd = None
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
-from PyQt6.QtCore import QDir, Qt, QThread, QSettings
-from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor
-from PyQt6.QtWidgets import QFileDialog
+from PyQt6.QtCore import QDir, Qt, QThread, QSettings, QCoreApplication
+from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor, QPixmap
+from PyQt6.QtWidgets import QFileDialog, QSplashScreen
 
 from not1mm.lib.about import About
 from not1mm.lib.cwinterface import CW
@@ -186,8 +187,7 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         self.setCorner(Qt.Corner.TopLeftCorner, Qt.DockWidgetArea.LeftDockWidgetArea)
         self.setCorner(Qt.Corner.BottomLeftCorner, Qt.DockWidgetArea.LeftDockWidgetArea)
-        data_path = fsutils.APP_DATA_PATH / "main.ui"
-        uic.loadUi(data_path, self)
+        uic.loadUi(fsutils.APP_DATA_PATH / "main.ui", self)
         self.cw_entry.hide()
         self.leftdot.hide()
         self.rightdot.hide()
@@ -459,8 +459,15 @@ class MainWindow(QtWidgets.QMainWindow):
         self.setWindowIcon(
             QtGui.QIcon(str(fsutils.APP_DATA_PATH / "k6gte.not1mm-32.png"))
         )
-        with open(fsutils.APP_DATA_PATH / "cty.json", "rt", encoding="utf-8") as c_file:
-            self.ctyfile = loads(c_file.read())
+
+        try:
+            with open(
+                fsutils.APP_DATA_PATH / "cty.json", "rt", encoding="utf-8"
+            ) as c_file:
+                self.ctyfile = loads(c_file.read())
+        except (IOError, JSONDecodeError, TypeError):
+            logging.CRITICAL("There was an error parsing the BigCity file.")
+
         self.readpreferences()
 
         self.voice_process = Voice()
@@ -491,9 +498,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.make_op_dir()
 
         self.clearinputs()
-
-        if self.pref.get("contest"):
-            self.load_contest()
+        self.load_contest()
         self.read_cw_macros()
 
         # Featureset for wayland
@@ -1287,10 +1292,15 @@ class MainWindow(QtWidgets.QMainWindow):
             if updated:
                 cty.dump(fsutils.APP_DATA_PATH / "cty.json")
                 self.show_message_box("cty file updated.")
-                with open(
-                    fsutils.APP_DATA_PATH / "cty.json", "rt", encoding="utf-8"
-                ) as ctyfile:
-                    self.ctyfile = loads(ctyfile.read())
+                try:
+                    with open(
+                        fsutils.APP_DATA_PATH / "cty.json", "rt", encoding="utf-8"
+                    ) as ctyfile:
+                        self.ctyfile = loads(ctyfile.read())
+                except (IOError, JSONDecodeError, TypeError) as err:
+                    logging.CRITICAL(
+                        f"There was an error {err} parsing the BigCity file."
+                    )
             else:
                 self.show_message_box("An Error occured updating file.")
         else:
@@ -1898,11 +1908,14 @@ class MainWindow(QtWidgets.QMainWindow):
             " "
         )[:19]
         self.contact["Call"] = self.callsign.text()
-        self.contact["Freq"] = round(float(self.radio_state.get("vfoa", 0.0)) / 1000, 2)
-        self.contact["QSXFreq"] = round(
-            float(self.radio_state.get("vfoa", 0.0)) / 1000, 2
-        )
-        self.contact["Mode"] = self.radio_state.get("mode", "")
+        if self.contact.get("Mode") not in ("FT8", "FT4"):
+            self.contact["Freq"] = round(
+                float(self.radio_state.get("vfoa", 0.0)) / 1000, 2
+            )
+            self.contact["QSXFreq"] = round(
+                float(self.radio_state.get("vfoa", 0.0)) / 1000, 2
+            )
+            self.contact["Mode"] = self.radio_state.get("mode", "")
         self.contact["ContestName"] = self.contest.cabrillo_name
         self.contact["ContestNR"] = self.pref.get("contest", "0")
         self.contact["StationPrefix"] = self.station.get("Call", "")
@@ -2093,7 +2106,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def save_settings(self) -> None:
         """
-        Save settings to database.
+        Save Station settings to database.
 
         Parameters
         ----------
@@ -2322,7 +2335,7 @@ class MainWindow(QtWidgets.QMainWindow):
             with open(fsutils.CONFIG_FILE, "wt", encoding="utf-8") as file_descriptor:
                 file_descriptor.write(dumps(self.pref, indent=4))
                 # logger.info("writing: %s", self.pref)
-        except IOError as exception:
+        except (IOError, TypeError, ValueError) as exception:
             logger.critical("writepreferences: %s", exception)
 
     def readpreferences(self) -> None:
@@ -2344,7 +2357,12 @@ class MainWindow(QtWidgets.QMainWindow):
                 with open(
                     fsutils.CONFIG_FILE, "rt", encoding="utf-8"
                 ) as file_descriptor:
-                    self.pref = loads(file_descriptor.read())
+                    try:
+                        self.pref = loads(file_descriptor.read())
+                    except (JSONDecodeError, TypeError):
+                        logging.CRITICAL(
+                            "There was an error parsing the preference file."
+                        )
                     logger.info("%s", self.pref)
             else:
                 logger.info("No preference file. Writing preference.")
@@ -2354,7 +2372,7 @@ class MainWindow(QtWidgets.QMainWindow):
                     self.pref = self.pref_ref.copy()
                     file_descriptor.write(dumps(self.pref, indent=4))
                     logger.info("%s", self.pref)
-        except IOError as exception:
+        except (IOError, TypeError, ValueError) as exception:
             logger.critical("Error: %s", exception)
 
         self.look_up = None
@@ -3197,10 +3215,14 @@ class MainWindow(QtWidgets.QMainWindow):
         else:
             macro_file = "ssbmacros.txt"
         if not (fsutils.USER_DATA_PATH / macro_file).exists():
-            logger.debug("read_cw_macros: copying default macro file.")
-            copyfile(
-                fsutils.APP_DATA_PATH / macro_file, fsutils.USER_DATA_PATH / macro_file
-            )
+            logger.debug("copying default macro file.")
+            try:
+                copyfile(
+                    fsutils.APP_DATA_PATH / macro_file,
+                    fsutils.USER_DATA_PATH / macro_file,
+                )
+            except IOError as err:
+                logger.critical(f"Error {err} copying macro file.")
         try:
             fsutils.openFileWithOS(fsutils.USER_DATA_PATH / macro_file)
         except FileNotFoundError | PermissionError | OSError as err:
@@ -3221,22 +3243,26 @@ class MainWindow(QtWidgets.QMainWindow):
             macro_file = "ssbmacros.txt"
 
         if not (fsutils.USER_DATA_PATH / macro_file).exists():
-            logger.debug("read_cw_macros: copying default macro file.")
-            copyfile(
-                fsutils.APP_DATA_PATH / macro_file, fsutils.USER_DATA_PATH / macro_file
-            )
-        with open(
-            fsutils.USER_DATA_PATH / macro_file, "r", encoding="utf-8"
-        ) as file_descriptor:
-            for line in file_descriptor:
-                try:
+            logger.debug("copying default macro file.")
+            try:
+                copyfile(
+                    fsutils.APP_DATA_PATH / macro_file,
+                    fsutils.USER_DATA_PATH / macro_file,
+                )
+            except IOError as err:
+                logger.critical(f"Error {err} copying macro file.")
+        try:
+            with open(
+                fsutils.USER_DATA_PATH / macro_file, "r", encoding="utf-8"
+            ) as file_descriptor:
+                for line in file_descriptor:
                     mode, fkey, buttonname, cwtext = line.split("|")
                     if mode.strip().upper() == "R" and self.pref.get("run_state"):
                         self.fkeys[fkey.strip()] = (buttonname.strip(), cwtext.strip())
                     if mode.strip().upper() != "R" and not self.pref.get("run_state"):
                         self.fkeys[fkey.strip()] = (buttonname.strip(), cwtext.strip())
-                except ValueError as err:
-                    logger.info("read_cw_macros: %s", err)
+        except (IOError, ValueError) as err:
+            logger.info("read_cw_macros: %s", err)
         keys = self.fkeys.keys()
         if "F1" in keys:
             self.F1.setText(f"F1: {self.fkeys['F1'][0]}")
@@ -3398,12 +3424,24 @@ logging.basicConfig(
 logging.getLogger("PyQt6.uic.uiparser").setLevel("INFO")
 logging.getLogger("PyQt6.uic.properties").setLevel("INFO")
 app = QtWidgets.QApplication(sys.argv)
+
+pixmap = QPixmap(f"{os.fspath(fsutils.APP_DATA_PATH)}/splash.png")
+splash = QSplashScreen(pixmap)
+splash.show()
+app.processEvents()
+splash.showMessage(
+    "Starting Up",
+    alignment=Qt.AlignmentFlag.AlignBottom | Qt.AlignmentFlag.AlignCenter,
+    color=QColor(255, 255, 0),
+)
+QCoreApplication.processEvents()
+
 families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
 logger.info(f"font families {families}")
 window = MainWindow()
 window.callsign.setFocus()
 window.show()
-
+splash.finish(window)
 
 if __name__ == "__main__":
     run()

{not1mm-24.8.20 → not1mm-24.9.3}/not1mm/data/new_contest.ui

@@ -297,6 +297,11 @@
        <string>CWT</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>HELVETIA</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>ICWC MST</string>
@@ -356,7 +361,7 @@
      </property>
      <property name="time">
       <time>
-       <hour>16</hour>
+       <hour>0</hour>
        <minute>0</minute>
        <second>0</second>
       </time>

{not1mm-24.8.20 → not1mm-24.9.3}/not1mm/lib/database.py

@@ -567,7 +567,7 @@ class DataBase:
     def fetch_country_band_count(self) -> dict:
         """
         returns dict with count of unique NR.
-        {nr_count: count}
+        {cb_count: count}
         """
         try:
             with sqlite3.connect(self.database) as conn:
@@ -581,6 +581,23 @@ class DataBase:
             logger.debug("%s", exception)
             return {}
 
+    def fetch_country_count(self) -> dict:
+        """
+        Fetch count of unique countries
+        {dxcc_count: count}
+        """
+        try:
+            with sqlite3.connect(self.database) as conn:
+                conn.row_factory = self.row_factory
+                cursor = conn.cursor()
+                cursor.execute(
+                    f"select count(DISTINCT(CountryPrefix)) as dxcc_count from dxlog where ContestNR = {self.current_contest};"
+                )
+                return cursor.fetchone()
+        except sqlite3.OperationalError as exception:
+            logger.debug("%s", exception)
+            return {}
+
     def fetch_arrldx_country_band_count(self) -> dict:
         """
         returns dict with count of unique NR.
@@ -869,14 +886,14 @@ class DataBase:
             logger.debug("%s", exception)
             return {}
 
-    def fetch_mult1_count(self) -> dict:
+    def fetch_mult_count(self, mult: int) -> dict:
         """return QSO count"""
         try:
             with sqlite3.connect(self.database) as conn:
                 conn.row_factory = self.row_factory
                 cursor = conn.cursor()
                 cursor.execute(
-                    f"select count(*) as count from dxlog where IsMultiplier1 = 1 and ContestNR = {self.current_contest};"
+                    f"select count(*) as count from dxlog where IsMultiplier{mult} = 1 and ContestNR = {self.current_contest};"
                 )
                 return cursor.fetchone()
         except sqlite3.OperationalError as exception:

{not1mm-24.8.20 → not1mm-24.9.3}/not1mm/lib/ham_utility.py

@@ -373,3 +373,29 @@ def distance_with_latlon(grid1: str, lat2: float, lon2: float) -> float:
     logger.debug("lat1:%d lon1:%d lat2:%d lon2:%d", lat1, lon1, lat2, lon2)
     # lat2, lon2 = gridtolatlon(grid2)
     return round(haversine(lon1, lat1, lon2, lat2))
+
+
+def parse_udc(filename: str) -> dict:
+    """
+    simply parses a n1mm style udc file and returns a dict with key value pairs.
+    """
+
+    udc_contest = {}
+    the_good_stuff = False
+
+    try:
+        with open(filename, "r", encoding="utf-8") as file_descriptor:
+            for line in file_descriptor:
+                if "[CONTEST]" in line.upper():
+                    the_good_stuff = True
+                    continue
+                if "=" in line and the_good_stuff is True:
+                    try:
+                        key, value = line.split("=")
+                        udc_contest[key.strip()] = value.strip()
+                    except ValueError:
+                        ...
+    except FileNotFoundError:
+        logger.debug("UDC file not found.")
+        return {}
+    return udc_contest

{not1mm-24.8.20 → not1mm-24.9.3}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.8.20"
+__version__ = "24.9.3"

{not1mm-24.8.20 → not1mm-24.9.3}/not1mm/plugins/arrl_field_day.py

@@ -8,6 +8,7 @@ import logging
 from pathlib import Path
 from PyQt6 import QtWidgets
 
+from not1mm.lib.ham_utility import get_logged_band
 from not1mm.lib.plugin_common import gen_adif, get_points
 from not1mm.lib.version import __version__
 
@@ -114,7 +115,7 @@ def points(self):
     _mode = self.contact.get("Mode", "")
     if _mode in "SSB, USB, LSB, FM, AM":
         return 1
-    if _mode in "CW, RTTY":
+    if _mode in "CW, RTTY, FT8":
         return 2
     return 0
 
@@ -295,8 +296,10 @@ def cabrillo(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode == "LSB" or themode == "USB":
+                if themode in ("LSB", "USB"):
                     themode = "PH"
+                if themode in ("FT8", "FT4"):
+                    themode = "DG"
                 frequency = str(int(contact.get("Freq", "0"))).rjust(5)
 
                 loggeddate = the_date_and_time[:10]
@@ -362,7 +365,15 @@ def ft8_handler(the_packet: dict):
         ALTEREGO.contact["RCV"] = ALTEREGO.receive.text()
         ALTEREGO.contact["Exchange1"] = the_packet.get("CLASS", "ERR")
         ALTEREGO.contact["Sect"] = the_packet.get("ARRL_SECT", "ERR")
-        ALTEREGO.contact["Mode"] = "FT8"
+        ALTEREGO.contact["Mode"] = the_packet.get("MODE", "ERR")
+        ALTEREGO.contact["Freq"] = round(float(the_packet.get("FREQ", "0.0")) * 1000, 2)
+        ALTEREGO.contact["QSXFreq"] = round(
+            float(the_packet.get("FREQ", "0.0")) * 1000, 2
+        )
+        ALTEREGO.contact["Band"] = get_logged_band(
+            str(int(float(the_packet.get("FREQ", "0.0")) * 1000000))
+        )
         ALTEREGO.other_1.setText(the_packet.get("CLASS", "ERR"))
         ALTEREGO.other_2.setText(the_packet.get("ARRL_SECT", "ERR"))
         print(f"\n{ALTEREGO.contact=}\n")
+        ALTEREGO.save_contact()

{not1mm-24.8.20 → not1mm-24.9.3}/not1mm/plugins/cq_160_cw.py

@@ -177,7 +177,7 @@ def points(self):
 
 def show_mults(self):
     """Return display string for mults"""
-    result = self.database.fetch_mult1_count()
+    result = self.database.fetch_mult_count(1)
     count = result.get("count", 0)
     return count
 
@@ -198,7 +198,7 @@ def calc_score(self):
         if score is None:
             score = "0"
         contest_points = int(score)
-        result = self.database.fetch_mult1_count()
+        result = self.database.fetch_mult_count(1)
         mults = int(result.get("count", 0))
         return contest_points * mults
     return 0

{not1mm-24.8.20 → not1mm-24.9.3}/not1mm/plugins/cq_160_ssb.py

@@ -177,7 +177,7 @@ def points(self):
 
 def show_mults(self):
     """Return display string for mults"""
-    result = self.database.fetch_mult1_count()
+    result = self.database.fetch_mult_count(1)
     count = result.get("count", 0)
     return count
 
@@ -198,7 +198,7 @@ def calc_score(self):
         if score is None:
             score = "0"
         contest_points = int(score)
-        result = self.database.fetch_mult1_count()
+        result = self.database.fetch_mult_count(1)
         mults = int(result.get("count", 0))
         return contest_points * mults
     return 0