sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#58709 rework NGCP::Utils::Sound::get_handlers_rs

Browse Source 
* get_handlers_rs() is renamed into get_file_handles() and
  reworked from an indented 'from' resultset into 2 separate
  resultsets, one fetching all the handles and another one
  files for the sound set, it is now returned as an array with the
  similar data. Reason for this rework is the deprecated use of
  'from', that resulted in a lot of warnings in panel-fcgi.log:

DBIx::Class::SQLMaker::ClassicExtensions::_join_condition():
ResultSet {from} structures with conditions not conforming to the
SQL::Abstract::Classic syntax are deprecated: you either need to
stop abusing {from} altogether, or express the condition properly
using the { -ident => ... }

* adjust file_handles data key names to better follow the
  naming conventions and readability, e.g.: groupname -> group_name,
  fileid -> file_id

Change-Id: Ia91c9104c0b4dc79ee5bc359eb0b6e035e56ef3e
(cherry picked from commit a4d54b10e4)
mr12.0.1
Kirill Solomko 1 year ago
parent a1f5a8b20e
commit fcfcb613d7
5 changed files with 93 additions and 68 deletions
Show Stats Download Patch File Download Diff File

4
lib/NGCP/Panel/Controller/API/SoundSets.pm
Unescape View File

@ -66,12 +66,12 @@ sub create_item {
}
if ($copy_from_default_params->{copy_from_default}) {
my $error;
my $handles_rs = NGCP::Panel::Utils::Sounds::get_handles_rs(c => $c, set_rs => $item);
my $file_handles = NGCP::Panel::Utils::Sounds::get_file_handles(c => $c, set_id => $item->id);
NGCP::Panel::Utils::Sounds::apply_default_soundset_files(
c => $c,
lang => $copy_from_default_params->{language},
set_id => $item->id,
handles_rs => $handles_rs,
file_handles => $file_handles,
loopplay => $copy_from_default_params->{loopplay},
override => $copy_from_default_params->{replace_existing},
error_ref => \$error,

4
lib/NGCP/Panel/Controller/API/SoundSetsItem.pm
Unescape View File

@ -35,12 +35,12 @@ sub update_item_model {
$item->update($resource);
if ($copy_from_default_params->{copy_from_default}) {
my $error;
my $handles_rs = NGCP::Panel::Utils::Sounds::get_handles_rs(c => $c, set_rs => $item);
my $file_handles = NGCP::Panel::Utils::Sounds::get_file_handles(c => $c, set_id => $item->id);
NGCP::Panel::Utils::Sounds::apply_default_soundset_files(
c => $c,
lang => $copy_from_default_params->{language},
set_id => $item->id,
handles_rs => $handles_rs,
file_handles => $file_handles,
loopplay => $copy_from_default_params->{loopplay},
override => $copy_from_default_params->{replace_existing},
error_ref => \$error,

24
lib/NGCP/Panel/Controller/Sound.pm
Unescape View File

@ -11,6 +11,7 @@ use File::Type;
use NGCP::Panel::Utils::Sounds;
use NGCP::Panel::Utils::Navigation;
use NGCP::Panel::Utils::Sems;
use List::Util qw(any);
sub auto :Private {
my ($self, $c) = @_;
@ -504,18 +505,18 @@ sub handles_list :Chained('base') :PathPart('handles') :CaptureArgs(0) {
$c->stash(handles_base_uri =>
$c->uri_for_action("/sound/handles_root", [$c->req->captures->[0]]));
my $handles_rs = NGCP::Panel::Utils::Sounds::get_handles_rs(c => $c, set_rs => $c->stash->{set_result});
my @rows = $handles_rs->all;
my $set_id = $c->stash->{set_result}->id;
my $file_handles = NGCP::Panel::Utils::Sounds::get_file_handles(c => $c, set_id => $set_id);
my %groups;
for my $handle (@rows) {
$groups{ $handle->get_column('groupname') } = []
unless exists $groups{ $handle->get_column('groupname') };
push @{ $groups{ $handle->get_column('groupname') } }, $handle;
for my $handle (@{$file_handles}) {
my $group_name = $handle->{group_name};
my $group = $groups{$group_name} //= [];
push @{$group}, $handle;
}
$c->stash(sound_groups => \%groups);
$c->stash(handles_rs => $handles_rs);
$c->stash(file_handles => $file_handles);
$c->stash(has_edit => 1);
$c->stash(has_delete => 1);
@ -538,8 +539,9 @@ sub handles_base :Chained('handles_list') :PathPart('') :CaptureArgs(1) {
);
NGCP::Panel::Utils::Navigation::back_or($c, $c->stash->{handles_base_uri});
}
my @tmph = $c->stash->{handles_rs}->all;
unless($c->stash->{handles_rs}->find({ 'handles.id' => $handle_id })) {
my $file_handles = $c->stash->{file_handles};
my $handle_exists = any { $_->{handle_id} == $handle_id } @{$file_handles};
unless ($handle_exists) {
NGCP::Panel::Utils::Message::error(
c => $c,
log => 'Sound handle id does not exist',
@ -783,7 +785,7 @@ sub handles_load_default :Chained('handles_list') :PathPart('loaddefault') :Args
c => $c,
lang => $form->params->{language},
set_id => $c->stash->{set_result}->id,
handles_rs => $c->stash->{handles_rs},
file_handles => $c->stash->{file_handles},
loopplay => $form->params->{loopplay},
override => $form->params->{replace_existing},
error_ref => \$error,

101
lib/NGCP/Panel/Utils/Sounds.pm
Unescape View File

@ -161,64 +161,87 @@ sub stash_soundset_list {
return;
}
sub get_handles_rs {
sub get_file_handles {
my (%params) = @_;
my $c = $params{c};
my $set_rs = $params{set_rs};
my $handles_rs = $c->model('DB')->resultset('voip_sound_groups')
->search({
},{
select => ['groups.name', \'handles.name', \'handles.id', 'files.filename', 'files.loopplay', 'files.codec', 'files.id',
\'IF(files.use_parent IS NOT NULL, files.use_parent, 1)'],
as => [ 'groupname', 'handlename', 'handleid', 'filename', 'loopplay', 'codec', 'fileid', 'use_parent'],
alias => 'groups',
from => [
{ groups => 'provisioning.voip_sound_groups' },
[
{ handles => 'provisioning.voip_sound_handles', -join_type=>'left'},
{ 'groups.id' => 'handles.group_id'},
],
[
{ files => 'provisioning.voip_sound_files', -join_type => 'left'},
{ 'handles.id' => { '=' => \'files.handle_id'}, 'files.set_id' => $set_rs->id},
],
],
order_by => { -asc => 'handles.name' }
});
my $set_id = $params{set_id};
my @file_handles = ();
my $handles_rs = $c->model('DB')->resultset('voip_sound_handles')->search({
},{
alias => 'handles',
select => [
'group.name','handles.name', 'handles.id',
],
as => [
'group_name', 'handle_name', 'handle_id',
],
join => 'group',
order_by => { -asc => 'handles.name' }
});
unless($c->config->{features}->{cloudpbx}) {
$handles_rs = $handles_rs->search({ 'groups.name' => { '!=' => 'pbx' } });
$handles_rs = $handles_rs->search({ 'group.name' => { '!=' => 'pbx' } });
}
unless($c->config->{features}->{cloudpbx} || $c->config->{features}->{musiconhold}) {
$handles_rs = $handles_rs->search({ 'groups.name' => { '!=' => 'music_on_hold' } });
$handles_rs = $handles_rs->search({ 'group.name' => { '!=' => 'music_on_hold' } });
}
unless($c->config->{features}->{callingcard}) {
$handles_rs = $handles_rs->search({ 'groups.name' => { '!=' => 'calling_card' } });
$handles_rs = $handles_rs->search({ 'group.name' => { '!=' => 'calling_card' } });
}
unless($c->config->{features}->{mobilepush}) {
$handles_rs = $handles_rs->search({ 'groups.name' => { '!=' => 'mobile_push' } });
$handles_rs = $handles_rs->search({ 'group.name' => { '!=' => 'mobile_push' } });
}
my $files_rs = $c->model('DB')->resultset('voip_sound_files')->search({
'me.set_id' => $set_id,
});
my %files = ();
foreach my $file ($files_rs->all) {
$files{$file->handle_id} = {
filename => $file->filename,
loopplay => $file->loopplay,
codec => $file->codec,
file_id => $file->id,
use_parent => $file->use_parent // 1,
}
}
return $handles_rs;
foreach my $handle ($handles_rs->all) {
my %file_handle = $handle->get_inflated_columns;
my $file = $files{$file_handle{handle_id}} // {
filename => undef,
loopplay => undef,
codec => undef,
file_id => undef,
use_parent => undef,
};
push @file_handles, {%file_handle, %{$file}};
}
return \@file_handles;
}
sub apply_default_soundset_files{
my (%params) = @_;
my ($c, $lang, $set_id, $handles_rs, $loopplay, $override, $error_ref) = @params{qw/c lang set_id handles_rs loopplay override error_ref/};
my ($c, $lang, $set_id, $file_handles, $loopplay, $override, $error_ref) = @params{qw/c lang set_id file_handles loopplay override error_ref/};
$loopplay = $loopplay ? 1 : 0;
my $schema = $c->model('DB');
my $base = "/var/lib/ngcp-soundsets";
foreach my $h($handles_rs->all) {
my $hname = $h->get_column("handlename");
foreach my $h (@{$file_handles}) {
my $handle_name = $h->{handle_name};
my @paths = (
"$base/system/$lang/$hname.wav",
"$base/customer/$lang/$hname.wav",
"/var/lib/asterisk/sounds/$lang/digits/$hname.wav",
"$base/system/$lang/$handle_name.wav",
"$base/customer/$lang/$handle_name.wav",
"/var/lib/asterisk/sounds/$lang/digits/$handle_name.wav",
);
my $path;
foreach my $p(@paths) {
@ -231,8 +254,8 @@ sub apply_default_soundset_files{
my $data_ref;
my $codec = 'WAV';
my $handle_id = $h->get_column("handleid");
my $file_id = $h->get_column("fileid");
my $handle_id = $h->{handle_id};
my $file_id = $h->{file_id};
my $fres;
my $fname = basename($path);
@ -243,7 +266,7 @@ sub apply_default_soundset_files{
}
if (defined $file_id) {
if ($override) {
$c->log->debug("override $path as $hname for existing id $file_id");
$c->log->debug("override $path as $handle_name for existing id $file_id");
$fres = $schema->resultset('voip_sound_files')->find($file_id);
$fres->update({
@ -252,10 +275,10 @@ sub apply_default_soundset_files{
loopplay => $loopplay,
});
} else {
$c->log->debug("skip $path as $hname exists via id $file_id and override is not set");
$c->log->debug("skip $path as $handle_name exists via id $file_id and override is not set");
}
} else {
$c->log->debug("inserting $path as $hname with new id");
$c->log->debug("inserting $path as $handle_name with new id");
$fres = $schema->resultset('voip_sound_files')
->create({

28
share/templates/sound/handles_list.tt
Unescape View File

@ -52,38 +52,38 @@
[% FOREACH r IN group.value %]
<tr class="sw_action_row">
<td>
[% r.get_column("handlename") %]
[% r.handle_name %]
</td>
<td>
[% r.get_column("fileid")
? r.get_column("filename")
? r.get_column("filename") : c.loc("(empty)")
[% r.file_id
? r.filename
? r.filename : c.loc("(empty)")
: ''
%]
</td>
<td>
<input type="checkbox" disabled="disabled" [% r.get_column('loopplay') ? 'checked="checked"' : '' %]>
<input type="checkbox" disabled="disabled" [% r.loopplay ? 'checked="checked"' : '' %]>
</td>
[% IF set_result.parent_id -%]
<td>
<input type="checkbox" disabled="disabled" [% r.get_column('use_parent') == 0 ? '' : 'checked="checked"' %]>
<input type="checkbox" disabled="disabled" [% r.use_parent == 0 ? '' : 'checked="checked"' %]>
</td>
[% END -%]
<td>
<div class="sw_actions pull-right">
[% IF r.get_column("filename").size -%]
[% IF r.filename.size -%]
[% IF can_edit_handles -%]
<a class="btn btn-small btn-primary" href="[% handles_base_uri _ "/" _ r.get_column("handleid") _ "/edit" %]"><i class="icon-edit"></i> [% c.loc('Edit') %]</a>
<a class="btn btn-small btn-secondary" data-confirm="Delete" href="[% handles_base_uri _ "/" _ r.get_column("handleid") _ "/delete" %]"><i class="icon-edit"></i> [% c.loc('Delete') %]</a>
<a class="btn btn-small btn-primary" href="[% handles_base_uri _ "/" _ r.handle_id _ "/edit" %]"><i class="icon-edit"></i> [% c.loc('Edit') %]</a>
<a class="btn btn-small btn-secondary" data-confirm="Delete" href="[% handles_base_uri _ "/" _ r.handle_id _ "/delete" %]"><i class="icon-edit"></i> [% c.loc('Delete') %]</a>
[% END -%]
<a class="btn btn-small btn-tertiary" href="[% c.uri_for_action('/sound/handles_download', [c.req.captures.0, r.get_column('handleid')]) %]"><i class="icon-play"></i> [% c.loc('Play') %]</a>
[% ELSIF r.get_column("fileid") -%]
<a class="btn btn-small btn-tertiary" href="[% c.uri_for_action('/sound/handles_download', [c.req.captures.0, r.handle_id]) %]"><i class="icon-play"></i> [% c.loc('Play') %]</a>
[% ELSIF r.file_id -%]
[% IF can_edit_handles -%]
<a class="btn btn-small btn-primary" href="[% handles_base_uri _ "/" _ r.get_column("handleid") _ "/edit" %]"><i class="icon-edit"></i> [% c.loc('Edit') %]</a>
<a class="btn btn-small btn-secondary" data-confirm="Delete" href="[% handles_base_uri _ "/" _ r.get_column("handleid") _ "/delete" %]"><i class="icon-edit"></i> [% c.loc('Delete') %]</a>
<a class="btn btn-small btn-primary" href="[% handles_base_uri _ "/" _ r.handle_id _ "/edit" %]"><i class="icon-edit"></i> [% c.loc('Edit') %]</a>
<a class="btn btn-small btn-secondary" data-confirm="Delete" href="[% handles_base_uri _ "/" _ r.handle_id _ "/delete" %]"><i class="icon-edit"></i> [% c.loc('Delete') %]</a>
[% END -%]
[% ELSIF can_edit_handles -%]
<a class="btn btn-small btn-primary" href="[% handles_base_uri _ "/" _ r.get_column("handleid") _ "/edit" %]"><i class="icon-edit"></i> [% c.loc('Add') %]</a>
<a class="btn btn-small btn-primary" href="[% handles_base_uri _ "/" _ r.handle_id _ "/edit" %]"><i class="icon-edit"></i> [% c.loc('Add') %]</a>
[% END -%]
</div>
</td>

Write Preview
Loading…
Cancel
Save