Merge branch 'Munki2' of /Users/nbalonso/GitHub/nbalonso's munki2 into Munki2

code/Managed Software Center/Managed Software Center/MSUAppDelegate.py

@@ -17,6 +17,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# struct for the url handler
+import struct
 import os
 
 from objc import YES, NO, IBAction, IBOutlet, nil
@@ -30,30 +32,30 @@ import munki
 import msulog
 
 class MSUAppDelegate(NSObject):
-    
+
     mainWindowController = IBOutlet()
     statusController = IBOutlet()
 
     def applicationShouldTerminate_(self, sender):
         '''Called if user selects 'Quit' from menu'''
         return self.mainWindowController.appShouldTerminate()
-    
+
     def applicationDidFinishLaunching_(self, sender):
         '''NSApplication delegate method called at launch'''
         # Prevent automatic relaunching at login on Lion+
         if NSApp.respondsToSelector_('disableRelaunchOnLogin'):
             NSApp.disableRelaunchOnLogin()
-        
+
         ver = NSBundle.mainBundle().infoDictionary().get('CFBundleShortVersionString')
         NSLog("MSC GUI version: %s" % ver)
         msulog.log("MSC", "launched", "VER=%s" % ver)
-        
+
         # setup client logging
         msulog.setup_logging()
 
         # have the statuscontroller register for its own notifications
         self.statusController.registerForNotifications()
-            
+
         # user may have launched the app manually, or it may have
         # been launched by /usr/local/munki/managedsoftwareupdate
         # to display available updates
@@ -66,12 +68,41 @@ class MSUAppDelegate(NSObject):
         # if there is no lastcheck timestamp, check for updates.
         if not lastcheck:
             self.mainWindowController.checkForUpdates()
-        
+
         # otherwise, only check for updates if the last check is over the
         # configured manualcheck cache age max.
         max_cache_age = munki.pref('CheckResultsCacheSeconds')
         if lastcheck.timeIntervalSinceNow() * -1 > int(max_cache_age):
             self.mainWindowController.checkForUpdates()
-                         
-        # show the default initial view
-        self.mainWindowController.loadInitialView()
+
+        # load the initial only if we are not already loading something else.
+        # enables launching the app to a specific panel, eg. from URL handler
+        if not self.mainWindowController.webView.isLoading():
+          self.mainWindowController.loadInitialView()
+
+    # below is the URL handler for calls outside the app eg. web clicks
+    def applicationWillFinishLaunching_(self, notification):
+        man = NSAppleEventManager.sharedAppleEventManager()
+        man.setEventHandler_andSelector_forEventClass_andEventID_(
+            self,
+            "openURL:withReplyEvent:",
+            struct.unpack(">i", "GURL")[0],
+            struct.unpack(">i", "GURL")[0])
+
+    def openURL_withReplyEvent_(self, event, replyEvent):
+        keyDirectObject = struct.unpack(">i", "----")[0]
+        url = event.paramDescriptorForKeyword_(keyDirectObject).stringValue().decode('utf8')
+        #work around for html-provided white spaces
+        url = url.replace('%20',' ')
+        NSLog("Called by external URL: %@", url)
+        msulog.log("MSU", "Called by external URL: %@", url)
+
+        #strip the url scheme part
+        url = url[8:]
+
+        #filter calls to only .html files
+        if url.endswith(u".html"):
+          self.mainWindowController.load_page(url)
+        else:
+          NSLog("%@ doesn't have a valid extension. Prevented from opening", url)
+          msulog.log("MSU", "%@ doesn't have a valid extension. Prevented from opening", url)

code/Managed Software Center/Managed Software Center/Managed Software Center-Info.plist

@@ -32,5 +32,16 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>com.googlecode.munki</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>munki</string>
+			</array>
+		</dict>
+	</array>
 </dict>
 </plist>