Convert plugins to use local database sessions

viiru- · Feb 13, 2024 · e1ecc99 · e1ecc99
1 parent f7839d2
commit e1ecc99
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/plugins/garmin-fit/garmin-fit.py b/plugins/garmin-fit/garmin-fit.py
@@ -76,7 +76,7 @@ def inDatabase(self, activity):
 		#comparing date and start time (sport may have been changed in DB after import)
 		time = self.detailsFromTCX(activity)
 		try:
-			self.pytrainer_main.ddbb.session.query(Activity).filter(Activity.date_time_utc == time).one()
+			self.pytrainer_main.ddbb.sessionmaker().query(Activity).filter(Activity.date_time_utc == time).one()
 			return True
 		except exc.NoResultFound:
 			return False

diff --git a/plugins/garmin-gpx/garmingpx.py b/plugins/garmin-gpx/garmingpx.py
@@ -91,7 +91,7 @@ def inDatabase(self, filename):
 		"""
 		time = self.detailsFromGPX(filename)
 		try:
-			self.pytrainer_main.ddbb.session.query(Activity).filter(Activity.date_time_utc == time).one()
+			self.pytrainer_main.ddbb.sessionmaker().query(Activity).filter(Activity.date_time_utc == time).one()
 			return True
 		except exc.NoResultFound:
 			return False

diff --git a/plugins/garmin-hr-file/garminhrfile.py b/plugins/garmin-hr-file/garminhrfile.py
@@ -104,7 +104,7 @@ def shouldImport(self, track):
 		else:
 			time = timeElement.text
 			try:
-				self.pytrainer_main.ddbb.session.query(Activity).filter(Activity.date_time_utc == time).one()
+				self.pytrainer_main.ddbb.sessionmaker().query(Activity).filter(Activity.date_time_utc == time).one()
 				return False
 			except exc.NoResultFound:
 				return True

diff --git a/plugins/garmin-hr/garminhr.py b/plugins/garmin-hr/garminhr.py
@@ -162,7 +162,7 @@ def shouldImport(self, track):
 		else:
 			time = timeElement.text
 			try:
-				self.pytrainer_main.ddbb.session.query(Activity).filter(Activity.date_time_utc == time).one()
+				self.pytrainer_main.ddbb.sessionmaker().query(Activity).filter(Activity.date_time_utc == time).one()
 				return False
 			except exc.NoResultFound:
 				return True

diff --git a/plugins/garmin-tcxv2/garmin-tcxv2.py b/plugins/garmin-tcxv2/garmin-tcxv2.py
@@ -93,7 +93,7 @@ def inDatabase(self, activity):
 		#comparing date and start time (sport may have been changed in DB after import)
 		time = self.detailsFromTCX(activity)
 		try:
-			self.pytrainer_main.ddbb.session.query(Activity).filter(Activity.date_time_utc == time).one()
+			self.pytrainer_main.ddbb.sessionmaker().query(Activity).filter(Activity.date_time_utc == time).one()
 			return True
 		except exc.NoResultFound:
 			return False

diff --git a/plugins/garmintools/garmintools.py b/plugins/garmintools/garmintools.py
@@ -97,7 +97,7 @@ def inDatabase(self, tree):
 		#comparing date and start time (sport may have been changed in DB after import)
 		time = self.detailsFromFile(tree)
 		try:
-			self.pytrainer_main.ddbb.session.query(Activity).filter(Activity.date_time_utc == time).one()
+			self.pytrainer_main.ddbb.sessionmaker().query(Activity).filter(Activity.date_time_utc == time).one()
 			return True
 		except exc.NoResultFound:
 			return False

diff --git a/plugins/garmintools_full/garmintools_full.py b/plugins/garmintools_full/garmintools_full.py
@@ -103,7 +103,7 @@ def run(self):
                     if len(selectedFiles) > 0:
                         logging.info("Dumping "+str(len(selectedFiles))+" binary files found")
                         dumpFiles = self.dumpBinaries(selectedFiles)
-                        self.listStringDBUTC = self.pytrainer_main.ddbb.session.query(Activity)
+                        self.listStringDBUTC = self.pytrainer_main.ddbb.sessionmaker().query(Activity)
                         if self.maxGap > 0:
                             logging.info("Starting import. Comparison will be made with "+str(self.maxGap)+" seconds interval")
                         else: