Also display time until fully charged

also updated copyright notice in info plist
codler · Aug 4, 2012 · 06a6121 · 06a6121
1 parent ac6e1e7
commit 06a6121
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/Battery Time Remaining.xcodeproj/project.pbxproj b/Battery Time Remaining.xcodeproj/project.pbxproj
@@ -52,7 +52,6 @@
 		2841C7D115C91CC100F4F15F = {
 			isa = PBXGroup;
 			children = (
-				2841C7FD15C91CEF00F4F15F /* IOKit.framework */,
 				2841C7E615C91CC100F4F15F /* Battery Time Remaining */,
 				2841C7DF15C91CC100F4F15F /* Frameworks */,
 				2841C7DD15C91CC100F4F15F /* Products */,
@@ -70,6 +69,7 @@
 		2841C7DF15C91CC100F4F15F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				2841C7FD15C91CEF00F4F15F /* IOKit.framework */,
 				2841C7E015C91CC100F4F15F /* Cocoa.framework */,
 				2841C7E215C91CC100F4F15F /* Other Frameworks */,
 			);

diff --git a/Battery Time Remaining/AppDelegate.m b/Battery Time Remaining/AppDelegate.m
@@ -9,6 +9,7 @@
 #import "AppDelegate.h"
 #import "StartAtLoginHelper.h"
 #import <IOKit/ps/IOPowerSources.h>
+#import <IOKit/ps/IOPSKeys.h>
 
 // IOPS notification callback on power source change
 static void PowerSourceChanged(void * context)
@@ -54,7 +55,51 @@ - (NSString *)getTimeRemainingText
     // We're connected to an unlimited power source (AC adapter probably)
     if (kIOPSTimeRemainingUnlimited == timeRemaining)
     {
-        return @"∞";
+        // Get list of power sources
+        CFTypeRef psBlob = IOPSCopyPowerSourcesInfo();
+        CFArrayRef psList = IOPSCopyPowerSourcesList(psBlob);
+
+        // Loop through the list of power sources
+        CFIndex count = CFArrayGetCount(psList);
+        for (CFIndex i = 0; i < count; i++)
+        {
+            CFTypeRef powersource = CFArrayGetValueAtIndex(psList, i);
+            CFDictionaryRef description = IOPSGetPowerSourceDescription(psBlob, powersource);
+
+            // Skip if not present or not a battery
+            if (CFDictionaryGetValue(description, CFSTR(kIOPSIsPresentKey)) == kCFBooleanFalse || !CFStringCompare(CFDictionaryGetValue(description, CFSTR(kIOPSPowerSourceStateKey)), CFSTR(kIOPSBatteryPowerValue), 0))
+            {
+                continue;
+            }
+
+            // Check if the battery is charging atm
+            if (CFDictionaryGetValue(description, CFSTR(kIOPSIsChargingKey)) == kCFBooleanTrue)
+            {
+                CFNumberRef timeToChargeNum = CFDictionaryGetValue(description, CFSTR(kIOPSTimeToFullChargeKey));
+                int timeTilCharged = [(__bridge NSNumber *)timeToChargeNum intValue];
+
+                if (timeTilCharged > 0)
+                {
+                    // Calculate the hour/minutes
+                    NSInteger hour = (int)timeTilCharged / 3600;
+                    NSInteger minute = (int)timeTilCharged % 3600;
+
+                    // Return the time remaining string
+                    return [NSString stringWithFormat:@"🔌 %ld:%02ld", hour, minute];
+                }
+                else
+                {
+                    return @"🔌 Calculating…";
+                }
+            }
+            else
+            {
+                // Not charging and on a endless powersource
+                return @"🔌";
+            }
+
+            return @"Error…";
+        }
     }
     // Still calculating the estimated time remaining...
     else if (kIOPSTimeRemainingUnknown == timeRemaining)

diff --git a/Battery Time Remaining/Battery Time Remaining-Info.plist b/Battery Time Remaining/Battery Time Remaining-Info.plist
@@ -27,7 +27,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2012 Han Lin Yap. All rights reserved.</string>
+	<string>Copyright © 2012 Han Lin Yap and Wrep. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>