Merge pull request #5 from biskette/configload-1

Adds config load + save for lat/lon from geoip, closes #1

Author: JakeHuneau

gutsy-gamblers/Pipfile

@@ -8,6 +8,7 @@ verify_ssl = true
 [packages]
 kivy = "*"
 flake8 = "*"
+geopy="*"
 suntime = "*"
 kivy-deps-sdl2 = {markers = "platform_system == 'Windows'",version = "*"}
 kivy-deps-glew = {markers = "platform_system == 'Windows'",version = "*"}

gutsy-gamblers/Pipfile.lock

@@ -0,0 +1,52 @@
+import requests
+
+LOCATION_FRIENDLY = 'location_friendly'
+LOCATION_LATLON = 'location_latlon'
+LOCATION_VALID = 'location_valid'
+
+
+FAKE_DATA = False
+
+
+def commaval_or_empty(src: dict, key: str) -> str:
+    """
+    Returns f", {value}" or '' if there's no value in the dict
+    :param src: dict to fetch from
+    :param key: key to get value from
+    :return: str
+    """
+    if key in src:
+        return f", {src[key]}"
+    return ''
+
+
+def guess_location_by_ip() -> dict:
+    """
+    Guess location by IP
+
+    Needs more work in case of failure conditions
+    :return:
+    """
+    if FAKE_DATA:
+        return {
+            'location_latlon': '40.730610,-73.935242',
+            'location_friendly': 'New York City, NY, United States'}
+
+    try:
+        resp = requests.get('http://ip-api.com/json/').json()
+    except ConnectionError:
+        return None
+
+    location = {}
+
+    location[LOCATION_LATLON] = f"{resp['lat']},{resp['lon']}"
+
+    friendly_name = resp.get('city')
+    friendly_name += commaval_or_empty(resp, 'region')
+    friendly_name += commaval_or_empty(resp, 'country')
+    # including ZIP might be too long
+    # friendly_name += commaval_or_empty(resp, 'zip')
+
+    location[LOCATION_FRIENDLY] = friendly_name
+
+    return location

gutsy-gamblers/datahelpers.py

@@ -1,13 +1,21 @@
-import pickle
 from datetime import timedelta, datetime
 
+from geopy import Point
 from kivy.animation import Animation
+from kivy.clock import Clock
 from kivy.core.window import Window
-from kivy.properties import NumericProperty, Clock
+from kivy.properties import (
+    NumericProperty,
+    ObjectProperty,
+    ConfigParserProperty,
+    ReferenceListProperty
+)
 from kivy.uix.effectwidget import EffectWidget, EffectBase
 from kivy.uix.floatlayout import FloatLayout
 from suntime import SunTimeException, Sun
 
+import datahelpers
+
 hv_blur = """
 vec4 effect(vec4 color, sampler2D texture, vec2 tex_coords, vec2 coords)
 {{
@@ -63,6 +71,20 @@ class DialWidget(FloatLayout):
     """
     angle = NumericProperty(0)
 
+    config_latlon = latlon = ConfigParserProperty(
+        '', 'global', datahelpers.LOCATION_LATLON, 'app', val_type=str)
+
+    latlon_point = ObjectProperty()
+
+    sunrise = NumericProperty()
+    sunset = NumericProperty()
+    sun_angles = ReferenceListProperty(sunrise, sunset)
+
+    def on_config_latlon(self, instance, value):
+        """Handler for property change event"""
+        self.latlon_point = Point(value)
+        self.redraw()
+
     def __init__(self, **kwargs):
         super(DialWidget, self).__init__(**kwargs)
 
@@ -78,10 +100,8 @@ def __init__(self, **kwargs):
                                         day=self.midnight.day,
                                         hour=0, minute=0, second=0) - self.date).seconds
 
-        # Split suntime tuple into named variables
+        # Set sunrise and sunset through reference list
         self.sun_angles = self.sun_time()
-        self.sunrise = self.sun_angles[0]
-        self.sunset = self.sun_angles[1]
 
         # Shading widget
         self.dial_shading = DialEffectWidget((self.sunrise, self.sunset))
@@ -106,9 +126,7 @@ def animate_dial(self):
 
     def redraw(self, a=None):
         # Split suntime tuple into named variables
-        sun_angles = self.sun_time()
-        self.sunrise = sun_angles[0]
-        self.sunset = sun_angles[1]
+        self.sun_angles = self.sun_time()
 
         # Remove widgets
         self.remove_widget(self.dial_shading)
@@ -132,10 +150,9 @@ def redraw(self, a=None):
         self.clock = Clock.schedule_interval(self.redraw, self.midnight_delta)
 
     def sun_time(self):
-        with open('latlong.tmp', 'rb') as f:
-            lat_long = pickle.load(f)
 
-        sun_time = Sun(lat_long[0], lat_long[1])
+        sun_time = Sun(self.latlon_point.latitude, self.latlon_point.longitude)
+
         self.date = self.date + timedelta(days=self.date_increase)
 
         try:

gutsy-gamblers/dials.py

@@ -14,6 +14,7 @@
         font_size: 12
         pos_hint: {'center_x': 0.5, 'center_y': 0.95}
         size_hint: 0.2, 0.05
+        on_press: root.settings_button()
 
 
 <TimeWizard>:
@@ -79,4 +80,43 @@
 
 		Button:
 		    text: "Revert date"
-		    on_press: root.revert_date()
+		    on_press: root.revert_date()
+
+<SettingsScreen>:
+    id: body
+    # kivy automatically fills the corresponding properties on the
+    # class in main.py with the objects of the id for propertyname : id
+    location_field : loc
+    feedback : feedback
+    guess_location : guess
+    close_button: close_settings
+    title: "Settings"
+
+    BoxLayout:
+        orientation: "vertical"
+
+        Label:
+            text: "Enter a location or guess by ip"
+
+        TextInput:
+            id: loc
+
+        Label:
+            id: feedback
+            text: ""
+
+        BoxLayout:
+            orientation: "horizontal"
+
+#            Button:
+#                text: "Update"
+
+            GuessLocationButton:
+                id: guess
+                settingsscreen: body
+                text: "Guess by IP"
+
+        Button:
+            id : close_settings
+            text : "Close Settings"
+            on_release: root.dismiss()