Archive/rdio-scanner
1
0
Fork 0
mirror of https://github.com/chuot/rdio-scanner.git synced 2026-08-13 16:33:01 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Version 6.1.9

Browse source
This commit is contained in:
Chrystian Huot 2022-02-01 09:41:05 -05:00
parent 97b5834734
commit d47169eaf4
16 changed files with 127 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -61,6 +61,11 @@ _v6.1.8_
- New dirwatch masks #TGHZ, #TGKHZ and #TGMHZ which allow to set talkgroup id based on frequency.
_v6.1.9_
- Fix talkgroup sorting issue when importing from a CSV file (issue #119).
- Fix SIGSEGV (issue #120).
## Version 6.0
- Backend server rewritten in Go for better performance and ease of installation.

16
COMPILING.md
View file

@ -24,13 +24,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.1.8.zip
rdio-scanner-darwin-arm64-v6.1.8.zip
rdio-scanner-freebsd-amd64-v6.1.8.zip
rdio-scanner-linux-386-v6.1.8.zip
rdio-scanner-linux-amd64-v6.1.8.zip
rdio-scanner-linux-arm64-v6.1.8.zip
rdio-scanner-linux-arm-v6.1.8.zip
rdio-scanner-windows-amd64-v6.1.8.zip
rdio-scanner-darwin-amd64-v6.1.9.zip
rdio-scanner-darwin-arm64-v6.1.9.zip
rdio-scanner-freebsd-amd64-v6.1.9.zip
rdio-scanner-linux-386-v6.1.9.zip
rdio-scanner-linux-amd64-v6.1.9.zip
rdio-scanner-linux-arm64-v6.1.9.zip
rdio-scanner-linux-arm-v6.1.9.zip
rdio-scanner-windows-amd64-v6.1.9.zip
**Happy Rdio scanning !**

4
Makefile
View file

@ -16,8 +16,8 @@
################################################################################
app := rdio-scanner
date := 2022/01/28
ver := 6.1.8
date := 2022/02/01
ver := 6.1.9
client := $(wildcard client/*.json client/*.ts)
server := $(wildcard server/*.go)

2
client/package.json
View file

@ -38,5 +38,5 @@
"build": "ng build --base-href ./ --configuration production",
"start": "ng serve"
},
"version": "6.1.8"
"version": "6.1.9"
}

3
client/src/app/components/rdio-scanner/admin/tools/import-talkgroups/import-talkgroups.component.ts
View file

@ -63,7 +63,7 @@ export class RdioScannerAdminImportTalkgroupsComponent {
}
});
const talkgroups = this.csv.map((csv) => {
const talkgroups = this.csv.map((csv, idx) => {
const groupId = config.groups?.find((g) => g.label === csv[this.fields[this.mode][4]])?._id;
const tagId = config.tags?.find((t) => t.label === csv[this.fields[this.mode][3]])?._id;
@ -71,6 +71,7 @@ export class RdioScannerAdminImportTalkgroupsComponent {
id: +csv[this.fields[this.mode][0]],
label: csv[this.fields[this.mode][1]],
name: csv[this.fields[this.mode][2]],
order: idx + 1,
tagId,
groupId,
};

3
client/src/app/components/rdio-scanner/admin/tools/import-units/import-units.component.ts
View file

@ -49,9 +49,10 @@ export class RdioScannerAdminImportUnitsComponent implements OnInit{
async import(): Promise<void> {
if (this.system === undefined) return;
const units = this.csv.map((csv) => ({
const units = this.csv.map((csv, idx) => ({
id: +csv[0],
label: csv[1],
order: idx + 1,
}));
this.system!.units = this.system!.units!.concat(units);

2
client/src/app/pages/rdio-scanner/admin/admin.component.html
View file

@ -1,4 +1,4 @@
<h1 class="mat-display-2">Rdio Scanner server administration</h1>
<h1 class="mat-h1">Rdio Scanner server v{{version}}</h1>
<div>
<mat-card>
<rdio-scanner-admin></rdio-scanner-admin>

7
client/src/app/pages/rdio-scanner/admin/admin.component.scss
View file

@ -6,17 +6,14 @@
padding: 16px;
> div {
margin: auto;
margin: 16px auto;
max-width: 1200px;
}
> h1 {
color: #2d2d2d;
letter-spacing: 0.01rem;
color: #ccc;
margin: 0;
padding: 16px 0;
text-align: center;
text-shadow: 1px 1px 2px rgba(255, 255, 255, 0.83);
}
}

5
client/src/app/pages/rdio-scanner/admin/admin.component.ts
View file

@ -18,10 +18,13 @@
*/
import { Component } from '@angular/core';
import packageInfo from '../../../../../package.json';
@Component({
selector: 'rdio-scanner-admin-page',
styleUrls: ['./admin.component.scss'],
templateUrl: './admin.component.html',
})
export class RdioScannerAdminPageComponent { }
export class RdioScannerAdminPageComponent {
version = packageInfo.version;
}

46
docs/platforms/darwin.md
View file

@ -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.1.8.zip
Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.1.8.zip
> ~/Downloads/rdio-scanner-darwin-arm64-v6.1.9.zip
Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.1.9.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.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 08:38:06 server started
2022/01/28 08:38:06 main interface at http://macos.local:3000
2022/01/28 08:38:06 admin interface at http://macos.local:3000/admin
2022/02/01 08:38:06 server started
2022/02/01 08:38:06 main interface at http://macos.local:3000
2022/02/01 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.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 08:48:03 server started
2022/01/28 08:48:03 main interface at http://macos.local
2022/01/28 08:48:03 admin interface at http://macos.local/admin
2022/02/01 08:48:03 server started
2022/02/01 08:48:03 main interface at http://macos.local
2022/02/01 08:48:03 admin interface at http://macos.local/admin
## Listening with SSL with self-signed certificates
@ -90,8 +90,8 @@ It is advised to share your [Rdio Scanner](https://github.com/chuot/rdio-scanner
We can create such self-signed certificates by running [Rdio Scanner](https://github.com/chuot/rdio-scanner) with the **-ssl_create** argument.
rdio@macos rdio-scanner % ./rdio-scanner -ssl_create
2022/01/28 08:49:16 generating ssl certificate files
2022/01/28 08:49:17 ssl files created
2022/02/01 08:49:16 generating ssl certificate files
2022/02/01 08:49:17 ssl files created
This has generated these files in the same folder as your [Rdio Scanner](https://github.com/chuot/rdio-scanner) executable.
@ -108,12 +108,12 @@ Now we use the self-signed server certificate to run our instance.
> -ssl_key_file server.key \
> -ssl_listen :443
Rdio Scanner v6.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 08:50:58 server started
2022/01/28 08:50:58 main interface at http://macos.local
2022/01/28 08:50:58 main interface at https://macos.local
2022/01/28 08:50:58 admin interface at https://macos.local/admin
2022/02/01 08:50:58 server started
2022/02/01 08:50:58 main interface at http://macos.local
2022/02/01 08:50:58 main interface at https://macos.local
2022/02/01 08:50:58 admin interface at https://macos.local/admin
## Save your advanced configuration to a config file
@ -125,7 +125,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y
> -ssl_key_file server.key \
> -ssl_listen :443 \
> -config_save
2022/01/28 08:52:24 rdio-scanner.ini file created
2022/02/01 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.
@ -140,12 +140,12 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an
rdio@macos rdio-scanner % ./rdio-scanner
Rdio Scanner v6.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 08:54:08 server started
2022/01/28 08:54:08 main interface at http://macos.local
2022/01/28 08:54:08 main interface at https://macos.local
2022/01/28 08:54:08 admin interface at https://macos.local/admin
2022/02/01 08:54:08 server started
2022/02/01 08:54:08 main interface at http://macos.local
2022/02/01 08:54:08 main interface at https://macos.local
2022/02/01 08:54:08 admin interface at https://macos.local/admin
## Install Rdio Scanner as a service

46
docs/platforms/freebsd.md
View file

@ -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.1.8.zip
Archive: ../rdio-scanner-freebsd-amd64-v6.1.8.zip
> ~/rdio-scanner-freebsd-amd64-v6.1.9.zip
Archive: ../rdio-scanner-freebsd-amd64-v6.1.9.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.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 08:16:36 server started
2022/01/28 08:16:36 main interface at http://pc-freebsd:3000
2022/01/28 08:16:36 admin interface at http://pc-freebsd:3000/admin
2022/02/01 08:16:36 server started
2022/02/01 08:16:36 main interface at http://pc-freebsd:3000
2022/02/01 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.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 08:19:38 server started
2022/01/28 08:19:38 main interface at http://pc-freebsd
2022/01/28 08:19:38 admin interface at http://pc-freebsd/admin
2022/02/01 08:19:38 server started
2022/02/01 08:19:38 main interface at http://pc-freebsd
2022/02/01 08:19:38 admin interface at http://pc-freebsd/admin
## Listening with SSL with self-signed certificates
@ -94,8 +94,8 @@ It is advised to share your [Rdio Scanner](https://github.com/chuot/rdio-scanner
We can create such self-signed certificates by running [Rdio Scanner](https://github.com/chuot/rdio-scanner) with the **-ssl_create** argument.
rdio@pc-freebsd:~/rdio-scanner $ ./rdio-scanner -ssl_create
2022/01/28 10:32:17 generating ssl certificate files
2022/01/28 10:32:19 ssl files created
2022/02/01 10:32:17 generating ssl certificate files
2022/02/01 10:32:19 ssl files created
This has generated these files in the same folder as your [Rdio Scanner](https://github.com/chuot/rdio-scanner) executable.
@ -114,12 +114,12 @@ Now we use the self-signed server certificate to run our instance.
> -ssl_key_file server.key \
> -ssl_listen :443
Rdio Scanner v6.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 10:34:29 server started
2022/01/28 10:34:29 main interface at http://pc-freebsd
2022/01/28 10:34:29 main interface at https://pc-freebsd
2022/01/28 10:34:29 admin interface at https://pc-freebsd/admin
2022/02/01 10:34:29 server started
2022/02/01 10:34:29 main interface at http://pc-freebsd
2022/02/01 10:34:29 main interface at https://pc-freebsd
2022/02/01 10:34:29 admin interface at https://pc-freebsd/admin
## Save your advanced configuration to a config file
@ -131,7 +131,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y
> -ssl_key_file server.key \
> -ssl_listen :443 \
> -config_save
2022/01/28 10:37:00 rdio-scanner.ini file created
2022/02/01 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.
@ -148,12 +148,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.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 10:38:28 server started
2022/01/28 10:38:29 main interface at http://pc-freebsd
2022/01/28 10:38:29 main interface at https://pc-freebsd
2022/01/28 10:38:29 admin interface at https://pc-freebsd/admin
2022/02/01 10:38:28 server started
2022/02/01 10:38:29 main interface at http://pc-freebsd
2022/02/01 10:38:29 main interface at https://pc-freebsd
2022/02/01 10:38:29 admin interface at https://pc-freebsd/admin
## Install Rdio Scanner as a service

46
docs/platforms/linux.md
View file

@ -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.1.8.zip
Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.1.8.zip
> ~/Downloads/rdio-scanner-linux-amd64-v6.1.9.zip
Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.1.9.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.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 09:11:48 server started
2022/01/28 09:11:48 main interface at http://pc-linux:3000
2022/01/28 09:11:48 admin interface at http://pc-linux:3000/admin
2022/02/01 09:11:48 server started
2022/02/01 09:11:48 main interface at http://pc-linux:3000
2022/02/01 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.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 09:14:00 server started
2022/01/28 09:14:00 main interface at http://pc-linux
2022/01/28 09:14:00 admin interface at http://pc-linux/admin
2022/02/01 09:14:00 server started
2022/02/01 09:14:00 main interface at http://pc-linux
2022/02/01 09:14:00 admin interface at http://pc-linux/admin
## Listening with SSL with self-signed certificates
@ -91,8 +91,8 @@ It is advised to share your [Rdio Scanner](https://github.com/chuot/rdio-scanner
We can create such self-signed certificates by running [Rdio Scanner](https://github.com/chuot/rdio-scanner) with the **-ssl_create** argument.
[rdio@pc-linux rdio-scanner]$ ./rdio-scanner -ssl_create
2022/01/28 09:15:03 generating ssl certificate files
2022/01/28 09:15:05 ssl files created
2022/02/01 09:15:03 generating ssl certificate files
2022/02/01 09:15:05 ssl files created
This has generated these files in the same folder as your [Rdio Scanner](https://github.com/chuot/rdio-scanner) executable.
@ -110,12 +110,12 @@ Now we use the self-signed server certificate to run our instance.
> -ssl_listen :443
[sudo] password for rdio:
Rdio Scanner v6.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 09:16:47 server started
2022/01/28 09:16:47 main interface at http://pc-linux
2022/01/28 09:16:47 main interface at https://pc-linux
2022/01/28 09:16:47 admin interface at https://pc-linux/admin
2022/02/01 09:16:47 server started
2022/02/01 09:16:47 main interface at http://pc-linux
2022/02/01 09:16:47 main interface at https://pc-linux
2022/02/01 09:16:47 admin interface at https://pc-linux/admin
## Save your advanced configuration to a config file
@ -127,7 +127,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y
> -ssl_key_file server.key \
> -ssl_listen :443 \
> -config_save
2022/01/28 09:19:29 rdio-scanner.ini file created
2022/02/01 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.
@ -143,12 +143,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.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 09:20:40 server started
2022/01/28 09:20:40 main interface at http://pc-linux
2022/01/28 09:20:40 main interface at https://pc-linux
2022/01/28 09:20:40 admin interface at https://pc-linux/admin
2022/02/01 09:20:40 server started
2022/02/01 09:20:40 main interface at http://pc-linux
2022/02/01 09:20:40 main interface at https://pc-linux
2022/02/01 09:20:40 admin interface at https://pc-linux/admin
## Install Rdio Scanner as a service

44
docs/platforms/windows.md
View file

@ -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.1.8.zip
..\downloads\rdio-scanner-windows-amd64-v6.1.9.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.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 13:48:48 server started
2022/01/28 13:48:48 main interface at http://pc-windows:3000
2022/01/28 13:48:48 admin interface at http://pc-windows:3000/admin
2022/02/01 13:48:48 server started
2022/02/01 13:48:48 main interface at http://pc-windows:3000
2022/02/01 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.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 10:53:31 server started
2022/01/28 10:53:31 main interface at http://pc-windows
2022/01/28 10:53:31 admin interface at http://pc-windows/admin
2022/02/01 10:53:31 server started
2022/02/01 10:53:31 main interface at http://pc-windows
2022/02/01 10:53:31 admin interface at http://pc-windows/admin
## Listening with SSL with self-signed certificates
@ -91,8 +91,8 @@ It is advised to share your [Rdio Scanner](https://github.com/chuot/rdio-scanner
We can create such self-signed certificates by running [Rdio Scanner](https://github.com/chuot/rdio-scanner) with the **-ssl_create** argument.
C:\Users\rdio\rdio-scanner>rdio-scanner -ssl_create
2022/01/28 10:58:51 generating ssl certificate files
2022/01/28 10:58:54 ssl files created
2022/02/01 10:58:51 generating ssl certificate files
2022/02/01 10:58:54 ssl files created
This has generated these files in the same folder as your [Rdio Scanner](https://github.com/chuot/rdio-scanner) executable.
@ -109,12 +109,12 @@ Now we use the self-signed server certificate to run our instance.
-ssl_key_file server.key ^
-ssl_listen :443
Rdio Scanner v6.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 11:05:43 server started
2022/01/28 11:05:43 main interface at http://pc-windows
2022/01/28 11:05:43 main interface at https://pc-windows
2022/01/28 11:05:43 admin interface at https://pc-windows/admin
2022/02/01 11:05:43 server started
2022/02/01 11:05:43 main interface at http://pc-windows
2022/02/01 11:05:43 main interface at https://pc-windows
2022/02/01 11:05:43 admin interface at https://pc-windows/admin
## Save your advanced configuration to a config file
@ -126,7 +126,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y
-ssl_key_file server.key ^
-ssl_listen :443 ^
-config_save
2022/01/28 11:08:28 rdio-scanner.ini file created
2022/02/01 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.
@ -141,12 +141,12 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an
C:\Users\rdio\rdio-scanner>rdio-scanner
Rdio Scanner v6.1.8
Rdio Scanner v6.1.9
----------------------------------
2022/01/28 11:11:28 server started
2022/01/28 11:11:28 main interface at http://pc-windows
2022/01/28 11:11:28 main interface at https://pc-windows
2022/01/28 11:11:28 admin interface at https://pc-windows/admin
2022/02/01 11:11:28 server started
2022/02/01 11:11:28 main interface at http://pc-windows
2022/02/01 11:11:28 main interface at https://pc-windows
2022/02/01 11:11:28 admin interface at https://pc-windows/admin
\pagebreak{}

6
server/controller.go
View file

@ -195,7 +195,7 @@ func (controller *Controller) IngestCall(call *Call) {
talkgroup, _ = system.Talkgroups.GetTalkgroup(call.Talkgroup)
}
if system == nil && controller.Options.AutoPopulate {
if controller.Options.AutoPopulate && system == nil {
populated = true
system = NewSystem()
@ -211,7 +211,7 @@ func (controller *Controller) IngestCall(call *Call) {
controller.Systems.List = append(controller.Systems.List, system)
}
if controller.Options.AutoPopulate || system.AutoPopulate {
if controller.Options.AutoPopulate || (system != nil && system.AutoPopulate) {
if system != nil && talkgroup == nil {
populated = true
@ -317,9 +317,7 @@ func (controller *Controller) IngestCall(call *Call) {
talkgroup.Name = talkgroup.Label
}
}
}
if controller.Options.AutoPopulate || (system != nil && system.AutoPopulate) {
switch v := call.units.(type) {
case Units:
populated = true

6
server/unit.go
View file

@ -40,6 +40,12 @@ func (unit *Unit) FromMap(m map[string]interface{}) {
case string:
unit.Label = v
}
switch v := m["order"].(type) {
case float64:
unit.Order = uint(v)
}
}
type Units struct {

2
server/version.go
View file

@ -15,4 +15,4 @@
package main
const Version = "6.1.8"
const Version = "6.1.9"