Update the generation process

2 files changed, 31 insertions, 26 deletions

diff --git a/PKGBUILD.template b/PKGBUILD.template
index 03477e6529d7..105f12d8b149 100644
--- a/PKGBUILD.template
+++ b/PKGBUILD.template
@@ -2,33 +2,33 @@
 # Original maintainer: Simonas Racinas <racinas at icloud.com>
 pkgname=visual-paradigm-community
 pkgver=[% version %]
-pkgrel=2
+pkgrel=[% date %]
 pkgdesc="UML design application"
 url='http://www.visual-paradigm.com/download/community.jsp'
 arch=('x86_64')
 depends=('java-environment-common')
 install=visual-paradigm-community.install
-_baseurl="http://www.visual-paradigm.com/downloads/vpce"
 license=('custom')
-source=("http://www.visual-paradigm.com/downloads/vpce/Visual_Paradigm_CE_Linux[% arch %]_InstallFree.tar.gz"
-	'visual-paradigm-community.install'
-	'visual-paradigm.desktop'
-	'Visual_Paradigm_Fixed'
-	'visual-paradigm.png'
-	'LICENSE.txt'
-	'x-visual-paradigm.xml')
-#sha256sums=('82a4f6a0c6fda6d6881a793ad8e7dfe3a0341211e3ede2f8cdf141d924823609'
-sha256sums=('[% sha256 %]'
-	'f992fffbc3627b0691a18c90eb5440eab6d32422bec946b5c64ab1d9e1800f12'
-	'c2cf0bd2fdc2879b2ae4814e1be5b6cbd7e5aa4c1247f5d4bc8e677eb6a94952'
-	'c861d708eb446f94abbebb4028a2f15f7bc6840aa5df1ee81f7301aac0fd00a9'
-	'41517b5c2326c0ba2fe3b6647f9594f094ccf03185cf73cb87d6cf19b355ff15'
-	'cd30460cb1c29f9f42723197dbe72b2537aaed09cc2d44dcb3e6868fb5dbf12b'
-	'a3b898bc9c43cf54baa1c643c619ee172a8103cd15031d574380ca463eb1ec1c')
 
-# pkgver(){
-#     curl -I -L "$_baseurl/" | grep -Pio '[0-9]{2}_[0-9]{1}_[0-9]{8}' | sed 's/_/./g' | head -1
-# }
+# Possible values: ca1 usa10 usa11 usa13 usa14 uk3 uk5 germany4 germany5 germany6 france3
+_server=eu6
+_version=[% version_ %]
+# https://eu6.visual-paradigm.com/visual-paradigm/vpce14.2/20180101/Visual_Paradigm_CE_14_2_20180101_Linux64.sh
+source=("https://$_server.visual-paradigm.com/visual-paradigm/vpce$pkgver/$pkgrel/Visual_Paradigm_CE_${_version}_${pkgrel}_Linux64_InstallFree.tar.gz"
+  'visual-paradigm-community.install'
+  'visual-paradigm.desktop'
+  'Visual_Paradigm_Fixed'
+  'visual-paradigm.png'
+  'LICENSE.txt'
+  'x-visual-paradigm.xml')
+
+sha256sums=('[% sha256 %]'
+  'f992fffbc3627b0691a18c90eb5440eab6d32422bec946b5c64ab1d9e1800f12'
+  'c2cf0bd2fdc2879b2ae4814e1be5b6cbd7e5aa4c1247f5d4bc8e677eb6a94952'
+  'c861d708eb446f94abbebb4028a2f15f7bc6840aa5df1ee81f7301aac0fd00a9'
+  '41517b5c2326c0ba2fe3b6647f9594f094ccf03185cf73cb87d6cf19b355ff15'
+  'cd30460cb1c29f9f42723197dbe72b2537aaed09cc2d44dcb3e6868fb5dbf12b'
+  'a3b898bc9c43cf54baa1c643c619ee172a8103cd15031d574380ca463eb1ec1c')
 
 package() {
   _ver=${pkgver:0:4} # Probably, dirty a bit
diff --git a/generator.pl b/generator.pl
index 269939330f35..f7c8217ad53e 100644
--- a/generator.pl
+++ b/generator.pl
@@ -52,7 +52,8 @@ my $ua = LWP::UserAgent->new;
 my $version = _get_latest_version($ua);
 my @lines = _get_checksum_lines($ua, $version);
 
-my @versions = grep { $_ ~~ /Visual_Paradigm_CE[^\s]+Linux[2-6]{2}_InstallFree.tar.gz/ } @lines;
+# Visual_Paradigm_CE_14_2_20180101_Linux64_InstallFree.tar.gz
+my @versions = grep { $_ ~~ /Visual_Paradigm_CE_$version->{base}_$version->{date}_Linux[2-6]{2}_InstallFree.tar.gz/ } @lines;
 
 die "Cannot get versions" unless @versions;
 
@@ -61,13 +62,17 @@ my %data = ();
 for my $line ( @versions ) {
     $line =~ /_CE_([0-9_]+)_Linux([2-6]{2}).*sha256:\s+([0-9a-f]+).*md5:\s+([0-9a-f]+)/;
     my $info = {
-        version => $1,
-        arch    => $2,
-        sha256  => $3,
-        md5     => $4,
+        full_version => $1,
+        arch         => $2,
+        sha256       => $3,
+        md5          => $4,
 
     };
-    $info->{version} =~ s/_/./g;
+    if ($info->{full_version} ~~ /(?<version>\d+_\d+)_(?<date>\d+)/) {
+        $info->{$_} = $+{$_} for keys %+;
+        $info->{version_} = $info->{version};
+        $info->{version}  =~ s/_/./g;
+    }
     my $arch = $info->{arch} eq 32 ? 'i686' : 'x86_64';
     $data{$arch} = $info;
 }