From 38a9c88e36fe3fa45b4192efd73d890c1ad17201 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Tue, 27 Mar 2018 23:25:43 +0100 Subject: New release So, following initial feedback, I've made a few changes: - incomplete names and simple wildcards (? and *) are accepted in the RPMs box - the Clear button just clears the RPMs box (use the Update button to clear the local repo as well) - the current status is shown, which can be one of Enabled : 'QA Testing' is enabled in the urpmi media and the local repo contains what you see in the GUI Needs update : 'QA Testing' is enabled in the urpmi media, but the local repo is out of sync with what you see Updating : what it says Update failed : one or more of the requested RPMs couldn't be fetched from the remote repo (or some other error occurred). You can try updating again in case it was a temporary download error Disabled : 'QA Testing' has been removed from the urpmi media (but the local repo remains intact) - the dual-function button is now Enable/Update, depending on the current status (this should all become clear when you use the app.). In reality it does exactly the same thing in both cases - it's just another visual clue to show whether or not the local repo is in sync --- qarepo.pl | 271 +++++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 196 insertions(+), 75 deletions(-) (limited to 'qarepo.pl') diff --git a/qarepo.pl b/qarepo.pl index 877602c..957ce12 100644 --- a/qarepo.pl +++ b/qarepo.pl @@ -1,17 +1,57 @@ #!/usr/bin/perl +# Copyright (C) 2018 Mageia +# Martin Whitaker +# +# 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA. + use strict; -use Gtk3 '-init'; +use warnings; + +use File::Temp qw(tmpnam); use Glib qw(TRUE FALSE); +use Gtk3 '-init'; use MDK::Common; +my $release = 'v1.1'; + +############################################################################### +# States and Status +############################################################################### + +my %status_text = ( + disabled => 'Disabled', + enabled => 'Enabled', + changed => 'Needs update', + failed => 'Update failed' +); + +my $state; + +############################################################################### +# Initial Configuration +############################################################################### + my $home = $ENV{HOME} or die "ERROR: the HOME environment variable is not set.\n"; +# Only use sudo if not run by root. my $sudo = $> ? 'sudo' : ''; my %config; -my $config_file = $home . '/.qareporc'; +my $config_file = "$home/.qareporc"; if (open(my $f, '<', $config_file)) { while (my $line = <$f>) { chomp($line); @@ -24,20 +64,26 @@ if (open(my $f, '<', $config_file)) { my $mirror = $config{MIRROR} || 'rsync://mirrors.kernel.org/mirrors/mageia'; my $version = $config{VERSION} || '6'; my $arch = $config{ARCH} || 'x86_64'; -my $qa_repo = $config{QA_REPO} || $home . '/qa-testing'; +my $qa_repo = $config{QA_REPO} || "$home/qa-testing"; my $qa_repo_name = 'QA Testing'; -my $list_url = `urpmq --list-url | grep '$qa_repo_name'`; -chomp($list_url); +my $repo_name_and_url = `urpmq --list-url | grep '$qa_repo_name '`; +chomp($repo_name_and_url); + +my $active_qa_repo = $repo_name_and_url =~ s/$qa_repo_name +//r; -my $active_qa_repo = $list_url =~ s/$qa_repo_name +//r; -if ($list_url && $active_qa_repo ne $qa_repo) { +if ($repo_name_and_url && $active_qa_repo ne $qa_repo) { disable_repo(); } + my $last_version = $version; my $last_arch = $arch; +############################################################################### +# GUI +############################################################################### + my $window = Gtk3::Window->new('toplevel'); my $grid = Gtk3::Grid->new(); @@ -59,13 +105,16 @@ my $entry5 = Gtk3::TextView->new(); my $scroll = Gtk3::ScrolledWindow->new(); +my $label6 = Gtk3::Label->new('Status:'); +my $status = Gtk3::Label->new(''); + my $button1 = Gtk3::Button->new('Quit'); -my $button2 = Gtk3::Button->new($active_qa_repo ? 'Disable' : 'Enable'); -my $button3 = Gtk3::Button->new('Update'); +my $button2 = Gtk3::Button->new('Disable'); +my $button3 = Gtk3::Button->new('Enable'); my $button4 = Gtk3::Button->new('Clear'); -$window->set_title('QA Repo'); -$window->set_default_size(500, 300); +$window->set_title("QA Repo $release"); +$window->set_default_size(600, 400); $window->set_border_width(10); $window->signal_connect(delete_event => \&quit); @@ -109,16 +158,18 @@ $entry5->get_buffer->signal_connect(changed => \&changed); $scroll->set_hexpand(TRUE); $scroll->set_vexpand(TRUE); - $scroll->add($entry5); +$label6->set_halign('GTK_ALIGN_END'); + +$status->set_halign('GTK_ALIGN_START'); + $button1->signal_connect(clicked => \&quit); -$button2->signal_connect(clicked => \&enable_disable); +$button2->signal_connect(clicked => \&disable); -$button3->signal_connect(clicked => \&update); +$button3->signal_connect(clicked => \&enable); $button3->set_valign('GTK_ALIGN_START'); -$button3->set_sensitive(FALSE); $button4->signal_connect(clicked => \&clear); $button4->set_valign('GTK_ALIGN_END'); @@ -133,6 +184,8 @@ $grid->attach($label4, 0, 2, 1, 1); $grid->attach($entry4, 1, 2, 4, 1); $grid->attach($label5, 0, 3, 1, 1); $grid->attach($scroll, 1, 3, 4, 2); +$grid->attach($label6, 0, 5, 1, 1); +$grid->attach($status, 1, 5, 4, 1); $grid->attach($button1, 5, 0, 1, 1); $grid->attach($button2, 5, 2, 1, 1); @@ -140,21 +193,26 @@ $grid->attach($button3, 5, 3, 1, 1); $grid->attach($button4, 5, 4, 1, 1); $window->add($grid); + +if ($active_qa_repo) { + set_state('enabled'); +} else { + set_state('disabled'); +} + $window->show_all; Gtk3->main; -my $ignore_change; +############################################################################### +# GUI Callbacks +############################################################################### -sub changed() { - if ($ignore_change) { - $ignore_change = 0; - } else { - $button3->set_sensitive(TRUE); - } +sub changed { + set_state('changed'); } -sub quit() { +sub quit { get_settings(); if (open(my $f, '>', $config_file)) { print $f "MIRROR=$mirror\n"; @@ -166,20 +224,13 @@ sub quit() { Gtk3->main_quit; } -sub enable_disable() { +sub disable { disable_buttons(); - if ($active_qa_repo) { - disable_repo(); - } else { - get_settings(); - if (sync_repo()) { - enable_repo(); - } - } - enable_buttons(); + disable_repo(); + set_state('disabled'); } -sub update() { +sub enable { disable_buttons(); get_settings(); if (sync_repo()) { @@ -193,38 +244,45 @@ sub update() { disable_repo(); } } - enable_buttons(); + if ($active_qa_repo) { + set_state('enabled'); + } else { + set_state('failed'); + } } -my $clear_pending; +sub clear { + $entry5->get_buffer()->set_text(""); +} -sub clear() { - disable_buttons(); - get_settings(); - clear_repo(); - if ($active_qa_repo) { - disable_repo(); +############################################################################### +# Subsidiary Functions +############################################################################### + +sub set_state { + my ($new_state) = @_; + $state = $new_state; + $status->set_label($status_text{$state}); + $button1->set_sensitive(TRUE); + $button2->set_sensitive($active_qa_repo); + $button3->set_sensitive($state ne 'enabled'); + $button4->set_sensitive(TRUE); + if ($state eq 'changed' || $state eq 'failed') { + $button3->set_label('Update'); + } else { + $button3->set_label('Enable'); } - my $buffer = $entry5->get_buffer(); - $ignore_change = $buffer->get_char_count() > 0; - $buffer->set_text(""); - enable_buttons(); } -sub disable_buttons() { +sub disable_buttons { $button1->set_sensitive(FALSE); $button2->set_sensitive(FALSE); $button3->set_sensitive(FALSE); $button4->set_sensitive(FALSE); + gtk_update(); } -sub enable_buttons() { - $button1->set_sensitive(TRUE); - $button2->set_sensitive(TRUE); - $button4->set_sensitive(TRUE); -} - -sub get_settings() { +sub get_settings { $mirror = $entry1->get_text(); $version = $entry2->get_text(); $arch = $entry3->get_active_text(); @@ -234,7 +292,7 @@ sub get_settings() { } } -sub get_required_rpms() { +sub get_required_rpms { my $buffer = $entry5->get_buffer(); my $start = $buffer->get_start_iter(); my $end = $buffer->get_end_iter(); @@ -242,34 +300,33 @@ sub get_required_rpms() { grep { $_ ne '' } split("\n", $buffer->get_text($start, $end, FALSE)); } -sub get_existing_rpms() { +sub get_existing_rpms { map { basename($_) } glob("$qa_repo/*.rpm"); } -sub disable_repo() { +sub disable_repo { system("$sudo urpmi.removemedia '$qa_repo_name'") == 0 or die "ERROR: couldn't disable the $qa_repo_name media.\n"; - $button2->set_label('Enable'); $active_qa_repo = ''; } -sub enable_repo() { - if (system("$sudo urpmi.addmedia --update '$qa_repo_name' $qa_repo") == 0) { - $button2->set_label('Disable'); +sub enable_repo { + if (system("$sudo urpmi.addmedia '$qa_repo_name' $qa_repo") == 0) { $active_qa_repo = $qa_repo; } else { + print "ERROR: couldn't enable the $qa_repo_name media.\n"; $active_qa_repo = ''; } } -sub update_repo() { +sub update_repo { if (system("$sudo urpmi.update '$qa_repo_name'") != 0) { print "ERROR: couldn't update the $qa_repo_name media.\n"; disable_repo(); } } -sub clear_repo() { +sub clear_repo { my @existing_rpms = get_existing_rpms(); if (@existing_rpms) { unlink(map { "$qa_repo/$_" } @existing_rpms) @@ -277,13 +334,19 @@ sub clear_repo() { } } +my @available_rpms; + my $sync_ok; -sub sync_repo() { +sub sync_repo { + $status->set_label('Updating'); + $sync_ok = 1; + my $sync_file; if ($mirror =~ /^rsync:/) { $sync_file = \&sync_file_rsync; - } elsif ($mirror =~ /^ftp:/ || $mirror =~ /^http:/) { + } elsif ($mirror =~ /^ftp:/ + || $mirror =~ /^http:/) { $sync_file = \&sync_file_aria2; } elsif ($mirror !~ /^\w+:/) { $sync_file = \&sync_file_link; @@ -293,10 +356,44 @@ sub sync_repo() { } if ($version ne $last_version || $arch ne $last_arch) { + @available_rpms = (); + $last_version = $version; + $last_arch = $arch; clear_repo(); + gtk_update(); + } + + my $remote_repo = "$mirror/distrib/$version/$arch/media"; + + if (@available_rpms == 0) { + my $download_dir = "$qa_repo/.download"; + mkdir_p($download_dir); + foreach my $media_type (qw(core nonfree tainted)) { + my $synthesis = 'synthesis.hdlist.cz'; + my $remote_dir = "$remote_repo/$media_type/updates_testing/media_info"; + &$sync_file("$remote_dir/$synthesis", $download_dir) or next; + my @package_list = split("\n", `urpmq --synthesis $download_dir/$synthesis --list -f`); + foreach my $package (@package_list) { + push(@available_rpms, "$package.rpm"); + } + unlink("$download_dir/$synthesis") + or die "ERROR: couldn't delete/unlink $download_dir/$synthesis in the QA repo.\n"; + gtk_update(); + } } - my @required_rpms = get_required_rpms(); + my @required_rpms = (); + foreach my $request (get_required_rpms()) { + my $pattern = wildcard_to_regexp($request); + my $matched = 0; + foreach my $candidate (@available_rpms) { + if ($candidate =~ /^$pattern/) { + push(@required_rpms, $candidate); + $matched = 1; + } + } + $matched or sync_error("no match for $request in the remote repository"); + } my @existing_rpms = get_existing_rpms(); my @unwanted_rpms = difference2(\@existing_rpms, \@required_rpms); if (@unwanted_rpms) { @@ -309,26 +406,29 @@ sub sync_repo() { or die "ERROR: couldn't delete/unlink old pubkey in the QA repo.\n"; } - mkdir_p("$qa_repo/media_info/"); + mkdir_p("$qa_repo/media_info"); + gtk_update(); - $sync_ok = 1; - my $remote_repo = $mirror . '/distrib/' . $version . '/' . $arch . '/media'; foreach my $rpm (difference2(\@required_rpms, \@existing_rpms)) { my $remote_url = $remote_repo; if ($rpm =~ /tainted/) { - $remote_url .= '/tainted/updates_testing/' . $rpm; + $remote_url .= "/tainted/updates_testing/$rpm"; } elsif ($rpm =~ /nonfree/) { - $remote_url .= '/nonfree/updates_testing/' . $rpm; + $remote_url .= "/nonfree/updates_testing/$rpm"; } else { - $remote_url .= '/core/updates_testing/' . $rpm; + $remote_url .= "/core/updates_testing/$rpm"; } &$sync_file($remote_url, $qa_repo); + gtk_update(); } - &$sync_file($remote_repo . '/core/updates_testing/media_info/pubkey', $qa_repo . '/media_info'); + &$sync_file("$remote_repo/core/updates_testing/media_info/pubkey", "$qa_repo/media_info"); + gtk_update(); if ($sync_ok) { - system("genhdlist2 $qa_repo") == 0 + system("genhdlist2 --allow-empty-media $qa_repo") == 0 or sync_error("failed to update hdlist"); + } else { + print "ERROR: failed to download all the files.\n" } $sync_ok; @@ -345,7 +445,13 @@ sub sync_file_aria2 { my ($src_url, $dst_dir) = @_; print "fetching $src_url\n"; system("aria2c -q -d $dst_dir $src_url") == 0 - or sync_error("failed to download $src_url"); + and return 1; + + # aria2c leaves empty or partially downloaded files. + my $dst_file = $dst_dir . '/' . basename($src_url); + unlink($dst_file) if -e $dst_file; + + sync_error("failed to download $src_url"); } sub sync_file_link { @@ -358,4 +464,19 @@ sub sync_error { my ($message) = @_; print "ERROR: $message.\n"; $sync_ok = 0; + 0; +} + +sub wildcard_to_regexp { + my ($pattern) = @_; + $pattern =~ s/\./\\./g; + $pattern =~ s/\*/.*/g; + $pattern =~ s/\?/./g; + $pattern; +} + +sub gtk_update { + while (Gtk3::events_pending()) { + Gtk3::main_iteration(); + } } -- cgit v1.2.1