@ -1,10 +1,11 @@
use crate ::args ::UpgradeArgs ;
use crate ::internal ::commands ::ShellCommand ;
use crate ::internal ::detect ;
use crate ::internal ::error ::SilentUnwrap ;
use crate ::internal ::exit_code ::AppExitCode ;
use crate ::internal ::rpc ::rpcinfo ;
use crate ::operations ::aur_install ::aur_install ;
use crate ::{ info , log , prompt , } ;
use crate ::{ info , log , prompt , spinner, warn , Options} ;
#[ derive(Debug) ]
struct QueriedPackage {
@ -12,36 +13,49 @@ struct QueriedPackage {
pub version : String ,
}
pub fn upgrade ( options : Options {
pub fn upgrade ( options : Options , args : UpgradeArgs ) {
// Initialise variables
let verbosity = options . verbosity ;
let noconfirm = options . noconfirm ;
// Build pacman args
let mut pacman_args = vec! [ "-Syu" ] ;
if noconfirm {
pacman_args . push ( "--noconfirm" ) ;
}
let args = if ! args . aur & & ! args . repo {
UpgradeArgs {
aur : true ,
repo : true ,
}
} else {
args
} ;
if args . repo {
// Build pacman args
let mut pacman_args = vec! [ "-Syu" ] ;
if noconfirm {
pacman_args . push ( "--noconfirm" ) ;
}
if verbosity > = 1 {
log ! ( "Upgrading repo packages" ) ;
}
if verbosity > = 1 {
log ! ( "Upgrading repo packages" ) ;
}
// Upgrade repo packages
let pacman_result = ShellCommand ::pacman ( )
. elevated ( )
. args ( pacman_args )
. wait ( )
. silent_unwrap ( AppExitCode ::PacmanError ) ;
// Upgrade repo packages
let pacman_result = ShellCommand ::pacman ( )
. elevated ( )
. args ( pacman_args )
. wait ( )
. silent_unwrap ( AppExitCode ::PacmanError ) ;
if pacman_result . success ( ) {
// If pacman was successful, notify user
info ! ( "Successfully upgraded repo packages" ) ;
} else {
// Otherwise warn user
warn ! ( "Failed to upgrade repo packages." , ) ;
}
}
if pacman_result . success ( ) {
// If pacman was successful, notify user
info ! ( "Successfully upgraded repo packages" ) ;
} else {
// Otherwise, prompt user whether to continue
let cont = prompt ! ( default false ,
"Failed to upgrade repo packages, continue to upgrading AUR packages?" ,
) ;
if args . repo & & args . aur {
let cont = prompt ! ( default false , "Continue to upgrade AUR packages?" ) ;
if ! cont {
// If user doesn't want to continue, break
info ! ( "Exiting" ) ;
@ -49,69 +63,76 @@ pub fn upgrade(options: Options) {
}
}
if verbosity > = 1 {
log ! ( "Checking AUR upgrades..." ) ;
}
// List non-native packages using `pacman -Qm` and collect to a Vec<String>
let non_native = ShellCommand ::pacman ( )
. arg ( "-Qm" )
. args ( & [ "--color" , "never" ] )
. wait_with_output ( )
. silent_unwrap ( AppExitCode ::PacmanError ) ;
// Collect by lines to a Vec<String>
let mut non_native = non_native . stdout . split ( '\n' ) . collect ::< Vec < & str > > ( ) ;
// Remove last element, which is an empty line
non_native . pop ( ) ;
// Parse non-native packages into a Vec<QueriedPackage>
let mut parsed_non_native : Vec < QueriedPackage > = vec! [ ] ;
for pkg in non_native {
// Split by space
let split = pkg . split ( ' ' ) . collect ::< Vec < & str > > ( ) ;
if args . aur {
if verbosity > = 1 {
log ! ( " {:?}", split ) ;
log ! ( "Checking AUR upgrades..." ) ;
}
// Create QueriedPackage and push it to parsed_non_native
let name = split [ 0 ] . to_string ( ) ;
let version = split [ 1 ] . to_string ( ) ;
parsed_non_native . push ( QueriedPackage { name , version } ) ;
}
if verbosity > = 1 {
log ! ( "{:?}" , & parsed_non_native ) ;
}
// Check if AUR package versions are the same as installed
let mut aur_upgrades = vec! [ ] ;
for pkg in parsed_non_native {
// Query AUR
let rpc_result = rpcinfo ( ( & * pkg . name ) . to_string ( ) ) ;
// Start spinner
let sp = spinner ! ( "Checking AUR upgrades..." ) ;
// List non-native packages using `pacman -Qm` and collect to a Vec<String>
let non_native = ShellCommand ::pacman ( )
. arg ( "-Qm" )
. args ( & [ "--color" , "never" ] )
. wait_with_output ( )
. silent_unwrap ( AppExitCode ::PacmanError ) ;
// Collect by lines to a Vec<String>
let mut non_native = non_native . stdout . split ( '\n' ) . collect ::< Vec < & str > > ( ) ;
// Remove last element, which is an empty line
non_native . pop ( ) ;
// Parse non-native packages into a Vec<QueriedPackage>
let mut parsed_non_native : Vec < QueriedPackage > = vec! [ ] ;
for pkg in non_native {
// Split by space
let split = pkg . split ( ' ' ) . collect ::< Vec < & str > > ( ) ;
if verbosity > = 1 {
log ! ( "{:?}" , split ) ;
}
// Create QueriedPackage and push it to parsed_non_native
let name = split [ 0 ] . to_string ( ) ;
let version = split [ 1 ] . to_string ( ) ;
parsed_non_native . push ( QueriedPackage { name , version } ) ;
}
if ! rpc_result . found {
// If package not found, skip
continue ;
if verbosity > = 1 {
log ! ( "{:?}" , & parsed_non_native ) ;
}
// If versions differ, push to a vector
if rpc_result . package . unwrap ( ) . version ! = pkg . version {
aur_upgrades . push ( pkg . name ) ;
// Check if AUR package versions are the same as installed
let mut aur_upgrades = vec! [ ] ;
for pkg in parsed_non_native {
// Query AUR
let rpc_result = rpcinfo ( ( & * pkg . name ) . to_string ( ) ) ;
if ! rpc_result . found {
// If package not found, skip
continue ;
}
// If versions differ, push to a vector
if rpc_result . package . unwrap ( ) . version ! = pkg . version {
aur_upgrades . push ( pkg . name ) ;
}
}
}
// If vector isn't empty, prompt to install AUR packages from vector, effectively upgrading
if ! aur_upgrades . is_empty ( ) {
let cont = prompt ! ( default false ,
"Found AUR packages {} have new versions available, upgrade?" ,
aur_upgrades . join ( ", " ) ,
) ;
if cont {
aur_install ( aur_upgrades , options ) ;
} ;
} else {
info ! ( "No upgrades available for installed AUR packages" ) ;
sp . stop_bold ( "Finished!" ) ;
// If vector isn't empty, prompt to install AUR packages from vector, effectively upgrading
if ! aur_upgrades . is_empty ( ) {
let cont = prompt ! ( default true ,
"Found AUR packages {} have new versions available, upgrade?" ,
aur_upgrades . join ( ", " ) ,
) ;
if cont {
aur_install ( aur_upgrades , options ) ;
} ;
} else {
info ! ( "No upgrades available for installed AUR packages" ) ;
}
}
// Check for .pacnew files
Michal
2 years ago
committed by
GitHub