Skip to content

Commit c6742e1

Browse files
tcgoetztcgoetz
committed
merge ConfigManager and GarminConnectConfigManager
1 parent fe68a4a commit c6742e1

36 files changed

+357
-458
lines changed

‎Jupyter/activities.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
"import snakemd\n",
1818
"\n",
1919
"import fitfile\n",
20-
"from garmindb import ConfigManager, GarminConnectConfigManager\n",
20+
"from garmindb import GarminConnectConfigManager\n",
2121
"from garmindb.garmindb import GarminDb, Attributes, ActivitiesDb, Activities, StepsActivities, ActivityLaps, ActivityRecords\n",
2222
"from idbutils.list_and_dict import list_not_none\n",
2323
"\n",
2424
"from jupyter_funcs import format_number\n",
2525
"\n",
2626
"gc_config = GarminConnectConfigManager()\n",
27-
"db_params_dict = ConfigManager.get_db_params()\n",
27+
"db_params_dict = gc_config.get_db_params()\n",
2828
"\n",
2929
"\n",
3030
"garmin_db = GarminDb(db_params_dict)\n",

‎Jupyter/activities_dashboard.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"source": [
1616
"import datetime\n",
1717
"from ipywidgets import fixed, Layout, interactive\n",
18-
"from garmindb import ConfigManager, GarminConnectConfigManager\n",
18+
"from garmindb import GarminConnectConfigManager\n",
1919
"from garmindb.garmindb import GarminDb, Attributes, ActivitiesDb, Activities, ActivityLaps, ActivityRecords\n",
2020
"from maps import ActivityMap\n",
2121
"from collections import ChainMap\n",
@@ -71,7 +71,7 @@
7171
"outputs": [],
7272
"source": [
7373
"gc_config = GarminConnectConfigManager()\n",
74-
"db_params_dict = ConfigManager.get_db_params()\n",
74+
"db_params_dict = gc_config.get_db_params()\n",
7575
"garmin_db = GarminDb(db_params_dict)\n",
7676
"garmin_act_db = ActivitiesDb(db_params_dict)\n",
7777
"measurement_system = Attributes.measurements_type(garmin_db)\n",

‎Jupyter/activity.ipynb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"import snakemd\n",
1818
"\n",
1919
"import fitfile\n",
20-
"from garmindb import ConfigManager\n",
20+
"from garmindb import GarminConnectConfigManager\n",
2121
"from garmindb.garmindb import GarminDb, Attributes, Device, ActivitiesDb, Activities, ActivityLaps, ActivityRecords, ActivitiesDevices\n",
2222
"from idbutils import Location\n",
2323
"\n",
@@ -29,7 +29,9 @@
2929
"\n",
3030
"doc = snakemd.new_doc()\n",
3131
"\n",
32-
"db_params_dict = ConfigManager.get_db_params()\n",
32+
"gc_config = GarminConnectConfigManager()\n",
33+
"db_params_dict = gc_config.get_db_params()\n",
34+
"\n",
3335
"garmin_db = GarminDb(db_params_dict)\n",
3436
"garmin_act_db = ActivitiesDb(db_params_dict)\n",
3537
"measurement_system = Attributes.measurements_type(garmin_db)\n",

‎Jupyter/checkup.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
"\n",
1919
"import fitfile\n",
2020
"import garmindb\n",
21-
"from garmindb import ConfigManager\n",
21+
"from garmindb import GarminConnectConfigManager\n",
2222
"from garmindb.garmindb import GarminDb, Device, DeviceInfo, ActivitiesDb, Activities, ActivityLaps, ActivityRecords, StepsActivities\n",
2323
"\n",
2424
"doc = snakemd.new_doc()\n",
2525
"\n",
26-
"db_params_dict = ConfigManager.get_db_params()\n",
26+
"gc_config = GarminConnectConfigManager()\n",
27+
"db_params_dict = gc_config.get_db_params()\n",
2728
"\n",
2829
"garmin_db = GarminDb(db_params_dict)\n",
2930
"\n",

‎Jupyter/course.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"import snakemd\n",
1818
"\n",
1919
"import fitfile\n",
20-
"from garmindb import ConfigManager\n",
20+
"from garmindb import GarminConnectConfigManager\n",
2121
"from garmindb.garmindb import GarminDb, Attributes, ActivitiesDb, Activities, ActivityLaps, ActivityRecords, StepsActivities\n",
2222
"\n",
2323
"from jupyter_funcs import format_number\n",
@@ -29,7 +29,8 @@
2929
"\n",
3030
"doc.add_heading(f\"Analysis for Course {course_id}\", 2)\n",
3131
"\n",
32-
"db_params_dict = ConfigManager.get_db_params()\n",
32+
"gc_config = GarminConnectConfigManager()\n",
33+
"db_params_dict = gc_config.get_db_params()\n",
3334
"\n",
3435
"garmin_db = GarminDb(db_params_dict)\n",
3536
"measurement_system = Attributes.measurements_type(garmin_db)\n",

‎Jupyter/daily.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"from IPython.display import display, Markdown\n",
1818
"import snakemd\n",
1919
"\n",
20-
"from garmindb import ConfigManager\n",
20+
"from garmindb import GarminConnectConfigManager\n",
2121
"from garmindb.garmindb import GarminSummaryDb, DaysSummary\n",
2222
"\n",
2323
"from jupyter_funcs import format_number\n",
@@ -39,7 +39,8 @@
3939
" graph.graph_date(date)\n",
4040
"\n",
4141
"\n",
42-
"db_params_dict = ConfigManager.get_db_params()\n",
42+
"gc_config = GarminConnectConfigManager()\n",
43+
"db_params_dict = gc_config.get_db_params()\n",
4344
"garmin_sum_db = GarminSummaryDb(db_params_dict)\n",
4445
"\n",
4546
"graph = Graph()"

‎Jupyter/daily_trends.ipynb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"from IPython.display import display\n",
1818
"import pandas as pd\n",
1919
"\n",
20-
"from garmindb import ConfigManager\n",
20+
"from garmindb import GarminConnectConfigManager\n",
2121
"from garmindb.garmindb import GarminSummaryDb, DaysSummary, MonitoringDb, MonitoringHeartRate, Sleep, GarminDb\n",
2222
"from garmindb.summarydb import DaysSummary, SummaryDb\n",
2323
"\n",
@@ -48,7 +48,9 @@
4848
"# end date (today)\n",
4949
"end_ts = datetime.datetime.combine(datetime.date.today(), datetime.datetime.max.time())\n",
5050
"\n",
51-
"db_params = ConfigManager.get_db_params()\n",
51+
"gc_config = GarminConnectConfigManager()\n",
52+
"db_params = gc_config.get_db_params()\n",
53+
"\n",
5254
"garmin_db = GarminDb(db_params)\n",
5355
"sum_db = SummaryDb(db_params, False)\n",
5456
"data = DaysSummary.get_for_period(sum_db, start_ts, end_ts, DaysSummary)\n",

‎Jupyter/garmin.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
"import snakemd\n",
1111
"\n",
1212
"import fitfile\n",
13-
"from garmindb import ConfigManager\n",
13+
"from garmindb import GarminConnectConfigManager\n",
1414
"from garmindb.garmindb import GarminDb, Attributes, File\n",
1515
"\n",
1616
"\n",
17-
"db_params_dict = ConfigManager.get_db_params()\n",
17+
"gc_config = GarminConnectConfigManager()\n",
18+
"db_params_dict = gc_config.get_db_params()\n",
1819
"garmin_db = GarminDb(db_params_dict)\n",
1920
"\n",
2021
"measurement_system = Attributes.measurements_type(garmin_db)\n",

‎Jupyter/graphs.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import matplotlib.pyplot as plt
1515
import matplotlib.dates as mdates
1616

17-
from garmindb import ConfigManager
17+
from garmindb import GarminConnectConfigManager
1818
from garmindb.garmindb import MonitoringDb, Monitoring, MonitoringHeartRate, ActivitiesDb
1919
from garmindb.summarydb import DaysSummary, WeeksSummary, MonthsSummary, SummaryDb
2020

@@ -76,6 +76,8 @@ def __init__(self, debug=False, save=False):
7676
"""Return an instance of the Graph class."""
7777
self.debug = debug
7878
self.save = save
79+
self.gc_config = GarminConnectConfigManager()
80+
self.db_params = self.gc_config.get_db_params()
7981

8082
@classmethod
8183
def __remove_discontinuities(cls, data):
@@ -206,8 +208,7 @@ def graph_activity(self, activity, period=None, days=None, geometry=111):
206208
period = config[activity]['period']
207209
if days is None:
208210
days = config[activity]['days']
209-
db_params = ConfigManager.get_db_params()
210-
sum_db = SummaryDb(db_params, self.debug)
211+
sum_db = SummaryDb(self.db_params, self.debug)
211212
end_ts = datetime.datetime.now()
212213
start_ts = end_ts - datetime.timedelta(days=days)
213214
table = self.__table[period]
@@ -237,8 +238,7 @@ def graph_date(self, date, geometry=111):
237238
"""Generate a graph for the given date."""
238239
if date is None:
239240
date = (datetime.datetime.now() - datetime.timedelta(days=1)).date()
240-
db_params = ConfigManager.get_db_params()
241-
mon_db = MonitoringDb(db_params, self.debug)
241+
mon_db = MonitoringDb(self.db_params, self.debug)
242242
start_ts = datetime.datetime.combine(date, datetime.datetime.min.time())
243243
end_ts = datetime.datetime.combine(date, datetime.datetime.max.time())
244244
hr_data = MonitoringHeartRate.get_for_period(mon_db, start_ts, end_ts, MonitoringHeartRate)

‎Jupyter/monitoring.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@
1717
"import snakemd\n",
1818
"\n",
1919
"import fitfile\n",
20-
"from garmindb import ConfigManager\n",
20+
"from garmindb import GarminConnectConfigManager\n",
2121
"from garmindb.garmindb import GarminDb, Attributes, Weight, Stress, RestingHeartRate, IntensityHR, Sleep\n",
2222
"from garmindb.garmindb import MonitoringDb, Monitoring, MonitoringHeartRate, MonitoringIntensity, MonitoringClimb\n",
2323
"\n",
2424
"from jupyter_funcs import format_number\n",
2525
"\n",
2626
"\n",
27-
"db_params_dict = ConfigManager.get_db_params()\n",
27+
"gc_config = GarminConnectConfigManager()\n",
28+
"db_params_dict = gc_config.get_db_params()\n",
2829
"garmin_db = GarminDb(db_params_dict)\n",
2930
"garmin_mon_db = MonitoringDb(db_params_dict)\n",
3031
"\n",

‎Jupyter/month.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"from IPython.display import display, Markdown\n",
1313
"import snakemd\n",
1414
"\n",
15-
"from garmindb import ConfigManager, GarminConnectConfigManager\n",
15+
"from garmindb import GarminConnectConfigManager\n",
1616
"from garmindb.garmindb import GarminDb, Attributes, ActivitiesDb, Activities\n",
1717
"\n",
1818
"from graphs import Graph\n",
@@ -36,7 +36,7 @@
3636
"\n",
3737
"\n",
3838
"gc_config = GarminConnectConfigManager()\n",
39-
"db_params_dict = ConfigManager.get_db_params()\n",
39+
"db_params_dict = gc_config.get_db_params()\n",
4040
"\n",
4141
"num_of_days = 30\n",
4242
"\n",

‎Jupyter/summary.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"import snakemd\n",
1919
"import datetime\n",
2020
"\n",
21-
"from garmindb import ConfigManager\n",
21+
"from garmindb import GarminConnectConfigManager\n",
2222
"from garmindb.garmindb import GarminSummaryDb, YearsSummary\n",
2323
"\n",
2424
"from jupyter_funcs import format_number\n",
@@ -27,7 +27,8 @@
2727
"years_to_display = 4\n",
2828
"days_to_display = (years_to_display * 365)\n",
2929
"\n",
30-
"db_params_dict = ConfigManager.get_db_params()\n",
30+
"gc_config = GarminConnectConfigManager()\n",
31+
"db_params_dict = gc_config.get_db_params()\n",
3132
"garmin_sum_db = GarminSummaryDb(db_params_dict)\n",
3233
"\n",
3334
"graph = Graph()"

‎Plugins

Submodule Plugins updated 1 file

‎garmindb/GarminConnectConfig.json.example

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
2+
"db": {
3+
"type" : "sqlite"
4+
},
25
"garmin": {
3-
"domain": "garmin.com"
6+
"domain" : "garmin.com"
47
},
58
"credentials": {
69
"user" : "joe@shmoe.com",
@@ -15,7 +18,9 @@
1518
"download_latest_activities" : 25,
1619
"download_all_activities" : 1000
1720
},
18-
"copy": {
21+
"directories": {
22+
"relative_to_home" : true,
23+
"base_dir" : "HealthData",
1924
"mount_dir" : "/Volumes/GARMIN"
2025
},
2126
"enabled_stats": {
@@ -34,5 +39,12 @@
3439
},
3540
"activities": {
3641
"display" : []
42+
},
43+
"settings": {
44+
"metric" : false,
45+
"default_display_activities" : ["walking", "running", "cycling"]
46+
},
47+
"checkup": {
48+
"look_back_days" : 90
3749
}
3850
}

‎garmindb/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from .fit_data import FitData
1717
from .fit_file_processor import FitFileProcessor
1818
from .garmin_connect_config_manager import GarminConnectConfigManager
19-
from .config_manager import ConfigManager
2019
from .statistics import Statistics
2120
from .tcx import Tcx
2221
from .monitoring_fit_file_processor import MonitoringFitFileProcessor

‎garmindb/analyze.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,7 @@ def summary(self):
195195

196196
def create_dynamic_views(self):
197197
"""Create database views specific to the data in this database."""
198-
gc_config = GarminConnectConfigManager()
199-
course_ids = gc_config.course_views('steps')
198+
course_ids = GarminConnectConfigManager().course_views('steps')
200199
if course_ids:
201200
for course_id in course_ids:
202201
StepsActivities.create_course_view(self.garmin_act_db, course_id)

‎garmindb/checkup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import fitfile
1414

1515
from garmindb.garmindb import GarminDb, Attributes, Device, DeviceInfo, DailySummary, ActivitiesDb, Activities, StepsActivities
16-
from garmindb import ConfigManager
16+
from garmindb import GarminConnectConfigManager
1717

1818

1919
logger = logging.getLogger(__file__)
@@ -26,7 +26,8 @@ class Checkup():
2626

2727
def __init__(self, paragraph_func=logger.info, heading_func=logger.info, debug=False):
2828
"""Return an instance of the CheckUp class."""
29-
self.db_params = ConfigManager.get_db_params()
29+
self.gc_config = GarminConnectConfigManager()
30+
self.db_params = self.gc_config.get_db_params()
3031
self.paragraph_func = paragraph_func
3132
self.heading_func = heading_func
3233
self.debug = debug
@@ -36,7 +37,7 @@ def __init__(self, paragraph_func=logger.info, heading_func=logger.info, debug=F
3637

3738
def goals(self):
3839
"""Do a checkup of the user's goals."""
39-
look_back_days = ConfigManager.checkup.get('look_back_days')
40+
look_back_days = self.gc_config.get_node_value_default('checkup', 'look_back_days', 90)
4041
end_ts = datetime.now()
4142
start_ts = end_ts - timedelta(days=look_back_days)
4243
results = DailySummary.get_for_period(self.garmin_db, start_ts, end_ts)

‎garmindb/config.py

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)