Merge pull request #68 from qwhelan/ffmpeg_lookup_linux

Run tests on each Pull Request and fix several test failures

Author: juanmcasillas

.github/workflows/github_test.yml

@@ -0,0 +1,25 @@
+name: Test
+on: [push]
+jobs:
+  Test-Changes:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+      - uses: FedericoCarboni/setup-ffmpeg@v3
+        id: setup-ffmpeg
+        with:
+          ffmpeg-version: release
+      - name: Install libraries
+        shell: bash -l {0}
+        run: pip install pytest
+      - name: Install
+        shell: bash -l {0}
+        run: pip install .
+      - name: Pytest
+        shell: bash -l {0}
+        run: py.test

gopro2gpx/config.py

@@ -17,8 +17,10 @@ def resource_path(relative_path):
     """
     Obtiene la ruta absoluta al recurso, ya sea en modo normal o frozen.
     """
-    base_path = getattr(sys, '_MEIPASS', os.path.abspath("."))
-    return os.path.join(base_path, relative_path)
+    if hasattr(sys, '_MEIPASS'):
+        base_path = getattr(sys, '_MEIPASS', os.path.abspath("."))
+        return os.path.join(base_path, relative_path)
+    return relative_path
 
 def main_core(args):
     # Ejemplo: utilizar resource_path para cargar el archivo de configuración

gopro2gpx/gopro2gpx.py

@@ -206,9 +206,6 @@ def main_core(args):
         args.gui = False
 
     config = setup_environment(args)
-    # Ajuste de rutas para el entorno frozen
-    config.ffprobe_cmd = resource_path(config.ffprobe_cmd)
-    config.ffmpeg_cmd = resource_path(config.ffmpeg_cmd)
 
     files = args.files
     output_file = args.outputfile
@@ -275,4 +272,4 @@ def main():
     main_core(args)
 
 if __name__ == "__main__":
-    main()
+    main()

gopro2gpx/gpshelper.py

@@ -123,7 +123,7 @@ def generate_GPX(points, start_time=None, trk_name="exercise"):
     if start_time is None:
         start_time = filtered_points[0].time
 
-    xml  = '<?xml version="1.0" encoding="UTF-8"?>\r\n'
+    xml  = '<?xml version="1.0" encoding="UTF-8"?>\n'
     gpx_attr = [
                 'xmlns="http://www.topografix.com/GPX/1/1"' ,
                 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' ,
@@ -152,14 +152,14 @@ def generate_GPX(points, start_time=None, trk_name="exercise"):
   	# <gpxtpx:speed>1.0</gpxtpx:speed>
     # <gpxtpx:distance>0</gpxtpx:distance>
 
-    xml += "<gpx " + " ".join(gpx_attr) + ">\r\n"
+    xml += "<gpx " + " ".join(gpx_attr) + ">\n"
 
-    xml += "<metadata>\r\n"
-    xml += "  <time>%s</time>\r\n" % UTCTime(start_time)
-    xml += "</metadata>\r\n"
-    xml += "<trk>\r\n"
-    xml += "  <name>%s</name>\r\n" % trk_name
-    xml += "<trkseg>\r\n"
+    xml += "<metadata>\n"
+    xml += "  <time>%s</time>\n" % UTCTime(start_time)
+    xml += "</metadata>\n"
+    xml += "<trk>\n"
+    xml += "  <name>%s</name>\n" % trk_name
+    xml += "<trkseg>\n"
 
     #
     # add the points
@@ -178,28 +178,28 @@ def generate_GPX(points, start_time=None, trk_name="exercise"):
         distance = p.distance
         fourcc_type = p.name
 
-        pts  = '	<trkpt lat="%s" lon="%s">\r\n' % (p.latitude, p.longitude)
-        pts += '		<fourcc_type>%s</fourcc_type>\r\n' % fourcc_type
-        pts += '		<ele>%s</ele>\r\n' % p.elevation
-        pts += '		<time>%s</time>\r\n' % UTCTime(p.time)
-        pts += '		<extensions>\r\n'
-        pts += '		<gpxtpx:TrackPointExtension>\r\n'
-        pts += '		    <gpxtpx:hr>%s</gpxtpx:hr>\r\n' % hr
-        pts += '		    <gpxtpx:cad>%s</gpxtpx:cad>\r\n' % cadence
-        pts += '		    <gpxtpx:speed>%s</gpxtpx:speed>\r\n' % speed
-        pts += '		    <gpxtpx:distance>%s</gpxtpx:distance>\r\n' % distance
-        pts += '		   </gpxtpx:TrackPointExtension>\r\n'
-        pts += '		<gpxx:TrackPointExtension/>\r\n' ## new
-    	#pts += '        <power>%s</power>\r\n' % power
-    	#pts += '        <<gpxtpx:temp>%s</temp>\r\n'   % temperature
-        pts += '		</extensions>\r\n'
-        pts += '	</trkpt>\r\n'
+        pts  = '	<trkpt lat="%s" lon="%s">\n' % (p.latitude, p.longitude)
+        pts += '		<fourcc_type>%s</fourcc_type>\n' % fourcc_type
+        pts += '		<ele>%s</ele>\n' % p.elevation
+        pts += '		<time>%s</time>\n' % UTCTime(p.time)
+        pts += '		<extensions>\n'
+        pts += '		<gpxtpx:TrackPointExtension>\n'
+        pts += '		    <gpxtpx:hr>%s</gpxtpx:hr>\n' % hr
+        pts += '		    <gpxtpx:cad>%s</gpxtpx:cad>\n' % cadence
+        pts += '		    <gpxtpx:speed>%s</gpxtpx:speed>\n' % speed
+        pts += '		    <gpxtpx:distance>%s</gpxtpx:distance>\n' % distance
+        pts += '		   </gpxtpx:TrackPointExtension>\n'
+        pts += '		<gpxx:TrackPointExtension/>\n' ## new
+    	#pts += '        <power>%s</power>\n' % power
+    	#pts += '        <<gpxtpx:temp>%s</temp>\n'   % temperature
+        pts += '		</extensions>\n'
+        pts += '	</trkpt>\n'
 
         xml += pts
 
-    xml += "</trkseg>\r\n"
-    xml += "</trk>\r\n"
-    xml += "</gpx>\r\n"
+    xml += "</trkseg>\n"
+    xml += "</trk>\n"
+    xml += "</gpx>\n"
 
     return xml
 
@@ -249,9 +249,9 @@ def generate_KML(gps_points):
         s = "%s,%s,%s" % (p.longitude, p.latitude, p.elevation)
         lines.append(s)
 
-    coords = os.linesep.join(lines)
+    coords = '\n'.join(lines)
     kml = kml_template % coords
-    return(kml)
+    return kml
 
 
 def generate_CSV_DashWare(gps_points):