version 1.2 and fix capacity on M1

HenryQuan · Mar 10, 2022 · 5086d32 · 5086d32
1 parent 661b11a
commit 5086d32
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/Battery/Core/Battery.swift b/Battery/Core/Battery.swift
@@ -16,6 +16,7 @@ class Battery {
     /// Returns a string like 2:12 remaning
     func getTimeRemaining() -> String {
         var remain = Constant.Estimate
+        var batteryPercentage = ""
         // pmset -g batt
         let output = Utils.runCommand(cmd: "/usr/bin/pmset", args: "-g", "batt").output
 
@@ -25,6 +26,11 @@ class Battery {
             if matches.count > 0 {
                 remain = matches[0]
             }
+
+            let percentMatches = Utils.matches(for: "[0-9]+%", in: output[1])
+            if percentMatches.count > 0 {
+                batteryPercentage = percentMatches[0]
+            }
         }
 
         // Add different emoji to distinguish different mode
@@ -34,6 +40,9 @@ class Battery {
             remain += "⚡️"
         }
 
+        // Add the percentage
+        remain += batteryPercentage
+
         return remain
     }
 
@@ -57,6 +66,12 @@ class Battery {
             let curr = IORegString(output: m)
             switch curr.description {
             case "MaxCapacity":
+                let capacity = curr.convertValue() as! Int
+                if (capacity > 1000) {
+                    #warning("This is 100 on M1")
+                    max = capacity
+                }
+            case "AppleRawMaxCapacity":
                 max = curr.convertValue() as! Int
             case "CycleCount":
                 cycle = curr.convertValue() as! Int

diff --git a/BatteryBar.xcodeproj/project.pbxproj b/BatteryBar.xcodeproj/project.pbxproj
@@ -295,15 +295,15 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = 4YSG3SYMLE;
 				INFOPLIST_FILE = Battery/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yihengquan.batterybar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -318,15 +318,15 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = 4YSG3SYMLE;
 				INFOPLIST_FILE = Battery/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yihengquan.batterybar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;