Add shareShortcut function

a2 · Dec 23, 2018 · 7a664a4 · 7a664a4
1 parent 3f19ff1
commit 7a664a4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 24 deletions.
diff --git a/...ok/Contents/Chapters/Chapter1.playgroundchapter/Pages/Page1.playgroundpage/Contents.swift b/...ok/Contents/Chapters/Chapter1.playgroundchapter/Pages/Page1.playgroundpage/Contents.swift
@@ -1,6 +1,5 @@
 var batteryLevel = Variable.actionOutput()
-let shortcutName = "Warn for Low Battery Level"
-let shortcutData = try exportShortcut(
+let shortcut = buildShortcut(
     comment("This Shortcut was generated in Swift.") +
     getBatteryLevel(&batteryLevel) +
     ifLessThan(20, ifTrue: (
@@ -10,12 +9,5 @@ let shortcutData = try exportShortcut(
         showResult("Your battery is at \(batteryLevel)%, you're probably fine for now.")
     ))
 )
-//#-hidden-code
-import PlaygroundSupport
-if let remoteView = PlaygroundPage.current.liveView as? PlaygroundRemoteLiveViewProxy {
-    remoteView.send(.dictionary([
-        "name": .string(shortcutName),
-        "data": .data(shortcutData),
-    ]))
-}
-//#-end-hidden-code
+
+shareShortcut(shortcut, named: "Warn for Low Battery Level")
diff --git a/...ok/Contents/Chapters/Chapter1.playgroundchapter/Pages/Page2.playgroundpage/Contents.swift b/...ok/Contents/Chapters/Chapter1.playgroundchapter/Pages/Page2.playgroundpage/Contents.swift
@@ -1,5 +1,4 @@
-let shortcutName = "Clap Along"
-let shortcutData = try exportShortcut(
+let shortcut = buildShortcut(
     comment("This Shortcut was generated in Swift.") +
     ask(question: "WHAT 👏 DO 👏 YOU 👏 WANT 👏 TO 👏 SAY") +
     changeCase(to: .uppercase) +
@@ -9,12 +8,5 @@ let shortcutData = try exportShortcut(
         ("Copy to Clipboard", copyToClipboard()),
     ])
 )
-//#-hidden-code
-import PlaygroundSupport
-if let remoteView = PlaygroundPage.current.liveView as? PlaygroundRemoteLiveViewProxy {
-    remoteView.send(.dictionary([
-        "name": .string(shortcutName),
-        "data": .data(shortcutData),
-    ]))
-}
-//#-end-hidden-code
+
+shareShortcut(shortcut, named: "Clap Along")
diff --git a/ShortcutsSwift.playgroundbook/Contents/Sources/BuildShortcut.swift b/ShortcutsSwift.playgroundbook/Contents/Sources/BuildShortcut.swift
@@ -35,6 +35,19 @@ public func buildShortcut(_ actionContainer: ActionContainer) -> PropertyList {
     ] as PropertyList
 }
 
-public func exportShortcut(_ actionContainer: ActionContainer) throws -> Data {
-    return try PropertyListSerialization.data(fromPropertyList: buildShortcut(actionContainer), format: .binary, options: 0)
+public func exportShortcut(_ actionContainer: ActionContainer) -> Data {
+    return try! PropertyListSerialization.data(fromPropertyList: buildShortcut(actionContainer), format: .binary, options: 0)
 }
+
+#if canImport(PlaygroundSupport)
+
+import PlaygroundSupport
+
+public func shareShortcut(_ shortcut: PropertyList, named name: String) {
+    let data = try! PropertyListSerialization.data(fromPropertyList: shortcut, format: .binary, options: 0)
+    if let remoteView = PlaygroundPage.current.liveView as? PlaygroundRemoteLiveViewProxy {
+        remoteView.send(.dictionary(["name": .string(name), "data": .data(data)]))
+    }
+}
+
+#endif