diff --git a/CHANGELOG.md b/CHANGELOG.md index 23cf9a1..2dd5ce9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,10 @@ _v6.4.1_ - Fix timestamp format when checking for call duplicates. - Fix http timeouts on call ingestions or admin config save when dowstream takes too long (issue #197). +_v6.4.1_ + +- Revert the last changes to the SDR Trunk parser (issue #206). + ## Version 6.3 - Change scroll speed when drag droping talkgroups or units in a system (discussion #170). diff --git a/COMPILING.md b/COMPILING.md index 1e57703..6b380b4 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -27,13 +27,13 @@ Clone the official repository on your computer and start the build process. When finished, you will find the precompiled versions for various platforms in the `dist` folder. - rdio-scanner-darwin-amd64-v6.4.1.zip - rdio-scanner-darwin-arm64-v6.4.1.zip - rdio-scanner-freebsd-amd64-v6.4.1.zip - rdio-scanner-linux-386-v6.4.1.zip - rdio-scanner-linux-amd64-v6.4.1.zip - rdio-scanner-linux-arm64-v6.4.1.zip - rdio-scanner-linux-arm-v6.4.1.zip - rdio-scanner-windows-amd64-v6.4.1.zip + rdio-scanner-darwin-amd64-v6.4.2.zip + rdio-scanner-darwin-arm64-v6.4.2.zip + rdio-scanner-freebsd-amd64-v6.4.2.zip + rdio-scanner-linux-386-v6.4.2.zip + rdio-scanner-linux-amd64-v6.4.2.zip + rdio-scanner-linux-arm64-v6.4.2.zip + rdio-scanner-linux-arm-v6.4.2.zip + rdio-scanner-windows-amd64-v6.4.2.zip **Happy Rdio scanning !** \ No newline at end of file diff --git a/Makefile b/Makefile index 03d2ee3..b494d13 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,8 @@ ################################################################################ app := rdio-scanner -date := 2022/06/08 -ver := 6.4.1 +date := 2022/06/09 +ver := 6.4.2 client := $(wildcard client/*.json client/*.ts) server := $(wildcard server/*.go) diff --git a/client/package-lock.json b/client/package-lock.json index 0a8222e..ad922eb 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "rdio-scanner", - "version": "6.4.1", + "version": "6.4.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rdio-scanner", - "version": "6.4.1", + "version": "6.4.2", "license": "LICENSE", "dependencies": { "@angular/animations": "^13.3.10", diff --git a/client/package.json b/client/package.json index 14abaa1..dc0aa88 100644 --- a/client/package.json +++ b/client/package.json @@ -38,5 +38,5 @@ "build": "ng build --base-href ./ --configuration production", "start": "ng serve" }, - "version": "6.4.1" + "version": "6.4.2" } diff --git a/docs/platforms/darwin.md b/docs/platforms/darwin.md index 0cc0b57..dddf70f 100644 --- a/docs/platforms/darwin.md +++ b/docs/platforms/darwin.md @@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@macos ~ % mkdir rdio-scanner rdio@macos ~ % cd rdio-scanner rdio@macos rdio-scanner % unzip \ - > ~/Downloads/rdio-scanner-darwin-arm64-v6.4.1.zip - Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.4.1.zip + > ~/Downloads/rdio-scanner-darwin-arm64-v6.4.2.zip + Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.4.2.zip inflating: rdio-scanner inflating: rdio-scanner.pdf @@ -51,11 +51,11 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@macos rdio-scanner % ./rdio-scanner - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 08:38:06 server started - 2022/06/08 08:38:06 main interface at http://macos.local:3000 - 2022/06/08 08:38:06 admin interface at http://macos.local:3000/admin + 2022/06/09 08:38:06 server started + 2022/06/09 08:38:06 main interface at http://macos.local:3000 + 2022/06/09 08:38:06 admin interface at http://macos.local:3000/admin 4. Access the administrative dashboard to finalize the configuration. @@ -77,11 +77,11 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance rdio@macos rdio-scanner % ./rdio-scanner --listen :80 - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 08:48:03 server started - 2022/06/08 08:48:03 main interface at http://macos.local - 2022/06/08 08:48:03 admin interface at http://macos.local/admin + 2022/06/09 08:48:03 server started + 2022/06/09 08:48:03 main interface at http://macos.local + 2022/06/09 08:48:03 admin interface at http://macos.local/admin ## Listening on a SSL port @@ -95,12 +95,12 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer > -ssl_key_file mykey.key \ > -ssl_listen :443 - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 08:50:58 server started - 2022/06/08 08:50:58 main interface at http://macos.local - 2022/06/08 08:50:58 main interface at https://macos.local - 2022/06/08 08:50:58 admin interface at https://macos.local/admin + 2022/06/09 08:50:58 server started + 2022/06/09 08:50:58 main interface at http://macos.local + 2022/06/09 08:50:58 main interface at https://macos.local + 2022/06/09 08:50:58 admin interface at https://macos.local/admin If you don't want to worry about SSL certificates, you can use the built-in Let's Encrypt auto-cert feature. This requires that you have both port 80 (HTTP) and port 443 (HTTPS) open to the world. Also, your domain name should point to your IP address where [Rdio Scanner](https://github.com/chuot/rdio-scanner/) is running. The advantage of this approach is that everything is done automatically, no certificate request, no certificate renewal. @@ -118,7 +118,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y > -ssl_auto_cert mydomain.com \ > -ssl_listen :443 \ > -config_save - 2022/06/08 08:52:24 rdio-scanner.ini file created + 2022/06/09 08:52:24 rdio-scanner.ini file created All of your parameters passed as arguments to [Rdio Scanner](https://github.com/chuot/rdio-scanner) have been saved to an INI file which has the same arguments/values list. @@ -132,12 +132,12 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an rdio@macos rdio-scanner % ./rdio-scanner - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 08:54:08 server started - 2022/06/08 08:54:08 main interface at http://macos.local - 2022/06/08 08:54:08 main interface at https://macos.local - 2022/06/08 08:54:08 admin interface at https://macos.local/admin + 2022/06/09 08:54:08 server started + 2022/06/09 08:54:08 main interface at http://macos.local + 2022/06/09 08:54:08 main interface at https://macos.local + 2022/06/09 08:54:08 admin interface at https://macos.local/admin ## Install Rdio Scanner as a service diff --git a/docs/platforms/freebsd.md b/docs/platforms/freebsd.md index 95509dc..bd4b661 100644 --- a/docs/platforms/freebsd.md +++ b/docs/platforms/freebsd.md @@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@pc-freebsd:~ $ mkdir rdio-scanner rdio@pc-freebsd:~ $ cd rdio-scanner rdio@pc-freebsd:~/rdio-scanner $ unzip \ - > ~/rdio-scanner-freebsd-amd64-v6.4.1.zip - Archive: ../rdio-scanner-freebsd-amd64-v6.4.1.zip + > ~/rdio-scanner-freebsd-amd64-v6.4.2.zip + Archive: ../rdio-scanner-freebsd-amd64-v6.4.2.zip extracting: rdio-scanner extracting: rdio-scanner.pdf @@ -51,11 +51,11 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@pc-freebsd:~/rdio-scanner $ ./rdio-scanner - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 08:16:36 server started - 2022/06/08 08:16:36 main interface at http://pc-freebsd:3000 - 2022/06/08 08:16:36 admin interface at http://pc-freebsd:3000/admin + 2022/06/09 08:16:36 server started + 2022/06/09 08:16:36 main interface at http://pc-freebsd:3000 + 2022/06/09 08:16:36 admin interface at http://pc-freebsd:3000/admin 4. Access the administrative dashboard to finalize the configuration. @@ -81,11 +81,11 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance Password: root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner -listen :80 - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 08:19:38 server started - 2022/06/08 08:19:38 main interface at http://pc-freebsd - 2022/06/08 08:19:38 admin interface at http://pc-freebsd/admin + 2022/06/09 08:19:38 server started + 2022/06/09 08:19:38 main interface at http://pc-freebsd + 2022/06/09 08:19:38 admin interface at http://pc-freebsd/admin ## Listening on a SSL port @@ -101,12 +101,12 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer > -ssl_key_file mykey.key \ > -ssl_listen :443 - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 10:34:29 server started - 2022/06/08 10:34:29 main interface at http://pc-freebsd - 2022/06/08 10:34:29 main interface at https://pc-freebsd - 2022/06/08 10:34:29 admin interface at https://pc-freebsd/admin + 2022/06/09 10:34:29 server started + 2022/06/09 10:34:29 main interface at http://pc-freebsd + 2022/06/09 10:34:29 main interface at https://pc-freebsd + 2022/06/09 10:34:29 admin interface at https://pc-freebsd/admin If you don't want to worry about SSL certificates, you can use the built-in Let's Encrypt auto-cert feature. This requires that you have both port 80 (HTTP) and port 443 (HTTPS) open to the world. Also, your domain name should point to your IP address where [Rdio Scanner](https://github.com/chuot/rdio-scanner/) is running. The advantage of this approach is that everything is done automatically, no certificate request, no certificate renewal. @@ -126,7 +126,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y > -ssl_auto_cert mydomain.com \ > -ssl_listen :443 \ > -config_save - 2022/06/08 10:37:00 rdio-scanner.ini file created + 2022/06/09 10:37:00 rdio-scanner.ini file created All of your parameters passed as arguments to [Rdio Scanner](https://github.com/chuot/rdio-scanner) have been saved to an INI file which has the same arguments/values list. @@ -142,12 +142,12 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an Password: root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 10:38:28 server started - 2022/06/08 10:38:29 main interface at http://pc-freebsd - 2022/06/08 10:38:29 main interface at https://pc-freebsd - 2022/06/08 10:38:29 admin interface at https://pc-freebsd/admin + 2022/06/09 10:38:28 server started + 2022/06/09 10:38:29 main interface at http://pc-freebsd + 2022/06/09 10:38:29 main interface at https://pc-freebsd + 2022/06/09 10:38:29 admin interface at https://pc-freebsd/admin ## Install Rdio Scanner as a service diff --git a/docs/platforms/linux.md b/docs/platforms/linux.md index d940966..78c2ace 100644 --- a/docs/platforms/linux.md +++ b/docs/platforms/linux.md @@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd [rdio@pc-linux ~]$ mkdir rdio-scanner [rdio@pc-linux ~]$ cd rdio-scanner [rdio@pc-linux rdio-scanner]$ unzip \ - > ~/Downloads/rdio-scanner-linux-amd64-v6.4.1.zip - Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.4.1.zip + > ~/Downloads/rdio-scanner-linux-amd64-v6.4.2.zip + Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.4.2.zip inflating: rdio-scanner inflating: rdio-scanner.pdf @@ -51,11 +51,11 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd [rdio@pc-linux rdio-scanner]$ ./rdio-scanner - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 09:11:48 server started - 2022/06/08 09:11:48 main interface at http://pc-linux:3000 - 2022/06/08 09:11:48 admin interface at http://pc-linux:3000/admin + 2022/06/09 09:11:48 server started + 2022/06/09 09:11:48 main interface at http://pc-linux:3000 + 2022/06/09 09:11:48 admin interface at http://pc-linux:3000/admin 4. Access the administrative dashboard to finalize the configuration. @@ -78,11 +78,11 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance [rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner -listen :80 [sudo] password for rdio: - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 09:14:00 server started - 2022/06/08 09:14:00 main interface at http://pc-linux - 2022/06/08 09:14:00 admin interface at http://pc-linux/admin + 2022/06/09 09:14:00 server started + 2022/06/09 09:14:00 main interface at http://pc-linux + 2022/06/09 09:14:00 admin interface at http://pc-linux/admin ## Listening on a SSL port @@ -97,12 +97,12 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer > -ssl_listen :443 [sudo] password for rdio: - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 09:16:47 server started - 2022/06/08 09:16:47 main interface at http://pc-linux - 2022/06/08 09:16:47 main interface at https://pc-linux - 2022/06/08 09:16:47 admin interface at https://pc-linux/admin + 2022/06/09 09:16:47 server started + 2022/06/09 09:16:47 main interface at http://pc-linux + 2022/06/09 09:16:47 main interface at https://pc-linux + 2022/06/09 09:16:47 admin interface at https://pc-linux/admin If you don't want to worry about SSL certificates, you can use the built-in Let's Encrypt auto-cert feature. This requires that you have both port 80 (HTTP) and port 443 (HTTPS) open to the world. Also, your domain name should point to your IP address where [Rdio Scanner](https://github.com/chuot/rdio-scanner/) is running. The advantage of this approach is that everything is done automatically, no certificate request, no certificate renewal. @@ -120,7 +120,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y > -ssl_auto_cert mydomain.com \ > -ssl_listen :443 \ > -config_save - 2022/06/08 09:19:29 rdio-scanner.ini file created + 2022/06/09 09:19:29 rdio-scanner.ini file created All of your parameters passed as arguments to [Rdio Scanner](https://github.com/chuot/rdio-scanner) have been saved to an INI file which has the same arguments/values list. @@ -135,12 +135,12 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an [rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner [sudo] Mot de passe de rdio : - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 09:20:40 server started - 2022/06/08 09:20:40 main interface at http://pc-linux - 2022/06/08 09:20:40 main interface at https://pc-linux - 2022/06/08 09:20:40 admin interface at https://pc-linux/admin + 2022/06/09 09:20:40 server started + 2022/06/09 09:20:40 main interface at http://pc-linux + 2022/06/09 09:20:40 main interface at https://pc-linux + 2022/06/09 09:20:40 admin interface at https://pc-linux/admin ## Install Rdio Scanner as a service diff --git a/docs/platforms/windows.md b/docs/platforms/windows.md index 5d80de0..c95b553 100644 --- a/docs/platforms/windows.md +++ b/docs/platforms/windows.md @@ -44,7 +44,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd C:\Users\rdio> cd rdio-scanner C:\Users\rdio\rdio-scanner> tar -xvf ^ - ..\downloads\rdio-scanner-windows-amd64-v6.4.1.zip + ..\downloads\rdio-scanner-windows-amd64-v6.4.2.zip x rdio-scanner.exe x rdio-scanner.pdf @@ -52,11 +52,11 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd C:\Users\rdio\rdio-scanner>rdio-scanner - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 13:48:48 server started - 2022/06/08 13:48:48 main interface at http://pc-windows:3000 - 2022/06/08 13:48:48 admin interface at http://pc-windows:3000/admin + 2022/06/09 13:48:48 server started + 2022/06/09 13:48:48 main interface at http://pc-windows:3000 + 2022/06/09 13:48:48 admin interface at http://pc-windows:3000/admin 4. Access the administrative dashboard to finalize the configuration. @@ -78,11 +78,11 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance C:\Users\rdio\rdio-scanner>rdio-scanner -listen :80 - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 10:53:31 server started - 2022/06/08 10:53:31 main interface at http://pc-windows - 2022/06/08 10:53:31 admin interface at http://pc-windows/admin + 2022/06/09 10:53:31 server started + 2022/06/09 10:53:31 main interface at http://pc-windows + 2022/06/09 10:53:31 admin interface at http://pc-windows/admin ## Listening on a SSL port @@ -96,12 +96,12 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer -ssl_key_file meykey.key ^ -ssl_listen :443 - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 11:05:43 server started - 2022/06/08 11:05:43 main interface at http://pc-windows - 2022/06/08 11:05:43 main interface at https://pc-windows - 2022/06/08 11:05:43 admin interface at https://pc-windows/admin + 2022/06/09 11:05:43 server started + 2022/06/09 11:05:43 main interface at http://pc-windows + 2022/06/09 11:05:43 main interface at https://pc-windows + 2022/06/09 11:05:43 admin interface at https://pc-windows/admin If you don't want to worry about SSL certificates, you can use the built-in Let's Encrypt auto-cert feature. This requires that you have both port 80 (HTTP) and port 443 (HTTPS) open to the world. Also, your domain name should point to your IP address where [Rdio Scanner](https://github.com/chuot/rdio-scanner/) is running. The advantage of this approach is that everything is done automatically, no certificate request, no certificate renewal. @@ -119,7 +119,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y -ssl_auto_cert mydomain.com ^ -ssl_listen :443 ^ -config_save - 2022/06/08 11:08:28 rdio-scanner.ini file created + 2022/06/09 11:08:28 rdio-scanner.ini file created All of your parameters passed as arguments to [Rdio Scanner](https://github.com/chuot/rdio-scanner) have been saved to an INI file which has the same arguments/values list. @@ -133,12 +133,12 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an C:\Users\rdio\rdio-scanner>rdio-scanner - Rdio Scanner v6.4.1 + Rdio Scanner v6.4.2 ---------------------------------- - 2022/06/08 11:11:28 server started - 2022/06/08 11:11:28 main interface at http://pc-windows - 2022/06/08 11:11:28 main interface at https://pc-windows - 2022/06/08 11:11:28 admin interface at https://pc-windows/admin + 2022/06/09 11:11:28 server started + 2022/06/09 11:11:28 main interface at http://pc-windows + 2022/06/09 11:11:28 main interface at https://pc-windows + 2022/06/09 11:11:28 admin interface at https://pc-windows/admin \pagebreak{} diff --git a/server/parsers.go b/server/parsers.go index 78261dc..fc53776 100644 --- a/server/parsers.go +++ b/server/parsers.go @@ -127,11 +127,6 @@ func ParseSdrTrunkMeta(call *Call, controller *Controller) error { call.talkgroupName = s[1] } - s = regexp.MustCompile(`"?([^"]+)"?`).FindStringSubmatch(m.Album()) - if len(s) > 1 { - call.talkgroupName = s[1] - } - return nil } diff --git a/server/version.go b/server/version.go index 98be469..85631fa 100644 --- a/server/version.go +++ b/server/version.go @@ -15,4 +15,4 @@ package main -const Version = "6.4.1" +const Version = "6.4.2"