Fix/cleanup (#182)

* removed unused comments, and cleaned up various things

* update changelog

Author: Bee-Mar

CHANGELOG.md

@@ -329,3 +329,13 @@
 
 - Update `ui.py` to identify the correct location of gunicorn to resolve issues encountered when
     installing through `pipx`
+
+## Version 4.1.2
+
+- pulled in changes from dependabot
+
+
+## Version 4.1.3
+
+- updated urls from PR
+- Simple cleanup

README.md

@@ -20,7 +20,7 @@
 
   <!-- main title/logo -->
   <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=L2ML7F8DTMAT2&currency_code=USD&source=ur" target="_blank">
-    <img src="assets/MagicMirrorPackageManager.svg" alt="MagicMirror Package Manager">
+    <img src="https://raw.githubusercontent.com/Bee-Mar/mmpm/develop/assets/MagicMirrorPackageManager.svg" alt="MagicMirror Package Manager">
   </a>
 </p>
 

mmpm/README.md

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 major = 4
 minor = 1
-patch = 2
+patch = 3
 
 version = f"{major}.{minor}.{patch}"

mmpm/__version__.py

@@ -14,7 +14,6 @@
 from time import sleep
 
 import socketio
-
 from mmpm.env import MMPMEnv
 from mmpm.log.factory import MMPMLogFactory
 
@@ -80,7 +79,6 @@ def request_modules(sid):  # pylint: disable=unused-argument
     def error(sid):
         logger.debug(f"Client encountered error: {sid}")
 
-    # Event handler for receiving data from server2
     @mm_client.on("ACTIVE_MODULES", namespace="/MMM-mmpm")
     def active_modules(data):
         logger.debug(f"Received data from MagicMirror SocketIO Server: {data}")
@@ -89,7 +87,6 @@ def active_modules(data):
             logger.debug(f"Repeating data to {client_id}")
             server.emit("modules", data=data, to=client_id)
 
-    # Event handler for receiving data from server2
     @mm_client.on("MODULES_TOGGLED", namespace="/MMM-mmpm")
     def modules_toggled(data):
         logger.debug(f"Received toggled modules from MagicMirror SocketIO Server: {data}")

mmpm/api/repeater.py

@@ -8,10 +8,9 @@
 MMPM_LOG_SERVER_PORT = 6789
 MMPM_REPEATER_SERVER_PORT = 8907
 
-MMPM_REPO_URL = "https://github.com/Bee-Mar/mmpm.git"
-MMPM_FILE_URL = "https://raw.githubusercontent.com/Bee-Mar/mmpm/master/mmpm/mmpm.py"
 MMPM_WIKI_URL = "https://github.com/Bee-Mar/mmpm/wiki"
 
-MAGICMIRROR_WIKI_URL: str = "https://github.com/MagicMirrorOrg/MagicMirror/wiki"
+MAGICMIRROR_REPO_URL: str = "https://github.com/MagicMirrorOrg/MagicMirror"
+MAGICMIRROR_WIKI_URL: str = f"{MAGICMIRROR_REPO_URL}/wiki"
 MAGICMIRROR_DOCUMENTATION_URL: str = "https://docs.magicmirror.builders/"
-MAGICMIRROR_MODULES_URL: str = "https://github.com/MagicMirrorOrg/MagicMirror/wiki/3rd-party-modules"
+MAGICMIRROR_MODULES_URL: str = f"{MAGICMIRROR_REPO_URL}/wiki/3rd-party-modules"

mmpm/constants/urls.py

@@ -7,13 +7,11 @@
 monkey.patch_all()
 
 import socketio
-
 from mmpm.log.factory import MMPMLogFactory
 
 logger = MMPMLogFactory.get_logger(__name__)
 
 
-# Function to create the SocketIO server
 def create():
     server = socketio.Server(cors_allowed_origins="*", async_mode="gevent")
 

mmpm/log/server.py

@@ -5,7 +5,7 @@
 from os import chdir
 from pathlib import Path, PosixPath
 
-from mmpm.constants import color
+from mmpm.constants import color, urls
 from mmpm.env import MMPMEnv
 from mmpm.log.factory import MMPMLogFactory
 from mmpm.singleton import Singleton
@@ -42,7 +42,7 @@ def update(self):
         logger.debug("Checking to see if MagicMirror is up to date")
 
         chdir(magicmirror_root)
-        print(f"Retrieving: https://github.com/MagicMirrorOrg/MagicMirror [{color.n_cyan('MagicMirror')}]")
+        print(f"Retrieving: {urls.MAGICMIRROR_REPO_URL} [{color.n_cyan('MagicMirror')}]")
 
         try:
             can_upgrade = repo_up_to_date(magicmirror_root)
@@ -127,7 +127,7 @@ def install(self):
             os.chdir(root_path.parent)
 
             error_code, _, stderr = run_cmd(
-                ["git", "clone", "https://github.com/MagicMirrorOrg/MagicMirror"],
+                ["git", "clone", urls.MAGICMIRROR_REPO_URL],
                 progress=True,
                 message="Downloading MagicMirror",
             )

mmpm/magicmirror/magicmirror.py

@@ -1,6 +1,6 @@
 [project]
 name = "mmpm"
-version = "4.1.2"
+version = "4.1.3"
 description = "MMPM, the MagicMirror Package Manager CLI simplifies the installation, removal, and general maintenance of MagicMirror packages"
 authors = [
   { name = "Brandon Marlowe", email = "bpmarlowe-software@protonmail.com" },
@@ -34,7 +34,7 @@ keywords = [
 
 [project.urls]
 Homepage = "https://github.com/Bee-Mar/mmpm"
-Downloads = "https://github.com/Bee-Mar/mmpm/archive/4.0.0.tar.gz"
+Downloads = "https://github.com/Bee-Mar/mmpm/archive/4.1.3.tar.gz"
 
 [project.scripts]
 mmpm = "mmpm.entrypoint:main"