Changed download URL.

2 files changed, 43 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c8d38edda56..970d8aa58443 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = idos-timetable-data-zsr-europe+sk-2017-latest
-	pkgdesc = 2016/2017 Timetable data for the offline railway and other public transport timetable search engines by CHAPS: European and Slovak train data, provided by ŽSR.
-	pkgver = 2017_12_05
-	pkgrel = 2
-	epoch = 0
-	url = http://www.zsr.sk/slovensky/cestovny-poriadok-vlakov-osobnej-dopravy-elis-cp-2015-2016-a-aktualizacia-dat-na-stiahnutie.html?page_id=378
+	pkgdesc = 2016/2017 Timetable data for the offline railway and other public transport timetable search engines by CHAPS: European and Slovak train data, provided by Inprop (Slovakia).
+	pkgver = 2018_2_8
+	pkgrel = 1
+	epoch = 1
+	url = http://www.inprop.sk/download.aspx
 	arch = any
 	groups = idos-timetable
 	license = custom
@@ -16,15 +16,17 @@ pkgbase = idos-timetable-data-zsr-europe+sk-2017-latest
 	optdepends = idos-timetable-maps-trains-europe: For displaying routes.
 	optdepends = idos-timetable-maps-trains-cz: For displaying routes (Czech republic only).
 	optdepends = idos-timetable-maps-trains-sk: For displaying routes (Slovakia only).
-	provides = idos-timetable-data-zsr-europe+sk-2017=2017_12_05
-	provides = idos-timetable-data=2017_12_05
-	provides = idos-timetable-data-trains=2017_12_05
-	provides = idos-timetable-data-trains-sk=2017_12_05
-	provides = idos-timetable-data-trains-europe=2017_12_05
-	provides = idos-timetable-data-trains-sk-2017=2017_12_05
-	provides = idos-timetable-data-trains-europe-2017=2017_12_05
+	provides = idos-timetable-data-zsr-europe+sk-2017=2018_2_8
+	provides = idos-timetable-data=2018_2_8
+	provides = idos-timetable-data-trains=2018_2_8
+	provides = idos-timetable-data-trains-sk=2018_2_8
+	provides = idos-timetable-data-trains-sk-2017=2018_2_8
+	provides = idos-timetable-data-trains-europe=2018_2_8
+	provides = idos-timetable-data-trains-europe-2017=2018_2_8
 	conflicts = idos-timetable-data-zsr-europe+sk-2017
-	source = vlak17e_sk.exe::http://www.zsr.sk/buxus/docs/elis/subory/2017_12_05/vlak17e_sk-2017-12-05.exe
+	replaces = idos-timetable-data-zsr-europe+sk-latest
+	replaces = idos-timetable-data-zsr-europe+sk-2017<=2018_2_8
+	source = vlak17e_sk.exe::http://www.inprop.sk/Data/Vlak17E_Sk.exe
 	source = license-dummy.txt
 	sha256sums = SKIP
 	sha256sums = 14279a732be7d04304ff3860d54e0cf8c1a8ba0a46343eaf9b7ce3a105815946
diff --git a/PKGBUILD b/PKGBUILD
index 96c104ea10fe..ef73f0dd2d7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,18 @@
 # Maintainer: dreieck
 
-# PKGBUILD last time manually edited: At least on 2017-12-17.
+# PKGBUILD last time manually edited: At least on 2018-02-09.
 
-_pkgname=idos-timetable-data-zsr-europe+sk-2017
+_year='17'
+_prevyear="$(( ${_year} - 1 ))"
+
+_pkgname="idos-timetable-data-zsr-europe+sk-20${_year}"
 pkgname="${_pkgname}-latest"
-epoch=0
-pkgver=2017_12_05
-pkgrel=2
-pkgdesc="2016/2017 Timetable data for the offline railway and other public transport timetable search engines by CHAPS: European and Slovak train data, provided by ŽSR."
+epoch=1
+pkgver=2018_2_8
+pkgrel=1
+pkgdesc="20${_prevyear}/20${_year} Timetable data for the offline railway and other public transport timetable search engines by CHAPS: European and Slovak train data, provided by Inprop (Slovakia)."
 arch=(any)
-# url="http://www.zsr.sk/slovensky.html?page_id=378"
-url="http://www.zsr.sk/slovensky/cestovny-poriadok-vlakov-osobnej-dopravy-elis-cp-2015-2016-a-aktualizacia-dat-na-stiahnutie.html?page_id=378"
+url="http://www.inprop.sk/download.aspx"
 license=('custom')
 
 groups=(
@@ -42,23 +44,29 @@ provides=(
   "idos-timetable-data-trains=${pkgver}"
 
   "idos-timetable-data-trains-sk=${pkgver}"
+  "idos-timetable-data-trains-sk-20${_year}=${pkgver}"
   "idos-timetable-data-trains-europe=${pkgver}"
-  "idos-timetable-data-trains-sk-2017=${pkgver}"
-  "idos-timetable-data-trains-europe-2017=${pkgver}"
+  "idos-timetable-data-trains-europe-20${_year}=${pkgver}"
+)
+
+replaces=(
+  'idos-timetable-data-zsr-europe+sk-latest'
+  "${_pkgname}<=${pkgver}"
 )
 
 conflicts=(
   "${_pkgname}"
 )
 
-_get_download_url_2017() {
-  wget -O- -nv "${url}" | grep -i 'vlak17e_sk.exe' | sed -n "s|^.*<a href=[\"']\([^\"']*\)[\"'].*$|\1|p"
+_get_download_url() {
+  echo "http://www.inprop.sk/Data/Vlak${_year}E_Sk.exe"
 }
 
-_source0="$(_get_download_url_2017)"
+_source0="$(_get_download_url)"
+_target0="vlak${_year}e_sk.exe"
 
 source=(
-  "vlak17e_sk.exe::${_source0}"
+  "${_target0}::${_source0}"
   "license-dummy.txt"
 )
 
@@ -68,11 +76,12 @@ sha256sums=(
 )
 
 pkgver() {
-  _day="$(basename "${_source0}" .exe | cut -d- -f4)"
-  _month="$(basename "${_source0}" .exe | cut -d- -f3)"
-  _year="$(basename "${_source0}" .exe | cut -d- -f2)"
+  # Do not use metadata of the source file, but do website parsing: So we do not need to download the file to (AUR-)update the package version with our own crude hacked script 'idos-aur-update-versions.sh'.
+  #date -r "${srcdir}/${_target0}" +"%Y_%m_%d"
   
-  echo "${_year}_${_month}_${_day}"
+  _ver="$(wget -nv -O- "${url}" | grep --text -E "Data/Vlak${_year}E_Sk\.exe" | sed -r 's|[^0-9]([0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4})[^0-9]|\n\1\n|' | grep --text -E '^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}$' | awk -F. '{print $3"_"$2"_"$1}')"
+
+  echo "${_ver}"
 }
 
 
@@ -83,7 +92,7 @@ package() {
   install -d -m755 "${_instdir}"
 
   cd "${_instdir}" && {
-    7z x "${srcdir}/vlak17e_sk.exe"
+    7z x "${srcdir}/${_target0}"
     chmod 755 Data*
     chmod 644 Data*/*
   }