Read before writing smc

This reverts commit 4ced07c359.

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024  Santiago Lo Coco
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

cbattery

@@ -2,13 +2,14 @@
 
 set -e
 
-CACHE_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/cbattery.status"
+TMP_FILE=/tmp/cbattery.status
 SHARE_DIR=/usr/local/share/cbattery
 PATH="/usr/bin:/usr/local/bin:/usr/sbin:/opt/homebrew/bin:/opt/homebrew/sbin:/opt/homebrew:$PATH"
 
 usage() {
     cat << EOF
 usage: ${0##*/} [command]
+
     charging [on|off]		- Toggle charging
     adapter [on|off]		- Toggle adapter connection
     status			- Get status information
@@ -19,31 +20,38 @@ EOF
 }
 
 write_cache() {
-    echo "$1" > "$CACHE_FILE"
+    [[ -n "$NO_CACHE" ]] || echo "$1" > "$TMP_FILE"
 }
 
 read_cache() {
-    cat "$CACHE_FILE" 2> /dev/null
+    cat "$TMP_FILE" 2> /dev/null
+}
+
+log_message() {
+    timestamp=$(date "+%b %d %H:%M:%S")
+    echo "$timestamp - $1"
 }
 
 enable_discharging() {
-    echo "Enabling battery discharging"
+    log_message "Enabling battery discharging"
     sudo smc -k CH0I -w 01
 }
 
 disable_discharging() {
-    echo "Disabling battery discharging"
+    log_message "Disabling battery discharging"
     sudo smc -k CH0I -w 00
 }
 
 enable_charging() {
-    echo "Enabling battery charging"
+    [[ "$(get_smc_charging_hex)" == "00" ]] && return
+    log_message "Enabling battery charging"
     sudo smc -k CH0B -w 00
     sudo smc -k CH0C -w 00
 }
 
 disable_charging() {
-    echo "Disabling battery charging"
+    [[ "$(get_smc_charging_hex)" != "00" ]] && return
+    log_message "Disabling battery charging"
     sudo smc -k CH0B -w 02
     sudo smc -k CH0C -w 02
 }
@@ -114,13 +122,10 @@ runScript() {
             enable_charging
             disable_discharging
 	    launch_daemon=/Library/LaunchDaemons/cbattery.plist
-	    if [[ -f "$launch_daemon" ]]; then
-		sudo launchctl unload -w "$launch_daemon"
-		sudo rm "$launch_daemon"
-	    fi
+	    [[ -f "$launch_daemon" ]] && sudo launchctl unload -w "$launch_daemon"
             ;;
         "charging")
-            echo "Setting $action to $setting"
+            log_message "Setting $action to $setting"
             case "$setting" in
                 "on") enable_charging && write_cache "enabled" ;;
                 "off") disable_charging && write_cache "disabled" ;;
@@ -128,7 +133,7 @@ runScript() {
             esac
             ;;
         "adapter")
-            echo "Setting $action to $setting"
+            log_message "Setting $action to $setting"
             case "$setting" in
                 "on") enable_discharging ;;
                 "off") disable_discharging ;;
@@ -138,7 +143,7 @@ runScript() {
         "status")
             case "$setting" in
                 "charging") exit "$(get_smc_charging_hex)" ;;
-                "cache") echo "$(get_cached_status)" ;;
+                "cache") get_cached_status ;;
                 *) echo "Battery at $(get_battery_percentage)%, smc charging $(get_smc_charging_status)" ;;
             esac
             ;;

cbattery.plist

@@ -10,7 +10,7 @@
 
     <key>ProgramArguments</key>
     <array>
-	<string>/opt/homebrew/bin/cbattery</string>
+	<string>/usr/local/bin/cbattery</string>
         <string>charging</string>
         <string>off</string>
     </array>
@@ -20,5 +20,10 @@
     <key>StandardErrorPath</key>
     <string>/tmp/cbattery.stderr</string>
 
+    <key>EnvironmentVariables</key>
+    <dict>
+       <key>NO_CACHE</key>
+       <string>true</string>
+    </dict>
 </dict>
 </plist>