Skip to content

Commit 3a94a59

Browse files
authored
Merge pull request #219 from hadfl/pkgupd
pkgupd: add URL as parameter for parsers
2 parents 5bb9393 + 06ef87e commit 3a94a59

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

lib/OOCEapps/Controller/PkgUpd.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ my $getPkgAvailVer = sub {
4444

4545
$pl->{$chunk->[$i]}->{availVer} = $self->config->{parser}
4646
->{exists $self->config->{parser}->{$chunk->[$i]} ? $chunk->[$i] : 'DEFAULT'}
47-
->getVersions($chunk->[$i], $tx[$i]->[0]->result);
47+
->getVersions($chunk->[$i], $tx[$i]->[0]->result, $tx[$i]->[0]->req->url);
4848
}
4949
})->wait;
5050

lib/OOCEapps/PkgUpd/GitHub.pm

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ sub getVersions {
3131
my $self = shift;
3232
my $name = shift;
3333
my $res = shift;
34+
my $url = shift;
3435

3536
$name = $self->extractName($name);
3637

@@ -49,9 +50,11 @@ sub getVersions {
4950
s/(\d+)-/$1./g for @versions;
5051
}
5152

53+
my $prog = $url->path->[1];
54+
5255
return [
5356
grep { /^$ver/ }
54-
map { m#/releases/tag/(?:v(?:er\.)?|rel(?:ease)?[-.]|stable-|R\.|$name-?\.?)?
57+
map { m#/\Q$prog\E/releases/tag/(?:v(?:er\.)?|rel(?:ease)?[-.]|stable-|R\.|$name-?\.?)?
5558
(\d{4}(?:-\d{2}){2}T(?:\d{2}-){2}\d{2}Z|[\d.]+(?:op)?\d+)
5659
(?!-?(?:\.\d+|\.?(?:rc\d*|dev|a(?:lpha)?|b(?:eta)?|pre|test)))#ix
5760
} @versions

0 commit comments

Comments
 (0)