Refactor Utils.readJSContents (#37)

* Refactor Utils.readJSContents * Fix Regex
KS1019 · Mar 6, 2022 · be6564b · be6564b
1 parent 8b152da
commit be6564b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Sources/Commands/Sync.swift b/Sources/Commands/Sync.swift
@@ -21,10 +21,12 @@ extension Sync {
             jsContent = try Utils.readJSContents(from: .hondanaDir)
             try Utils.write(bookmarklets: jsContent, to: .plist)
         case .plist:
-            jsContent = try Utils.readJSContents(from: .plist)
+            jsContent = (try Utils.readJSContents(from: .plist))
+                .map { Bookmarklet(uuid: $0.uuid, title: $0.title, url: $0.url.unminified) }
             try Utils.write(bookmarklets: jsContent, to: .hondanaDir)
         case .safariHTML:
-            jsContent = try Utils.readJSContents(from: .safariHTML)
+            jsContent = (try Utils.readJSContents(from: .safariHTML))
+                .map { Bookmarklet(uuid: $0.uuid, title: $0.title, url: $0.url.unminified) }
             try Utils.write(bookmarklets: jsContent, to: .hondanaDir)
         }
     }

diff --git a/Sources/Commands/Utils/Utils.swift b/Sources/Commands/Utils/Utils.swift
@@ -69,7 +69,7 @@ enum Utils {
                 in: html
             )
 
-            let regex = "<DT><A HREF=\"javascript:(.+)>(.+)</A>"
+            let regex = "<DT><A HREF=\"javascript:(.+)\">(.+)</A>"
             let captureRegex = try NSRegularExpression(
                 pattern: regex,
                 options: []