Do not put temp gpx files into gpx database

osmandapp · Sep 26, 2024 · a42f1f7 · a42f1f7
1 parent af053b3
commit a42f1f7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDataItem.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDataItem.kt
@@ -2,13 +2,20 @@ package net.osmand.shared.gpx
 
 import net.osmand.shared.io.KFile
 import net.osmand.shared.routing.ColoringType
+import net.osmand.shared.util.PlatformUtil
 
 class GpxDataItem(
 	file: KFile
 ) : DataItem(file) {
 
 	private var analysis: GpxTrackAnalysis? = null
 
+	companion object {
+		fun isRegularTrack(file: KFile) = file.path().startsWith(PlatformUtil.getOsmAndContext().getGpxDir().path())
+	}
+
+	fun isRegularTrack() = Companion.isRegularTrack(file)
+
 	fun getAnalysis(): GpxTrackAnalysis? {
 		return analysis
 	}

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt
@@ -248,7 +248,7 @@ object GpxDbHelper : GpxReaderAdapter {
 			return null
 		}
 		val item = dataItems[file]
-		if (GpxDbUtils.isAnalyseNeeded(item)) {
+		if (GpxDbUtils.isAnalyseNeeded(item) && GpxDataItem.isRegularTrack(file)) {
 			readGpxItem(file, item, callback)
 		}
 		return item

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxReader.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxReader.kt
@@ -93,6 +93,9 @@ class GpxReader(private val adapter: GpxReaderAdapter)
 		if (gpxFile.error == null) {
 			val analyser = PlatformUtil.getOsmAndContext().getTrackPointsAnalyser()
 			updatedItem.setAnalysis(gpxFile.getAnalysis(file.lastModified(), null, null, analyser))
+			if (!updatedItem.isRegularTrack()) {
+				return updatedItem
+			}
 			val creationTime: Long = updatedItem.requireParameter(GpxParameter.FILE_CREATION_TIME)
 			if (creationTime <= 0) {
 				updatedItem.setParameter(GpxParameter.FILE_CREATION_TIME, GpxUtilities.getCreationTime(gpxFile))

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
@@ -974,7 +974,7 @@ object GpxUtilities {
 			gpxFile.modifiedTime = file.lastModified()
 			gpxFile.pointsModifiedTime = gpxFile.modifiedTime
 			if (gpxFile.error != null) {
-				log.info("Error reading gpx ${gpxFile.path}")
+				log.info("Error reading gpx ${gpxFile.path}: ${gpxFile.error!!.message}")
 			}
 			gpxFile
 		} catch (e: IOException) {