Fix typos and small bugs

Author: QuinnDamerell

.vscode/settings.json

@@ -144,7 +144,7 @@
         "moonrakerapirouter",
         "moonrakerclient",
         "moonrakercommandhandler",
-        "moonrakercredentailmanager",
+        "moonrakercredentialmanager",
         "moonrakerdatabase",
         "moonrakerhost",
         "moonrakerwebcamhelper",

moonraker_octoeverywhere/moonrakerclient.py

@@ -22,7 +22,7 @@
 from linux_host.config import Config
 
 from .filemetadatacache import FileMetadataCache
-from .moonrakercredentailmanager import MoonrakerCredentialManager
+from .moonrakercredentialmanager import MoonrakerCredentialManager
 from .interfaces import IMoonrakerConnectionStatusHandler
 from .jsonrpcresponse import JsonRpcResponse
 from .interfaces import IMoonrakerClient

moonraker_octoeverywhere/moonrakercredentailmanager.py renamed to moonraker_octoeverywhere/moonrakercredentialmanager.py

@@ -235,6 +235,8 @@ def _ReadSingleJsonObject(self, sock:Any) -> Optional[str]:
 
             # Read one, add it to the buffer, and see if we are done.
             data = sock.recv(1)
+            if not data:
+                return None
             if data[0] == 3: # This is EXT aka End of text. It separates the json messages.
                 return message.decode(encoding="utf-8")
             message += data

moonraker_octoeverywhere/moonrakerhost.py

@@ -35,7 +35,7 @@
 from .moonrakerdatabase import MoonrakerDatabase
 from .webrequestresponsehandler import MoonrakerWebRequestResponseHandler
 from .moonrakerapirouter import MoonrakerApiRouter
-from .moonrakercredentailmanager import MoonrakerCredentialManager
+from .moonrakercredentialmanager import MoonrakerCredentialManager
 from .filemetadatacache import FileMetadataCache
 from .uiinjector import UiInjector
 from .interfaces import IMoonrakerConnectionStatusHandler

octoeverywhere/localip.py

@@ -22,14 +22,12 @@ def TryToGetLocalIp() -> str:
 
         # Find the local IP. Works on Windows and Linux. Always gets the correct routable IP.
         # https://stackoverflow.com/a/28950776
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         ip = ""
         try:
             # doesn't even have to be reachable
-            s.connect(('1.1.1.1', 1))
-            ip = s.getsockname()[0]
+            with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
+                s.connect(("1.1.1.1", 1))
+                ip = s.getsockname()[0]
         except Exception:
             pass
-        finally:
-            s.close()
         return str(ip)

octoeverywhere/printinfo.py

@@ -111,7 +111,7 @@ def SetEstFilamentUsageMm(self, estMm:int) -> None:
     def GetEstFilamentWeightUsageMg(self) -> int:
         return self.Data.get(PrintInfo.c_EstFilamentWeightMg, 0)
     def SetEstFilamentWeightUsageMg(self, estG:int) -> None:
-        if self.GetEstFilamentUsageMm() != estG:
+        if self.GetEstFilamentWeightUsageMg() != estG:
             self.Data[PrintInfo.c_EstFilamentWeightMg] = estG
             self.Save()
 
@@ -142,7 +142,7 @@ def Save(self) -> bool:
                 json.dump(self.Data, f)
             return True
         except Exception as e:
-            self.Logger.error(f"Failed to write print context from file. {e}")
+            self.Logger.error(f"Failed to write print context to file. {e}")
         return False