Switched to version-aware source download target.

2 files changed, 75 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c742a0b7d0e0..5aaf67624406 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = idos-timetable-data-inprop-mhd-sk-all-latest
 	pkgdesc = Public transport data of many Slovak cities for the IDOS timetable browser, data provided by INPROP.
-	pkgver = 2023_05_11
-	pkgrel = 1
+	pkgver = 2023_09_04
+	pkgrel = 2
 	epoch = 0
 	url = https://www.inprop.eu/Home/Downloads
 	arch = any
@@ -12,11 +12,11 @@ pkgbase = idos-timetable-data-inprop-mhd-sk-all-latest
 	depends = idos-timetable-browser
 	optdepends = idos-timetable-tariff-mhd: For showing prices.
 	optdepends = idos-timetable-maps-mhd: For displaying routes.
-	provides = idos-timetable-data-inprop-mhd-sk-all=2023_05_11
-	provides = idos-timetable-data=2023_05_11
-	provides = idos-timetable-data-mhd=2023_05_11
-	provides = idos-timetable-data-mhd-sk=2023_05_11
-	provides = idos-timetable-data-mhd-sk-all=2023_05_11
+	provides = idos-timetable-data-inprop-mhd-sk-all=2023_09_04
+	provides = idos-timetable-data=2023_09_04
+	provides = idos-timetable-data-mhd=2023_09_04
+	provides = idos-timetable-data-mhd-sk=2023_09_04
+	provides = idos-timetable-data-mhd-sk-all=2023_09_04
 	conflicts = idos-timetable-data-inprop-mhd-sk-all
 	conflicts = idos-timetable-data-mhd-banskabystrica
 	conflicts = idos-timetable-data-mhd-bratislava
@@ -25,60 +25,60 @@ pkgbase = idos-timetable-data-inprop-mhd-sk-all-latest
 	conflicts = idos-timetable-data-mhd-povazskabystrica
 	conflicts = idos-timetable-data-mhd-presov
 	conflicts = idos-timetable-data-mhd-puchov
-	source = 13.exe::https://www.inprop.eu/Home/DownloadFile/13
-	source = 14.exe::https://www.inprop.eu/Home/DownloadFile/14
-	source = 16.exe::https://www.inprop.eu/Home/DownloadFile/16
-	source = 17.exe::https://www.inprop.eu/Home/DownloadFile/17
-	source = 18.exe::https://www.inprop.eu/Home/DownloadFile/18
-	source = 19.exe::https://www.inprop.eu/Home/DownloadFile/19
-	source = 20.exe::https://www.inprop.eu/Home/DownloadFile/20
-	source = 21.exe::https://www.inprop.eu/Home/DownloadFile/21
-	source = 22.exe::https://www.inprop.eu/Home/DownloadFile/22
-	source = 23.exe::https://www.inprop.eu/Home/DownloadFile/23
-	source = 24.exe::https://www.inprop.eu/Home/DownloadFile/24
-	source = 77.exe::https://www.inprop.eu/Home/DownloadFile/77
-	source = 28.exe::https://www.inprop.eu/Home/DownloadFile/28
-	source = 26.exe::https://www.inprop.eu/Home/DownloadFile/26
-	source = 27.exe::https://www.inprop.eu/Home/DownloadFile/27
-	source = 29.exe::https://www.inprop.eu/Home/DownloadFile/29
-	source = 31.exe::https://www.inprop.eu/Home/DownloadFile/31
-	source = 30.exe::https://www.inprop.eu/Home/DownloadFile/30
-	source = 32.exe::https://www.inprop.eu/Home/DownloadFile/32
-	source = 33.exe::https://www.inprop.eu/Home/DownloadFile/33
-	source = 78.exe::https://www.inprop.eu/Home/DownloadFile/78
-	source = 35.exe::https://www.inprop.eu/Home/DownloadFile/35
-	source = 34.exe::https://www.inprop.eu/Home/DownloadFile/34
-	source = 36.exe::https://www.inprop.eu/Home/DownloadFile/36
-	source = 37.exe::https://www.inprop.eu/Home/DownloadFile/37
-	source = 38.exe::https://www.inprop.eu/Home/DownloadFile/38
-	source = 39.exe::https://www.inprop.eu/Home/DownloadFile/39
-	source = 79.exe::https://www.inprop.eu/Home/DownloadFile/79
-	source = 40.exe::https://www.inprop.eu/Home/DownloadFile/40
-	source = 42.exe::https://www.inprop.eu/Home/DownloadFile/42
-	source = 41.exe::https://www.inprop.eu/Home/DownloadFile/41
-	source = 44.exe::https://www.inprop.eu/Home/DownloadFile/44
-	source = 43.exe::https://www.inprop.eu/Home/DownloadFile/43
-	source = 45.exe::https://www.inprop.eu/Home/DownloadFile/45
-	source = 70.exe::https://www.inprop.eu/Home/DownloadFile/70
-	source = 46.exe::https://www.inprop.eu/Home/DownloadFile/46
-	source = 86.exe::https://www.inprop.eu/Home/DownloadFile/86
-	source = 48.exe::https://www.inprop.eu/Home/DownloadFile/48
-	source = 50.exe::https://www.inprop.eu/Home/DownloadFile/50
-	source = 53.exe::https://www.inprop.eu/Home/DownloadFile/53
-	source = 49.exe::https://www.inprop.eu/Home/DownloadFile/49
-	source = 51.exe::https://www.inprop.eu/Home/DownloadFile/51
-	source = 47.exe::https://www.inprop.eu/Home/DownloadFile/47
-	source = 52.exe::https://www.inprop.eu/Home/DownloadFile/52
-	source = 54.exe::https://www.inprop.eu/Home/DownloadFile/54
-	source = 55.exe::https://www.inprop.eu/Home/DownloadFile/55
-	source = 59.exe::https://www.inprop.eu/Home/DownloadFile/59
-	source = 56.exe::https://www.inprop.eu/Home/DownloadFile/56
-	source = 57.exe::https://www.inprop.eu/Home/DownloadFile/57
-	source = 58.exe::https://www.inprop.eu/Home/DownloadFile/58
-	source = 60.exe::https://www.inprop.eu/Home/DownloadFile/60
-	source = 61.exe::https://www.inprop.eu/Home/DownloadFile/61
-	source = 62.exe::https://www.inprop.eu/Home/DownloadFile/62
-	source = 63.exe::https://www.inprop.eu/Home/DownloadFile/63
+	source = 13-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/13
+	source = 14-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/14
+	source = 16-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/16
+	source = 17-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/17
+	source = 18-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/18
+	source = 19-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/19
+	source = 20-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/20
+	source = 21-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/21
+	source = 22-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/22
+	source = 23-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/23
+	source = 24-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/24
+	source = 77-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/77
+	source = 28-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/28
+	source = 26-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/26
+	source = 27-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/27
+	source = 29-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/29
+	source = 31-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/31
+	source = 30-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/30
+	source = 32-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/32
+	source = 33-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/33
+	source = 78-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/78
+	source = 35-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/35
+	source = 34-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/34
+	source = 36-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/36
+	source = 37-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/37
+	source = 38-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/38
+	source = 39-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/39
+	source = 79-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/79
+	source = 40-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/40
+	source = 42-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/42
+	source = 41-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/41
+	source = 44-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/44
+	source = 43-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/43
+	source = 45-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/45
+	source = 70-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/70
+	source = 46-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/46
+	source = 86-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/86
+	source = 48-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/48
+	source = 50-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/50
+	source = 53-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/53
+	source = 49-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/49
+	source = 51-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/51
+	source = 47-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/47
+	source = 52-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/52
+	source = 54-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/54
+	source = 55-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/55
+	source = 59-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/59
+	source = 56-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/56
+	source = 57-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/57
+	source = 58-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/58
+	source = 60-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/60
+	source = 61-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/61
+	source = 62-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/62
+	source = 63-2023_09_04.exe::https://www.inprop.eu/Home/DownloadFile/63
 	source = license-dummy.txt
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 98678ed510d8..0b0771453729 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,22 @@
 # Maintainer: dreieck
 
-# PKGBUILD last time manually edited: At least on 2023-05-17.
+# PKGBUILD last time manually edited: At least on 2023-09-04.
+
+url="https://www.inprop.eu/Home/Downloads"
+_pkgver() {
+  # Reason for a _pkgver(): Have something to run before source download so that we can have version aware source downloads.
+  # Use the version of the newest updated file.
+  wget -nv -O- "${url}" | tr -d '\a' | tr '\n' '\a' | sed -E -e 's|<tr>|\n|g' -e 's|</tr>|\n|g' | grep -E '<span.*>MHD' | sed -E 's|^.*Updated:.*<span>([0-9]+/[0-9]+/[0-9]+).*$|\1|g' | awk -F/ '{print $3"_"$1"_"$2}' | sed -E -e 's|_([0-9])_|_0\1_|g' -e 's|_([0-9])$|_0\1|g' | sort -Vr | head -n1
+}
 
 _pkgname=idos-timetable-data-inprop-mhd-sk-all
 pkgname="${_pkgname}-latest"
 epoch=0
-pkgver=2023_05_11
-pkgrel=1
+_pkgver="$(_pkgver)" # This should be set _before_ sources get downloaded.
+pkgver="${_pkgver}"
+pkgrel=2
 pkgdesc="Public transport data of many Slovak cities for the IDOS timetable browser, data provided by INPROP."
 arch=(any)
-url="https://www.inprop.eu/Home/Downloads"
 license=('custom')
 
 groups=(
@@ -53,7 +60,7 @@ conflicts=(
 
 _list_sources() {
   wget -nv -O- "${url}" | tr -d '\a' | tr '\n' '\a' | sed -E -e 's|<tr>|\n|g' -e 's|</tr>|\n|g' | grep -E '<span.*>MHD' | sed 's|^.*href="/Home/\(DownloadFile/[^"]*\)".*$|\1|g' | while read _line; do
-    echo "$(basename "${_line}").exe::$(dirname "${url}")/${_line}"
+    echo "$(basename "${_line}")-${_pkgver}.exe::$(dirname "${url}")/${_line}"
   done
 }
 
@@ -76,10 +83,10 @@ sha256sums=(
 )
 
 pkgver() {
-  # Use the version of the newest updated file.
-  wget -nv -O- "${url}" | tr -d '\a' | tr '\n' '\a' | sed -E -e 's|<tr>|\n|g' -e 's|</tr>|\n|g' | grep -E '<span.*>MHD' | sed -E 's|^.*Updated:.*<span>([0-9]+/[0-9]+/[0-9]+).*$|\1|g' | awk -F/ '{print $3"_"$1"_"$2}' | sed -E -e 's|_([0-9])_|_0\1_|g' -e 's|_([0-9])$|_0\1|g' | sort -Vr | head -n1
+  printf '%s' "${_pkgver}"
 }
 
+
 prepare() {
   cd "${srcdir}"
   mkdir -p "unzip"