Add simple destination shortening for status bar #7

Author: steverab

TranzportMac.xcodeproj/project.pbxproj

@@ -21,6 +21,7 @@
 		AA95FAF51B0273EA00CED5A4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AA95FAF41B0273EA00CED5A4 /* Images.xcassets */; };
 		AA95FAF81B0273EA00CED5A4 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA95FAF61B0273EA00CED5A4 /* MainMenu.xib */; };
 		AA95FB041B0273EA00CED5A4 /* TranzportMacTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA95FB031B0273EA00CED5A4 /* TranzportMacTests.swift */; };
+		AAAC8DEA1B04E54100D4D5E9 /* StationFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAAC8DE91B04E54100D4D5E9 /* StationFormatter.swift */; };
 		AAC0FF231B029B5E00B320EA /* StartupLaunch.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC0FF221B029B5E00B320EA /* StartupLaunch.swift */; };
 /* End PBXBuildFile section */
 
@@ -53,6 +54,7 @@
 		AA95FAFD1B0273EA00CED5A4 /* TranzportMacTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TranzportMacTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		AA95FB021B0273EA00CED5A4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		AA95FB031B0273EA00CED5A4 /* TranzportMacTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranzportMacTests.swift; sourceTree = "<group>"; };
+		AAAC8DE91B04E54100D4D5E9 /* StationFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StationFormatter.swift; sourceTree = "<group>"; };
 		AAC0FF221B029B5E00B320EA /* StartupLaunch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StartupLaunch.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -94,7 +96,8 @@
 			isa = PBXGroup;
 			children = (
 				AAC0FF221B029B5E00B320EA /* StartupLaunch.swift */,
-				AA5C45F21B02839D00923BC3 /* Alamofire */,
+				AAAC8DE61B04E44600D4D5E9 /* External */,
+				AAAC8DE91B04E54100D4D5E9 /* StationFormatter.swift */,
 			);
 			name = Helpers;
 			sourceTree = "<group>";
@@ -179,6 +182,14 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		AAAC8DE61B04E44600D4D5E9 /* External */ = {
+			isa = PBXGroup;
+			children = (
+				AA5C45F21B02839D00923BC3 /* Alamofire */,
+			);
+			name = External;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -278,6 +289,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AAAC8DEA1B04E54100D4D5E9 /* StationFormatter.swift in Sources */,
 				AA5C45EB1B02839000923BC3 /* Download.swift in Sources */,
 				AA5C45F61B02841400923BC3 /* Departure.swift in Sources */,
 				AA5C45EE1B02839000923BC3 /* Request.swift in Sources */,

TranzportMac/AppDelegate.swift

@@ -99,7 +99,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         menu.removeAllItems()
 
         if departures.count != 0 {
-            statusBarItem.title = departures.first?.description
+            statusBarItem.title = departures.first?.shortenedDescription
 
             for dep in departures {
                 let depItem = NSMenuItem()

TranzportMac/Departure.swift

@@ -19,6 +19,10 @@ class Departure: NSObject, Printable, NSCoding {
         return line + " → " + destination + " in " + minutes + " min"
     }
 
+    var shortenedDescription: String {
+        return line + " → " + StationFormatter.shortenStationName(destination) + " (" + minutes + " min)"
+    }
+    
     override init() {
     }
 

TranzportMac/StationFormatter.swift

@@ -0,0 +1,43 @@
+//
+//  StationFormatter.swift
+//  TranzportMac
+//
+//  Created by Stephan Rabanser on 14/05/15.
+//  Copyright (c) 2015 Stephan Rabanser. All rights reserved.
+//
+
+import Foundation
+
+extension String {
+    public func indexOfCharacter(char: Character) -> Int? {
+        if let idx = find(self, char) {
+            return distance(self.startIndex, idx)
+        }
+        return nil
+    }
+}
+
+class StationFormatter {
+    
+    class func shortenStationName(sName: String) -> String {
+        var needle: Character = "("
+        var shortenedString = sName
+        if find(sName, needle) == nil {
+            needle = " "
+            if let idx = find(sName, needle) {
+                let pos = distance(sName.startIndex, idx)
+                shortenedString = sName.substringWithRange(Range<String.Index>(start: sName.startIndex, end: advance(sName.startIndex, pos + 2)))
+                shortenedString = shortenedString + ["."]
+            } else {
+                needle = "-"
+                if let idx = find(sName, needle) {
+                    let pos = distance(sName.startIndex, idx)
+                    shortenedString = sName.substringWithRange(Range<String.Index>(start: sName.startIndex, end: advance(sName.startIndex, pos + 2)))
+                    shortenedString = shortenedString + ["."]
+                }
+            }
+        }
+        return shortenedString
+    }
+    
+}