Skip to content

Commit

Permalink
Version 6.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@chuot
chuot committed Jun 29, 2022
1 parent 0e088ad commit 2dae260
Show file tree
Hide file tree
Showing 13 changed files with 112 additions and 114 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
- New populated talkgroups won't be activated on the client if its group (or tag) is turned off (issue #227).
- Removed the duplicated webapp section from the PDF document.

_v6.5.1_

- Fix broken functionnality for `HOLD SYS` and `HOLD TG` (issue #228).

## Version 6.4

- New `-cmd` command line options to allow advanced administrative tasks.
Expand Down
16 changes: 8 additions & 8 deletions COMPILING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0.zip
rdio-scanner-darwin-arm64-v6.5.0.zip
rdio-scanner-freebsd-amd64-v6.5.0.zip
rdio-scanner-linux-386-v6.5.0.zip
rdio-scanner-linux-amd64-v6.5.0.zip
rdio-scanner-linux-arm64-v6.5.0.zip
rdio-scanner-linux-arm-v6.5.0.zip
rdio-scanner-windows-amd64-v6.5.0.zip
rdio-scanner-darwin-amd64-v6.5.1.zip
rdio-scanner-darwin-arm64-v6.5.1.zip
rdio-scanner-freebsd-amd64-v6.5.1.zip
rdio-scanner-linux-386-v6.5.1.zip
rdio-scanner-linux-amd64-v6.5.1.zip
rdio-scanner-linux-arm64-v6.5.1.zip
rdio-scanner-linux-arm-v6.5.1.zip
rdio-scanner-windows-amd64-v6.5.1.zip

**Happy Rdio scanning !**
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
################################################################################

app := rdio-scanner
date := 2022/06/27
ver := 6.5.0
date := 2022/06/29
ver := 6.5.1

client := $(wildcard client/*.json client/*.ts)
server := $(wildcard server/*.go)
Expand Down
4 changes: 2 additions & 2 deletions client/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@
"build": "ng build --base-href ./ --configuration production",
"start": "ng serve"
},
"version": "6.5.0"
"version": "6.5.1"
}
2 changes: 1 addition & 1 deletion client/src/app/components/rdio-scanner/main/main.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</div>
<div class="row right small">
<div *ngIf="tempAvoid">
<span class="flag" [ngClass]="{ flaged: avoided || patched }">&#9202; {{ tempAvoid }}M</span>
<span class="flag" [ngClass]="{ flaged: avoided || patched }">&#x23f2;&#xFE0E; {{ tempAvoid }}M</span>
</div>
<div>
<span class="flag" [ngClass]="{ flaged: avoided }">AVOID</span>
Expand Down
24 changes: 9 additions & 15 deletions client/src/app/components/rdio-scanner/rdio-scanner.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,11 @@ export class RdioScannerService implements OnDestroy {
const allOn = Object.keys(this.livefeedMap[sys]).map((tg) => +tg).every((tg) => !this.livefeedMap[sys][tg]);

sysMap[sys] = Object.keys(this.livefeedMap[sys]).map((tg) => +tg).reduce((tgMap, tg) => {
tgMap[tg].minutes = undefined;
tgMap[tg].timer?.unsubscribe();
tgMap[tg].timer = undefined;
this.livefeedMap[sys][tg].timer?.unsubscribe();

if (sys === call.system)
tgMap[tg].active = allOn || this.livefeedMap[sys][tg].active;
else
tgMap[tg].active = false;
tgMap[tg] = {
active: sys === call.system ? allOn || this.livefeedMap[sys][tg].active : false,
} as RdioScannerLivefeed;

return tgMap;
}, {} as { [key: number]: RdioScannerLivefeed });
Expand Down Expand Up @@ -325,14 +322,11 @@ export class RdioScannerService implements OnDestroy {

this.livefeedMap = Object.keys(this.livefeedMap).map((sys) => +sys).reduce((sysMap, sys) => {
sysMap[sys] = Object.keys(this.livefeedMap[sys]).map((tg) => +tg).reduce((tgMap, tg) => {
tgMap[tg].minutes = undefined;
tgMap[tg].timer?.unsubscribe();
tgMap[tg].timer = undefined;

if (sys === call.system)
tgMap[tg].active = tg === call.talkgroup;
else
tgMap[tg].active = false;
this.livefeedMap[sys][tg].timer?.unsubscribe();

tgMap[tg] = {
active: sys === call.system ? tg === call.talkgroup : false,
} as RdioScannerLivefeed;

return tgMap;
}, {} as { [key: number]: RdioScannerLivefeed });
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/components/rdio-scanner/select/select.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export class RdioScannerSelectComponent implements OnDestroy {
this.rdioScannerService.beep(RdioScannerBeepStyle.Deactivate);

} else if (options?.system !== undefined && options?.talkgroup !== undefined) {
this.rdioScannerService.beep(this.map[options!.system.id][options!.talkgroup.id]
this.rdioScannerService.beep(this.map[options!.system.id][options!.talkgroup.id].active
? RdioScannerBeepStyle.Deactivate
: RdioScannerBeepStyle.Activate
);
Expand Down
42 changes: 21 additions & 21 deletions docs/platforms/darwin.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ 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.5.0.zip
Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.5.0.zip
> ~/Downloads/rdio-scanner-darwin-arm64-v6.5.1.zip
Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.5.1.zip
inflating: rdio-scanner
inflating: rdio-scanner.pdf

3. Run the executable.

rdio@macos rdio-scanner % ./rdio-scanner
Rdio Scanner v6.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 08:38:06 server started
2022/06/27 08:38:06 main interface at http://macos.local:3000
2022/06/27 08:38:06 admin interface at http://macos.local:3000/admin
2022/06/29 08:38:06 server started
2022/06/29 08:38:06 main interface at http://macos.local:3000
2022/06/29 08:38:06 admin interface at http://macos.local:3000/admin

4. Access the administrative dashboard to finalize the configuration.

Expand All @@ -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.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 08:48:03 server started
2022/06/27 08:48:03 main interface at http://macos.local
2022/06/27 08:48:03 admin interface at http://macos.local/admin
2022/06/29 08:48:03 server started
2022/06/29 08:48:03 main interface at http://macos.local
2022/06/29 08:48:03 admin interface at http://macos.local/admin

## Listening on a SSL port

Expand All @@ -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.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 08:50:58 server started
2022/06/27 08:50:58 main interface at http://macos.local
2022/06/27 08:50:58 main interface at https://macos.local
2022/06/27 08:50:58 admin interface at https://macos.local/admin
2022/06/29 08:50:58 server started
2022/06/29 08:50:58 main interface at http://macos.local
2022/06/29 08:50:58 main interface at https://macos.local
2022/06/29 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.

Expand All @@ -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/27 08:52:24 rdio-scanner.ini file created
2022/06/29 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.

Expand All @@ -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.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 08:54:08 server started
2022/06/27 08:54:08 main interface at http://macos.local
2022/06/27 08:54:08 main interface at https://macos.local
2022/06/27 08:54:08 admin interface at https://macos.local/admin
2022/06/29 08:54:08 server started
2022/06/29 08:54:08 main interface at http://macos.local
2022/06/29 08:54:08 main interface at https://macos.local
2022/06/29 08:54:08 admin interface at https://macos.local/admin

## Install Rdio Scanner as a service

Expand Down
42 changes: 21 additions & 21 deletions docs/platforms/freebsd.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ 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.5.0.zip
Archive: ../rdio-scanner-freebsd-amd64-v6.5.0.zip
> ~/rdio-scanner-freebsd-amd64-v6.5.1.zip
Archive: ../rdio-scanner-freebsd-amd64-v6.5.1.zip
extracting: rdio-scanner
extracting: rdio-scanner.pdf

3. Run the executable.

rdio@pc-freebsd:~/rdio-scanner $ ./rdio-scanner
Rdio Scanner v6.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 08:16:36 server started
2022/06/27 08:16:36 main interface at http://pc-freebsd:3000
2022/06/27 08:16:36 admin interface at http://pc-freebsd:3000/admin
2022/06/29 08:16:36 server started
2022/06/29 08:16:36 main interface at http://pc-freebsd:3000
2022/06/29 08:16:36 admin interface at http://pc-freebsd:3000/admin

4. Access the administrative dashboard to finalize the configuration.

Expand All @@ -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.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 08:19:38 server started
2022/06/27 08:19:38 main interface at http://pc-freebsd
2022/06/27 08:19:38 admin interface at http://pc-freebsd/admin
2022/06/29 08:19:38 server started
2022/06/29 08:19:38 main interface at http://pc-freebsd
2022/06/29 08:19:38 admin interface at http://pc-freebsd/admin

## Listening on a SSL port

Expand All @@ -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.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 10:34:29 server started
2022/06/27 10:34:29 main interface at http://pc-freebsd
2022/06/27 10:34:29 main interface at https://pc-freebsd
2022/06/27 10:34:29 admin interface at https://pc-freebsd/admin
2022/06/29 10:34:29 server started
2022/06/29 10:34:29 main interface at http://pc-freebsd
2022/06/29 10:34:29 main interface at https://pc-freebsd
2022/06/29 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.

Expand All @@ -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/27 10:37:00 rdio-scanner.ini file created
2022/06/29 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.

Expand All @@ -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.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 10:38:28 server started
2022/06/27 10:38:29 main interface at http://pc-freebsd
2022/06/27 10:38:29 main interface at https://pc-freebsd
2022/06/27 10:38:29 admin interface at https://pc-freebsd/admin
2022/06/29 10:38:28 server started
2022/06/29 10:38:29 main interface at http://pc-freebsd
2022/06/29 10:38:29 main interface at https://pc-freebsd
2022/06/29 10:38:29 admin interface at https://pc-freebsd/admin

## Install Rdio Scanner as a service

Expand Down
42 changes: 21 additions & 21 deletions docs/platforms/linux.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ 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.5.0.zip
Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.5.0.zip
> ~/Downloads/rdio-scanner-linux-amd64-v6.5.1.zip
Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.5.1.zip
inflating: rdio-scanner
inflating: rdio-scanner.pdf

3. Run the executable.

[rdio@pc-linux rdio-scanner]$ ./rdio-scanner
Rdio Scanner v6.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 09:11:48 server started
2022/06/27 09:11:48 main interface at http://pc-linux:3000
2022/06/27 09:11:48 admin interface at http://pc-linux:3000/admin
2022/06/29 09:11:48 server started
2022/06/29 09:11:48 main interface at http://pc-linux:3000
2022/06/29 09:11:48 admin interface at http://pc-linux:3000/admin

4. Access the administrative dashboard to finalize the configuration.

Expand All @@ -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.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 09:14:00 server started
2022/06/27 09:14:00 main interface at http://pc-linux
2022/06/27 09:14:00 admin interface at http://pc-linux/admin
2022/06/29 09:14:00 server started
2022/06/29 09:14:00 main interface at http://pc-linux
2022/06/29 09:14:00 admin interface at http://pc-linux/admin

## Listening on a SSL port

Expand All @@ -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.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 09:16:47 server started
2022/06/27 09:16:47 main interface at http://pc-linux
2022/06/27 09:16:47 main interface at https://pc-linux
2022/06/27 09:16:47 admin interface at https://pc-linux/admin
2022/06/29 09:16:47 server started
2022/06/29 09:16:47 main interface at http://pc-linux
2022/06/29 09:16:47 main interface at https://pc-linux
2022/06/29 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.

Expand All @@ -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/27 09:19:29 rdio-scanner.ini file created
2022/06/29 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.

Expand All @@ -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.5.0
Rdio Scanner v6.5.1
----------------------------------
2022/06/27 09:20:40 server started
2022/06/27 09:20:40 main interface at http://pc-linux
2022/06/27 09:20:40 main interface at https://pc-linux
2022/06/27 09:20:40 admin interface at https://pc-linux/admin
2022/06/29 09:20:40 server started
2022/06/29 09:20:40 main interface at http://pc-linux
2022/06/29 09:20:40 main interface at https://pc-linux
2022/06/29 09:20:40 admin interface at https://pc-linux/admin

## Install Rdio Scanner as a service

Expand Down
Loading

0 comments on commit 2dae260

Please sign in to comment.