Major update

Player.swift

@@ -0,0 +1,15 @@
+//
+//  Player.swift
+//  SongBar
+//
+//  Created by Justin Oakes on 31/10/17.
+//  Copyright © 2017 corpe. All rights reserved.
+//
+
+import Foundation
+import ScriptingBridge
+
+struct Player {
+    let application: kServices
+    let bridgedApplication: SBApplication
+}

README.md

@@ -0,0 +1,6 @@
+# SongBar 2
+____________________
+
+This is the first major update to Songbar.
+This version removed the Sparkle framework in favor of exclusive MAS distribution,
+This should make building on your side easier as this removes the need for any 3rd party CocoaPods and allows you to build directly from the included Xcode project. 

SongBar/AppDelegate.swift

@@ -8,112 +8,30 @@
 
 import Cocoa
 import AppKit
-import ScriptingBridge
 
 @NSApplicationMain
 
 class AppDelegate: NSObject, NSApplicationDelegate {
 
-    @IBOutlet weak var window: NSWindow!
     @IBOutlet weak var menu: NSMenu!
-
-    var lastServiceUsed: Service?
-
+    let mediaController: MediaController = MediaController()
+    let listener: PlayerNotificationCenterListener = PlayerNotificationCenterListener()
     var sysBar: NSStatusItem!
-    var iTunes: AnyObject!
-    var Spotify: AnyObject!
-    //magic number
-    var variableStatusItemLength: CGFloat = -1;
-
-    func applicationDidFinishLaunching(aNotification: NSNotification) {
-
-        sysBar = NSStatusBar.systemStatusBar().statusItemWithLength(variableStatusItemLength);
-        sysBar.menu = menu;
-        iTunes = SBApplication(bundleIdentifier: "com.apple.iTunes")
-        Spotify = SBApplication(bundleIdentifier: "com.spotify.client")
-
-        updateStatusBar();
-
-        NSDistributedNotificationCenter.defaultCenter().addObserver(self,
-                                                                    selector: "updateiTuensFromNotification:",
-                                                                        name: "com.apple.iTunes.playerInfo",
-                                                                      object: nil);
-        NSDistributedNotificationCenter.defaultCenter().addObserver(self,
-                                                                    selector: "updateSpotifyFromNotification:",
-                                                                        name: "com.spotify.client.PlaybackStateChanged",
-                                                                      object: nil)
-
-    }
-
-    func applicationWillTerminate(aNotification: NSNotification) {
-        NSDistributedNotificationCenter.defaultCenter().removeObserver(self);
-    }
 
-    func updateStatusBar(){
-
-        let track: iTunesTrack = iTunes.currentTrack;
-        let spotifyTrack: SpotifyTrack = Spotify.currentTrack
-
-        let name: String = (track.name != nil) ? track.name : "";
-        let artist: String = (track.artist != nil) ? track.artist : "";
-
-        let spotifyName: String = spotifyTrack.name != nil ? spotifyTrack.name : ""
-        let spotifyArtist: String = spotifyTrack.artist != nil ? spotifyTrack.artist : ""
-
-        if(artist != "" && name != ""){
-            sysBar.title! = name + " - " + artist;
-        }else if spotifyArtist != "" && spotifyName != ""{
-            sysBar.title = "\(spotifyName) - \(spotifyArtist)"
-        }else{
-            sysBar.title! = "SongBar";
-        }
-
-
-    }
-
-    func updateiTuensFromNotification(aNotification: NSNotification){
-        let info = aNotification.userInfo! as NSDictionary;
-
-        if(info.objectForKey("Name") != nil && info.objectForKey("Artist") != nil){
-            let name: String = info.valueForKey("Name") as! String;
-            let artist: String = info.valueForKey("Artist")as! String;
-
-            sysBar.title! = name + " - " + artist;
-            lastServiceUsed = Service.iTunes
-        }else{
-            sysBar.title! = "SongBar";
-        }
-    }
+    //magic number
+    let variableStatusItemLength: CGFloat = -1
 
-    func updateSpotifyFromNotification(aNotification: NSNotification){
-                let info = aNotification.userInfo! as NSDictionary;
-        if info["Name"] != nil && info["Artist"] != nil {
-            let name: String = info["Name"] as! String
-            let artist: String = info["Artist"] as! String
-
-            sysBar.title = "\(name) - \(artist)"
-
-            lastServiceUsed = Service.spotify
-        } else{
-            sysBar.title! = "SongBar";
-        }
+    func applicationDidFinishLaunching(_ aNotification: Notification) {
+        sysBar = NSStatusBar.system.statusItem(withLength: variableStatusItemLength);
+        sysBar.updateStatusBar(itemTitle: mediaController.playingServiceTitle())
+        sysBar.menu = menu
     }
 
-    @IBAction func playPause(sender: AnyObject) {
-        if lastServiceUsed == Service.iTunes{
-            iTunes.playpause();
-        } else if lastServiceUsed == Service.spotify{
-            Spotify.playpause()
-        } else {
-            iTunes.playpause()
-        }
+    func applicationWillTerminate(_ aNotification: Notification) {
+        DistributedNotificationCenter.default().removeObserver(self);
     }
 
 
-}
+ 
 
-enum Service {
-    case iTunes
-
-    case spotify
 }

SongBar/AppDelegate.swift.orig

@@ -0,0 +1,89 @@
+//
+//  AppDelegate.swift
+//  SongBar
+//
+//  Created by Kevin Cooper on 10/21/14.
+//  Copyright (c) 2014 corpe. All rights reserved.
+//
+
+import Cocoa
+import AppKit
+
+@NSApplicationMain
+
+class AppDelegate: NSObject, NSApplicationDelegate {
+
+    @IBOutlet weak var menu: NSMenu!
+    var mediaController: MediaController = MediaController()
+    var sysBar: NSStatusItem!
+
+<<<<<<< HEAD
+    //magic number
+    let variableStatusItemLength: CGFloat = -1;
+
+    func applicationDidFinishLaunching(_ aNotification: Notification) {
+        if UserDefaults.standard.bool(forKey: kUserDefaults.isInitalized) == false {
+            UserDefaults.standard.set(true, forKey: kUserDefaults.supportiTunes)
+            UserDefaults.standard.set(true, forKey: kUserDefaults.supportSpotify)
+            // add suport for radiant here once pull request is accepted
+            UserDefaults.standard.set(true, forKey: kUserDefaults.isInitalized)
+            UserDefaults.standard.synchronize()
+=======
+    func applicationDidFinishLaunching(aNotification: NSNotification) {
+
+        sysBar = NSStatusBar.systemStatusBar().statusItemWithLength(variableStatusItemLength);
+        sysBar.menu = menu;
+        iTunes = SBApplication(bundleIdentifier: "com.apple.iTunes")
+        Spotify = SBApplication(bundleIdentifier: "com.spotify.client")
+
+        updateStatusBar();
+
+        NSDistributedNotificationCenter.defaultCenter().addObserver(self,
+                                                                    selector: "updateiTuensFromNotification:",
+                                                                        name: "com.apple.iTunes.playerInfo",
+                                                                      object: nil);
+        NSDistributedNotificationCenter.defaultCenter().addObserver(self,
+                                                                    selector: "updateSpotifyFromNotification:",
+                                                                        name: "com.spotify.client.PlaybackStateChanged",
+                                                                      object: nil)
+
+    }
+
+    func applicationWillTerminate(aNotification: NSNotification) {
+        NSDistributedNotificationCenter.defaultCenter().removeObserver(self);
+    }
+
+    func updateStatusBar(){
+
+        let track: iTunesTrack = iTunes.currentTrack;
+        let spotifyTrack: SpotifyTrack = Spotify.currentTrack
+
+        let name: String = (track.name != nil) ? track.name : "";
+        let artist: String = (track.artist != nil) ? track.artist : "";
+
+        let spotifyName: String = spotifyTrack.name != nil ? spotifyTrack.name : ""
+        let spotifyArtist: String = spotifyTrack.artist != nil ? spotifyTrack.artist : ""
+
+        if(artist != "" && name != ""){
+            sysBar.title! = name + " - " + artist;
+        }else if spotifyArtist != "" && spotifyName != ""{
+            sysBar.title = "\(spotifyName) - \(spotifyArtist)"
+        }else{
+            sysBar.title! = "SongBar";
+>>>>>>> a691bea6460ee0055c4cc9af2699d8b0a564015b
+        }
+
+        sysBar = NSStatusBar.system().statusItem(withLength: variableStatusItemLength);
+        sysBar.menu = menu
+        sysBar.updateStatusBar(itemTitle: kMiscStrings.songbar)
+
+    }
+
+    func applicationWillTerminate(_ aNotification: Notification) {
+        DistributedNotificationCenter.default().removeObserver(self);
+    }
+
+
+
+
+}

SongBar/AppDelegate_BACKUP_59663.swift

@@ -0,0 +1,89 @@
+//
+//  AppDelegate.swift
+//  SongBar
+//
+//  Created by Kevin Cooper on 10/21/14.
+//  Copyright (c) 2014 corpe. All rights reserved.
+//
+
+import Cocoa
+import AppKit
+
+@NSApplicationMain
+
+class AppDelegate: NSObject, NSApplicationDelegate {
+
+    @IBOutlet weak var menu: NSMenu!
+    var mediaController: MediaController = MediaController()
+    var sysBar: NSStatusItem!
+
+<<<<<<< HEAD
+    //magic number
+    let variableStatusItemLength: CGFloat = -1;
+
+    func applicationDidFinishLaunching(_ aNotification: Notification) {
+        if UserDefaults.standard.bool(forKey: kUserDefaults.isInitalized) == false {
+            UserDefaults.standard.set(true, forKey: kUserDefaults.supportiTunes)
+            UserDefaults.standard.set(true, forKey: kUserDefaults.supportSpotify)
+            // add suport for radiant here once pull request is accepted
+            UserDefaults.standard.set(true, forKey: kUserDefaults.isInitalized)
+            UserDefaults.standard.synchronize()
+=======
+    func applicationDidFinishLaunching(aNotification: NSNotification) {
+
+        sysBar = NSStatusBar.systemStatusBar().statusItemWithLength(variableStatusItemLength);
+        sysBar.menu = menu;
+        iTunes = SBApplication(bundleIdentifier: "com.apple.iTunes")
+        Spotify = SBApplication(bundleIdentifier: "com.spotify.client")
+
+        updateStatusBar();
+
+        NSDistributedNotificationCenter.defaultCenter().addObserver(self,
+                                                                    selector: "updateiTuensFromNotification:",
+                                                                        name: "com.apple.iTunes.playerInfo",
+                                                                      object: nil);
+        NSDistributedNotificationCenter.defaultCenter().addObserver(self,
+                                                                    selector: "updateSpotifyFromNotification:",
+                                                                        name: "com.spotify.client.PlaybackStateChanged",
+                                                                      object: nil)
+
+    }
+
+    func applicationWillTerminate(aNotification: NSNotification) {
+        NSDistributedNotificationCenter.defaultCenter().removeObserver(self);
+    }
+
+    func updateStatusBar(){
+
+        let track: iTunesTrack = iTunes.currentTrack;
+        let spotifyTrack: SpotifyTrack = Spotify.currentTrack
+
+        let name: String = (track.name != nil) ? track.name : "";
+        let artist: String = (track.artist != nil) ? track.artist : "";
+
+        let spotifyName: String = spotifyTrack.name != nil ? spotifyTrack.name : ""
+        let spotifyArtist: String = spotifyTrack.artist != nil ? spotifyTrack.artist : ""
+
+        if(artist != "" && name != ""){
+            sysBar.title! = name + " - " + artist;
+        }else if spotifyArtist != "" && spotifyName != ""{
+            sysBar.title = "\(spotifyName) - \(spotifyArtist)"
+        }else{
+            sysBar.title! = "SongBar";
+>>>>>>> a691bea6460ee0055c4cc9af2699d8b0a564015b
+        }
+
+        sysBar = NSStatusBar.system().statusItem(withLength: variableStatusItemLength);
+        sysBar.menu = menu
+        sysBar.updateStatusBar(itemTitle: kMiscStrings.songbar)
+
+    }
+
+    func applicationWillTerminate(_ aNotification: Notification) {
+        DistributedNotificationCenter.default().removeObserver(self);
+    }
+
+
+
+
+}