Merge pull request #10 from SillyLittleTech/codex/fix-swift-code-issues-from-deepsource-review

kiyarose · web-flow · commit 26e730f5f700 · 2026-03-28T04:15:45.000-04:00
Fix DeepSource Swift safety warnings in ViewController
diff --git a/mos/Flean/ViewController.swift b/mos/Flean/ViewController.swift
@@ -22,12 +22,41 @@ class ViewController: NSViewController, WKNavigationDelegate, WKScriptMessageHan
 
     self.webView.configuration.userContentController.add(self, name: "controller")
 
-    self.webView.loadFileURL(
-      Bundle.main.url(forResource: "Main", withExtension: "html")!,
-      allowingReadAccessTo: Bundle.main.resourceURL!)
+    guard
+      let mainPageURL = Bundle.main.url(forResource: "Main", withExtension: "html"),
+      let resourceURL = Bundle.main.resourceURL
+    else {
+      let message = "Failed to resolve bundled web resources."
+      #if DEBUG
+        assertionFailure(message)
+      #endif
+      NSLog("%@", message)
+      let fallbackHTML = """
+        <!doctype html>
+        <html lang="en">
+          <head>
+            <meta charset="utf-8">
+            <title>Error</title>
+            <style>
+              body { font-family: -apple-system, system-ui, sans-serif; margin: 2rem; }
+              h1 { font-size: 1.6rem; margin-bottom: 0.5rem; }
+              p { color: #555; }
+            </style>
+          </head>
+          <body>
+            <h1>Unable to load content</h1>
+            <p>The app could not find its bundled web resources. Please reinstall the app or contact support.</p>
+          </body>
+        </html>
+        """
+      self.webView.loadHTMLString(fallbackHTML, baseURL: nil)
+      return
+    }
+
+    self.webView.loadFileURL(mainPageURL, allowingReadAccessTo: resourceURL)
   }
 
-  func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+  func webView(_ webView: WKWebView, didFinish navigation: WKNavigation?) {
     SFSafariExtensionManager.getStateOfSafariExtension(withIdentifier: extensionBundleIdentifier) {
       (state, error) in
       guard let state = state, error == nil else {
@@ -48,7 +77,7 @@ class ViewController: NSViewController, WKNavigationDelegate, WKScriptMessageHan
   func userContentController(
     _ userContentController: WKUserContentController, didReceive message: WKScriptMessage
   ) {
-    if message.body as! String != "open-preferences" {
+    guard let action = message.body as? String, action == "open-preferences" else {
       return
     }
 
