Merge pull request #984 from ChiefGokhlayeh/pr/support-pre-v6.16.2-in-rescuesdriq

Support pre- and post-v6.16.2 file formats in rescuesdriq

.gitignore

@@ -25,3 +25,20 @@ obj-x86_64-linux-gnu/*
 **/venv*/
 *.pyc
 .DS_Store
+
+### Go ###
+# Binaries for programs and plugins
+/rescuesdriq/*.exe
+/rescuesdriq/*.exe~
+/rescuesdriq/*.dll
+/rescuesdriq/*.so
+/rescuesdriq/*.dylib
+
+# Test binary, built with `go test -c`
+/rescuesdriq/*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+/rescuesdriq/*.out
+
+/rescuesdriq/vendor/
+/rescuesdriq/Godeps/

rescuesdriq/go.mod

@@ -0,0 +1,9 @@
+module github.com/f4exb/sdrangel/rescuesdriq
+
+go 1.13
+
+require (
+	github.com/jtolds/gls v4.20.0+incompatible // indirect
+	github.com/smartystreets/assertions v1.2.0 // indirect
+	github.com/smartystreets/goconvey v1.6.2
+)

rescuesdriq/go.sum

@@ -0,0 +1,6 @@
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
+github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
+github.com/smartystreets/goconvey v1.6.2 h1:R44Anr1ZQYKSh9jBN8v2++vtyDnZsoQifO6MZsJdCDU=
+github.com/smartystreets/goconvey v1.6.2/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=

rescuesdriq/readme.md

@@ -2,7 +2,7 @@
 
 <h2>Usage</h2>
 
-This utility attempts to repair .sdriq files that have their header corrupted or with a pre version 4.2.1 header. Since version 4.2.1 a CRC32 checksum is present and the file will not be played if the check of the header content against the CRC32 fails.
+This utility attempts to repair .sdriq files, that have their header corrupted, or were created using old versions of SDRangel. Since version 4.2.1 a CRC32 checksum is present and the file will not be played if the check of the header content against the CRC32 fails. In version 6.16.2 the timestamp resolution was increased from seconds to milliseconds since 1970-01-01 00:00:00.000.
 
 The header is composed as follows:
 
@@ -25,6 +25,8 @@ You can replace values in the header with the following options:
       start time RFC3339 (ex: 2006-01-02T15:04:05Z)
   - -now
       use now for start time
+  - -msec
+      assume timestamp read from input file is in milliseconds (by default seconds will be assumed)
   - -sz uint
       Sample size (16 or 24) (default 16)
 

rescuesdriq/rescuesdriq.go

@@ -112,6 +112,7 @@ func main() {
 	sampleSize := flag.Uint("sz", 16, "Sample size (16 or 24)")
 	timeStr := flag.String("ts", "", "start time RFC3339 (ex: 2006-01-02T15:04:05Z)")
 	timeNow := flag.Bool("now", false, "use now for start time")
+	assumeMilliseconds := flag.Bool("msec", false, "assume timestamp read from input file is in milliseconds (by default seconds will be assumed)")
 	blockSize := flag.Uint("bz", 1, "Copy block size in multiple of 4k")
 
 	flag.Parse()
@@ -158,7 +159,9 @@ func main() {
 					headerOrigin.StartTimestamp = int64(time.Now().UnixNano() / int64(time.Millisecond))
 				}
 			} else if *timeNow {
-				headerOrigin.StartTimestamp = int64(time.Now().Unix() * 1000)
+				headerOrigin.StartTimestamp = int64(time.Now().UnixNano() / int64(time.Millisecond))
+			} else if !*assumeMilliseconds {
+				headerOrigin.StartTimestamp = headerOrigin.StartTimestamp * (int64(time.Millisecond) / int64(time.Second))
 			}
 
 			fmt.Println("\nHeader is now")