Changed download URL.

2 files changed, 22 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7e56f865b44..818231e5c4b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = idos-timetable-data-zsr-europe+sk-2018-latest
-	pkgdesc = 2017/2018 Timetable data for the offline railway and other public transport timetable search engines by CHAPS: European and Slovak train data, provided by ŽSR.
-	pkgver = 2018_01_22
+	pkgdesc = 2017/2018 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 = 0
-	url = http://www.zsr.sk/slovensky/cestovny-poriadok-vlakov-osobnej-dopravy-cp2017-2018-a-aktualizacia-dat-na-stiahnutie.html?page_id=5772
+	epoch = 1
+	url = http://www.inprop.sk/download.aspx
 	arch = any
 	groups = idos-timetable
 	license = custom
@@ -16,17 +16,17 @@ pkgbase = idos-timetable-data-zsr-europe+sk-2018-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-2018=2018_01_22
-	provides = idos-timetable-data=2018_01_22
-	provides = idos-timetable-data-trains=2018_01_22
-	provides = idos-timetable-data-trains-sk=2018_01_22
-	provides = idos-timetable-data-trains-sk-2018=2018_01_22
-	provides = idos-timetable-data-trains-europe=2018_01_22
-	provides = idos-timetable-data-trains-europe-2018=2018_01_22
+	provides = idos-timetable-data-zsr-europe+sk-2018=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-2018=2018_2_8
+	provides = idos-timetable-data-trains-europe=2018_2_8
+	provides = idos-timetable-data-trains-europe-2018=2018_2_8
 	conflicts = idos-timetable-data-zsr-europe+sk-2018
 	replaces = idos-timetable-data-zsr-europe+sk-latest
-	replaces = idos-timetable-data-zsr-europe+sk-2018<=2018_01_22
-	source = vlak18e_sk.exe::http://www.zsr.sk/buxus/docs/elis/subory/2018_01_22/vlak18e_sk-2018-01-22.exe
+	replaces = idos-timetable-data-zsr-europe+sk-2018<=2018_2_8
+	source = vlak18e_sk.exe::http://www.inprop.sk/Data/Vlak18E_Sk.exe
 	source = license-dummy.txt
 	sha256sums = SKIP
 	sha256sums = 14279a732be7d04304ff3860d54e0cf8c1a8ba0a46343eaf9b7ce3a105815946
diff --git a/PKGBUILD b/PKGBUILD
index 8c43293294e9..7574d0b675d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +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.
 
 _year='18'
 _prevyear="$(( ${_year} - 1 ))"
 
 _pkgname="idos-timetable-data-zsr-europe+sk-20${_year}"
 pkgname="${_pkgname}-latest"
-epoch=0
-pkgver=2018_01_22
+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 ŽSR."
+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://www2.zsr.sk/pre-cestujucich/elis-vas-pocitac/instalacny-program-elis-k-cestovnemu-poriadku-cp-2017-2018.html"
-url="http://www.zsr.sk/slovensky/cestovny-poriadok-vlakov-osobnej-dopravy-cp2017-2018-a-aktualizacia-dat-na-stiahnutie.html?page_id=5772"
+url="http://www.inprop.sk/download.aspx"
 license=('custom')
 
 groups=(
@@ -60,7 +59,7 @@ conflicts=(
 )
 
 _get_download_url() {
-  wget -O- -nv "${url}" | grep -i "vlak${_year}e_sk.exe" | sed -n "s|^.*<a href=[\"']\([^\"']*\)[\"'].*$|\1|p"
+  echo "http://www.inprop.sk/Data/Vlak${_year}E_Sk.exe"
 }
 
 _source0="$(_get_download_url)"
@@ -80,11 +79,9 @@ pkgver() {
   # 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"
   
-  _day="$(basename "${_source0}" .exe | cut -d- -f4)"
-  _month="$(basename "${_source0}" .exe | cut -d- -f3)"
-  _year="$(basename "${_source0}" .exe | cut -d- -f2)"
-  
-  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}"
 }