GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Updates alias list to provide a list of aliases for an identifier so that (#474)

Browse Source 
we can account for multi-alias identifiers like patch groups and ensure
that patch group alias intentions are carried throughout the system for
recording, streaming, etc.

Updates all consumers of alias list data to ensure it can operate with
a list of aliases versus an assumed single alias.

Refactors APCO25 unit/user status identifiers from a base status class
so that alias list can support status identifiers.
This commit is contained in:
Denny Sheirer
2018-12-31 07:24:25 -05:00
committed by GitHub
parent 08ea5ab7cb
commit 3a39ae76ba
23 changed files with 484 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
src/main/java/io/github/dsheirer/alias/AliasList.java
View File

@@ -32,6 +32,8 @@ import io.github.dsheirer.identifier.IdentifierCollection;
import io.github.dsheirer.identifier.esn.ESNIdentifier;
import io.github.dsheirer.identifier.patch.PatchGroup;
import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
import io.github.dsheirer.identifier.status.UnitStatusIdentifier;
import io.github.dsheirer.identifier.status.UserStatusIdentifier;
import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
import io.github.dsheirer.protocol.Protocol;
import io.github.dsheirer.sample.Listener;
@@ -39,6 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -235,11 +238,10 @@ public class AliasList implements Listener<AliasEvent>
/**
* Returns an optional alias that is associated with the identifier
* @param identifier to alias
* @return alias or null
* @return list of alias or empty list
*/
public Alias getAlias(Identifier identifier)
public List<Alias> getAliases(Identifier identifier)
{
//TODO: update this to List<Alias> return type so that we can return all of the aliases for a patch group
if(identifier != null)
{
switch(identifier.getForm())
@@ -251,7 +253,14 @@ public class AliasList implements Listener<AliasEvent>
if(talkgroupAliasList != null)
{
return talkgroupAliasList.getAlias(talkgroup);
Alias alias = talkgroupAliasList.getAlias(talkgroup);
if(alias != null)
{
List<Alias> aliases = new ArrayList<>();
aliases.add(alias);
return aliases;
}
}
break;
case PATCH_GROUP:
@@ -262,12 +271,13 @@ public class AliasList implements Listener<AliasEvent>
if(patchGroupAliasList != null)
{
//TODO: make this a list of aliases that match the patch group - right now it just returns the first-matched
List<Alias> aliases = new ArrayList<>();
Alias alias = patchGroupAliasList.getAlias(patchGroup.getPatchGroup());
if(alias != null)
{
return alias;
aliases.add(alias);
}
for(TalkgroupIdentifier patchedGroup: patchGroup.getPatchedGroupIdentifiers())
@@ -276,21 +286,60 @@ public class AliasList implements Listener<AliasEvent>
if(patchedAlias != null)
{
return patchedAlias;
aliases.add(patchedAlias);
}
}
return aliases;
}
break;
case ESN:
if(identifier instanceof ESNIdentifier)
{
return getESNAlias(((ESNIdentifier)identifier).getValue());
Alias alias = getESNAlias(((ESNIdentifier)identifier).getValue());
if(alias != null)
{
List<Alias> aliases = new ArrayList<>();
aliases.add(alias);
return aliases;
}
}
break;
case UNIT_STATUS:
if(identifier instanceof UnitStatusIdentifier)
{
int status = ((UnitStatusIdentifier)identifier).getValue();
Alias alias = mStatusMap.get(status);
if(alias != null)
{
List<Alias> aliases = new ArrayList<>();
aliases.add(alias);
return aliases;
}
}
break;
case USER_STATUS:
if(identifier instanceof UserStatusIdentifier)
{
int status = ((UserStatusIdentifier)identifier).getValue();
Alias alias = mStatusMap.get(status);
if(alias != null)
{
List<Alias> aliases = new ArrayList<>();
aliases.add(alias);
return aliases;
}
}
break;
}
}
return null;
return Collections.EMPTY_LIST;
}
/**
@@ -302,11 +351,14 @@ public class AliasList implements Listener<AliasEvent>
{
for(Identifier identifier: identifierCollection.getIdentifiers())
{
Alias alias = getAlias(identifier);
List<Alias> aliases = getAliases(identifier);
if(alias != null && alias.isStreamable())
for(Alias alias: aliases)
{
return true;
if(alias != null && alias.isStreamable())
{
return true;
}
}
}
@@ -322,11 +374,14 @@ public class AliasList implements Listener<AliasEvent>
{
for(Identifier identifier: identifierCollection.getIdentifiers())
{
Alias alias = getAlias(identifier);
List<Alias> aliases = getAliases(identifier);
if(alias != null && alias.isRecordable())
for(Alias alias: aliases)
{
return true;
if(alias != null && alias.isRecordable())
{
return true;
}
}
}
@@ -354,11 +409,14 @@ public class AliasList implements Listener<AliasEvent>
for(Identifier identifier: identifierCollection.getIdentifiers())
{
Alias alias = getAlias(identifier);
List<Alias> aliases = getAliases(identifier);
if(alias != null && alias.getPlaybackPriority() < priority)
for(Alias alias: aliases)
{
priority = alias.getPlaybackPriority();
if(alias != null && alias.getPlaybackPriority() < priority)
{
priority = alias.getPlaybackPriority();
}
}
}
@@ -376,15 +434,18 @@ public class AliasList implements Listener<AliasEvent>
for(Identifier identifier: identifierCollection.getIdentifiers())
{
Alias alias = getAlias(identifier);
List<Alias> aliases = getAliases(identifier);
if(alias != null && alias.isStreamable())
for(Alias alias: aliases)
{
for(BroadcastChannel broadcastChannel: alias.getBroadcastChannels())
if(alias != null && alias.isStreamable())
{
if(!channels.contains(broadcastChannel))
for(BroadcastChannel broadcastChannel: alias.getBroadcastChannels())
{
channels.add(broadcastChannel);
if(!channels.contains(broadcastChannel))
{
channels.add(broadcastChannel);
}
}
}
}

20
src/main/java/io/github/dsheirer/alias/action/AliasActionManager.java
View File

@@ -1,6 +1,7 @@
/*******************************************************************************
/*
* ******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
* Copyright (C) 2014-2018 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
* *****************************************************************************
*/
package io.github.dsheirer.alias.action;
import io.github.dsheirer.alias.Alias;
@@ -56,13 +57,16 @@ public class AliasActionManager extends Module implements IMessageListener, List
for(Identifier identifier: identifiers)
{
Alias alias = mAliasList.getAlias(identifier);
List<Alias> aliases = mAliasList.getAliases(identifier);
if(alias != null && alias.hasActions())
for(Alias alias: aliases)
{
for(AliasAction action: alias.getAction())
if(alias != null && alias.hasActions())
{
action.execute(alias, message);
for(AliasAction action: alias.getAction())
{
action.execute(alias, message);
}
}
}
}