sergiotarxz/Exd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding autoclose to the printer configure.

Browse Source
This commit is contained in:
sergiotarxz 2024-10-23 18:47:46 +02:00
parent d5d6fdb063
commit 515982cdbb
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Exd/Gui/PrinterConfigure.pm
View File

@ -28,6 +28,7 @@ has _window => ( is => 'rw' );
has _bluetooth_printers => ( is => 'rw', default => sub { [] } );
has _usb_printers => ( is => 'rw', default => sub { [] });
has _cat_printers => ( is => 'rw', default => sub { [] });
has _stop_timeout => ( is => 'rw' );
sub _build__select($self) {
return IO::Select->new;
@ -37,11 +38,11 @@ sub _read_bluetooth_printers($self) {
my @fhs = $self->_select->can_read(0);
for my $fh (@fhs) {
$fh->blocking(0);
while (my $line = <$fh>) {
my @return = map {$self->instance->device_hash_to_object($_)} @{JSON::from_json($line)};
while (defined(my $line = <$fh>)) {
my @return = map {$self->app->device_hash_to_object($_)} @{JSON::from_json($line)};
$self->_bluetooth_printers(\@return);
Exd::DeviceToBluetooth->cache_printers($self->_bluetooth_printers);
}
Exd::DeviceToBluetooth->cache_printers($self->_bluetooth_printers);
}
}
@ -115,6 +116,7 @@ sub start($self) {
$self->_select->add($self->_read_from_daemon);
$self->_bluetooth_printers(Exd::DeviceToBluetooth->devices_from_cache);
Glib::Timeout->add(1000, sub {
return 0 if $self->_stop_timeout;
eval {
$self->_read_usb_printers;
$self->_read_cat_printers;
@ -122,7 +124,7 @@ sub start($self) {
$self->_update_box;
};
if ($@) {
warn $@;
die $@;
}
return 1;
});
@ -133,7 +135,8 @@ sub start($self) {
sub _update_box($self) {
my $window = $self->_window;
my $box = Gtk4::Box->new( 'vertical', 10 );
for my $device ($self->_bluetooth_printers->@*) {
my $bluetooth_printers = $self->_bluetooth_printers;
for my $device ($bluetooth_printers->@*) {
$self->_bluetoth_printer_print_to_box($device, $box);
}
for my $device ($self->_usb_printers->@*) {
@ -163,7 +166,7 @@ sub _start_daemon_bluetooth_search($self) {
}
sub _daemon_bluetooth_search_iteration($self) {
say 'Listing bluetooth devices';
# say 'Listing bluetooth devices';
if (!kill 0, $self->app->parent_pid) {
say 'Parent died at bluetooth search iteration, exiting...';
exit 1;
@ -178,13 +181,15 @@ sub _daemon_bluetooth_search_iteration($self) {
push @return, Exd::DeviceToBluetooth->new(name => $devices->{$address}, address => $address, port => $search->{RFCOMM});
}
}
# say 'Finishing listing bluetooth devices';
@return = map { $_->serialize } sort { $a->name cmp $b->name } @return;
$self->_write_to_app->print(JSON::to_json(\@return));
$self->_write_to_app->say(JSON::to_json(\@return));
$self->_write_to_app->flush;
}
sub _on_close($self) {
$self->_stop_timeout(1);
kill 'KILL', $self->_pid_daemon;
waitpid $self->_pid_daemon, 0;
$self->on_close->();