Update paxo dependency for xdg support and quick fix for new Mac OS s…

…ystems

Pipfile

@@ -0,0 +1,18 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+
+[packages]
+
+paxo = ">=0.2.1"
+python-dateutil = "*"
+python-crontab = "*"
+tablib = "*"
+requests = "*"
+
+
+[dev-packages]
+

README.md

@@ -93,5 +93,5 @@ Also, follow or tweet [@cwoebker](https://twitter.com/cwoebker).
 
 ---
 
-Copyright (c) 2012-2018, Cecil Woebker.
+Copyright (c) 2012-2018, Cecil Wöbker.
 License: BSD (see LICENSE for details)

como/battery.py

@@ -77,12 +77,13 @@ def get_battery():
         battery['serial'] = subprocess.check_output(
             'ioreg -w0 -l | grep BatterySerialNumber',
             shell=True).translate(None, '\n "|').lstrip('BatterySerialNumber=')
-        battery['temp'] = int(subprocess.check_output(
-            'ioreg -w0 -l | grep Temperature',
-            shell=True).translate(None, '\n "|').lstrip('Temperature='))
-        battery['maxcap'] = int(bat[0].lstrip('MaxCapacity='))
-        battery['curcap'] = int(bat[1].lstrip('CurrentCapacity='))
-        legacy = bat[2].lstrip('LegacyBatteryInfo=')
+        # battery['temp'] = int(subprocess.check_output(
+        #     'ioreg -w0 -l | grep Temperature',
+        #     shell=True).translate(None, '\n "|').lstrip('Temperature='))
+        battery['maxcap'] = int(bat[1].lstrip('MaxCapacity='))
+        battery['curcap'] = int(bat[2].lstrip('CurrentCapacity='))
+        legacy = bat[3].lstrip('LegacyBatteryInfo=')
+        battery['designcap'] = int(bat[4].lstrip('DesignCapacity='))
         battery['cycles'] = int(
             legacy.translate(
                 None, '{}=').split(',')[5].lstrip('CycleCount'))
@@ -94,7 +95,6 @@ def get_battery():
         battery['voltage'] = int(
             legacy.translate(
                 None, '{}=').split(',')[4].lstrip('Voltage'))
-        battery['designcap'] = int(bat[3].lstrip('DesignCapacity='))
     elif is_lin:
         battery['serial'] = subprocess.check_output(
             "grep \"^serial number\" " +

como/core.py

@@ -258,7 +258,7 @@ def cmd_info(args):
             puts("Mac model: %s" % subprocess.check_output(
                 "sysctl -n hw.model", shell=True).rstrip("\n"))
             puts("Age of Computer: %s months" % get_age())
-            puts("Temperature: %s ℃" % (int(bat['temp']) / 100.))
+            # puts("Temperature: %s ℃" % (int(bat['temp']) / 100.))
         if is_osx or is_win:
             puts("Voltage: %s" % bat['voltage'])
             puts("Amperage: %s" % bat['amperage'])

como/settings.py

@@ -5,7 +5,7 @@
 
 import os
 
-from paxo.util import DEBUG_MODE
+from paxo.util import DEBUG_MODE, XDG_DATA_HOME
 
 LOCATION_CODES = [
     '1C', '2Z', '4H', '5K', '8H', '5D', '7J', 'CK', 'E', 'EE',
@@ -15,7 +15,8 @@
 
 DEV_URL = 'http://127.0.0.1:5000'
 REAL_URL = 'https://como.cwoebker.com'
-COMO_BATTERY_FILE = os.path.expanduser('~/.como')
+
+COMO_BATTERY_FILE = os.path.join(XDG_DATA_HOME, 'como/como')
 
 if DEBUG_MODE:
     SERVER_URL = DEV_URL