daniell/pcurse
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Fix http/https confusion on my end

Browse Source
This commit is contained in:
Daniel Lysfjord
2019-07-05 11:03:49 +02:00
parent 83b0c01f8e
commit df833c7159
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pcurse Normal file → Executable file
View File

@ -23,17 +23,19 @@ foreach my $addon(@{$addons}) {
my $version = pcurse::get_product_version($html,$addon->{'uri'},$fileid);
print ' - latest version is '.$version;
if($version && ($version ne $addon->{'version'})) {
print ' - updating';
my $ret = pcurse::update($conf->{'baseuri'}.$addon->{'uri'},$fileid,$conf->{'wowpath'});
if($ret) {
print ' - done';
$addon->{'version'} = $version;
} else {
print ' - failed';
unless($opts{'test'}) {
print ' - updating';
my $ret = pcurse::update($conf->{'baseuri'}.$addon->{'uri'},$fileid,$conf->{'wowpath'});
if($ret) {
print ' - done';
$addon->{'version'} = $version;
} else {
print ' - failed';
}
}
}
} else {
print 'Could not find product id for '.$addon->{'name'};
print 'Could not find file id for '.$addon->{'name'};
}
}
print "\n";

8
pcurse.pm
View File

@ -13,6 +13,7 @@ sub parse_arguments {
"wowpath=s" => \$toret{'wowpath'},
"baseuri=s" => \$toret{'baseuri'},
"config=s" => \$toret{'config'},
"test" => \$toret{'test'},
);
return %toret;
}
@ -53,7 +54,7 @@ sub check_config {
sub sane_defaults {
my $in = shift;
$in->{'baseuri'} = 'http://www.curseforge.com' unless(exists($in->{'baseuri'}));
$in->{'baseuri'} = 'https://www.curseforge.com' unless(exists($in->{'baseuri'}));
$in->{'config'} = $ENV{'HOME'}.'/.pcurse/config.json' unless(exists($in->{'config'}));
$in->{'addons'} = $ENV{'HOME'}.'/.pcurse/addons.json' unless(exists($in->{'addons'}));
return $in;
@ -76,12 +77,15 @@ sub load_addons {
$json = $json->{'addons'};
my $jsonreff = ref $json;
foreach my $addon(@{$json}) {
$addon->{'uri'} =~ s/^http\:\/\/www.curseforge\.com//;
$addon->{'uri'} =~ s/^http(s|)\:\/\/www.curseforge\.com//;
}
return $json;
}
} else {
my $json = &import_json($addons_file);
foreach my $addon(@{$json}) {
$addon->{'uri'} =~ s/^http(s|)\:\/\/www.curseforge\.com//;
}
return $json;
}
return 0;