Merge pull request #1 from benibela/master

Make Repo uptodate
benibela · Sep 10, 2024 · 0828587 · 0828587
2 parents f314a77 + ecf8fc9
commit 0828587
Show file tree

Hide file tree

Showing 146 changed files with 1,252 additions and 669 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install NDK
-      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;19.2.5345600"  "tools" "build-tools;30.0.3"  "platforms;android-30"
+      run: echo "y" | sudo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;19.2.5345600"  "tools" "build-tools;30.0.3"  "platforms;android-30"
     - run: git clone https://github.com/benibela/xidel.git
     - run: xidel/.github/download-dependencies.sh && xidel/.github/setup-fpc-cfg.sh 
     - name: Install FreePascal for Android

diff --git a/.hgtags b/.hgtags
@@ -1,5 +1,6 @@
 05db0d430d5bf827b2d97d4b2213bd1396584e9c VIDELIBRI 1.955
 0893c546cfa421f44a7e94b42a3da5a52cc045f1 VIDELIBRI 1.999
+0bc4f3c56978b9509e7dd06886c8d2cc39baf9e1 VIDELIBRI 2.782
 0d96dc239455912499d5f69bf45934e061344156 Xidel 0.9.6
 0f54ff934797d12e9d84a74bd1fbf30a31dd3ba7 VIDELIBRI 2.632
 114913f237115adbc7a257ea5cb0bcb5c3a6d41b VIDELIBRI 1.515
@@ -60,19 +61,24 @@
 7f2c04003ec504a50cdf053f35df5ebde2eb973b VIDELIBRI 1.810
 7fafd58716e67e1b66a788b7ee148ee2c206ddd9 VIDELIBRI 1.900
 8656c8010124997eaa5ef87c1a202de0089e4260 VIDELIBRI 1.650
+867609abd5292badfbb4c5b9563efd4de7363967 VIDELIBRI 2.780
 8a317ed1f8a615a1196d4d07520e6fc86483404c VIDELIBRI 1.840
 8ac21491af85b50f9e538fc20dc2e867e79ab1af VIDELIBRI 1.852
 8f8d3c2ee338e1a4658a88156095f0e10a6d5682 VIDELIBRI 1.7
 938e7d88f5699106a786bf008b65c7a9ffaa58f2 VIDELIBRI 1.615
 956c0cbb592326c7cbb0e6ab127aa74af46d894f VIDELIBRI 2.010
 96b9e3853119cead8bec21af79a7490efc2583b3 VIDELIBRI 1.991
+977db2c185130329ab6364d571d629fd72b400df VIDELIBRI 2.785
 989a3d7cd7214ee608f8e78c7d192769bfe6ddf8 VIDELIBRI 1.675
 9af7f4d081eab8a7adf2a11c7a57e11bbfe5ee8b VIDELIBRI 1.850
+9b0912da41f9ecb82d06f7845b9d5e278bfe35e3 VIDELIBRI 2.820
 9c9e78fb2afd770dfbcb1c6ed721877bac0db69f VIDELIBRI 1.860
 a17f8ba73c8d9a29d7c4ad892ae07efd56ba5fdf VIDELIBRI 2.040
 a56e024adf7de1c32642668b815aa7aee05870d4 VIDELIBRI 1.950
+a5f9b74c0c115c070dbc12157723112eebf9e39c VIDELIBRI 2.784
 a64b720bdbc48c4f16c6554019ff3b5c982bfe6b VIDELIBRI 1.620
 a681e253d19d246969ce69050008a02ad30e225b VIDELIBRI 2.710
+ad1ba72a30de44275d7515fb853efaa0b213fb12 VIDELIBRI 2.800
 b15833dca2cd7e541f903dac5970f1a829cf0204 VIDELIBRI 2.650
 b1ffb382dd4b0ea1ebf939723151aa3b204b5a3e VIDELIBRI 2.765
 b52778efe1717dd8549f40fca9627132fb2d7034 VIDELIBRI 2.100
@@ -83,7 +89,10 @@ bf1600f56b41312837e2242006f9beb9fe8857fb VIDELIBRI 1.680
 c0038ad65c5fdd09541ecf30d303f368fdb13434 VIDELIBRI 2.140
 c14865258f4ecf51c345b23138f13dbd6f208941 VIDELIBRI 2.050
 c196df88df0eee3d418b66f1e16f58a4f2bddbc2 VIDELIBRI 1.998
+c287f7359b2fd9e4ee208829c3d1a6b493b3ac54 VIDELIBRI 2.900
 c6145a3fe3f224ae00a519c4bf425b7cffe021aa VIDELIBRI 2.600
+c8ecfd485fc641d65756fbe3f4a35907a7cb74a1 VIDELIBRI 2.765
+c998d225f9d5a66b2d29341335abbc2147349891 VIDELIBRI 2.920
 cbb51fc605dff113170acb7c4961460b57fa146a VIDELIBRI 2.172
 d6b0846e9cda3051ac059e5f7427c8b5562c4a9d VIDELIBRI 2.760
 d8ce4f79e52794374087209a18991f7919e73825 VIDELIBRI 2.064
@@ -102,6 +111,7 @@ ed06fb9af3f63b5083013994082ffa5ce281c6a7 VIDELIBRI 1.987
 f0c34ff619b8bd0b19b1880e0f720dac017809bd VIDELIBRI 1.980
 f1beedaefa3e6c463827e42127f887bc6dc9add8 VIDELIBRI 2.200
 f5807196f4f232caae8f8096a214a02e05883ca9 VIDELIBRI 1.887
+f6d7e1c96005d2863ca5a4e8fc27f3d5a3e0068b VIDELIBRI 2.850
 f820623b46b4bfaa4790c666ee0eb56826f841eb VIDELIBRI 1.660
 f89ed8a5e4cbde3fab3648dbf90c1c37fed5d019 VIDELIBRI 2.030
 f9f07975326faaeea9ff8c3f5f216ba272ceeaf2 VIDELIBRI 2.580

diff --git a/_meta/installer/videlibri.iss b/_meta/installer/videlibri.iss
@@ -1,8 +1,8 @@
 
  [Setup]
 ;Change this in every version
-AppVerName=VideLibri 2.765
-AppVersion=2.765
+AppVerName=VideLibri 2.920
+AppVersion=2.920
 
 ;Don't change
 ;Unicode-Check: ääääääööööüüüüüü

diff --git a/_meta/sfsite/downloadTable.html b/_meta/sfsite/downloadTable.html
@@ -1,16 +1,22 @@
 <div>
          Es gibt die folgenden VideLibri-Downloads auf der 
-         <a href="http://sourceforge.net/projects/videlibri/files/VideLibri/VideLibri%202.765/">SourceForge-Downloadseite</a>:
+         <a href="http://sourceforge.net/projects/videlibri/files/VideLibri/VideLibri%202.920/">SourceForge-Downloadseite</a>:
          <br/><br/>
          <table class="downloadTable">
          <tr><th>Betriebsystem</th><th>Dateiname</th><th>Dateigröße</th></tr>
          <tr><td>Windows: </td><td>
-           <a href="https://sourceforge.net/projects/videlibri/files/VideLibri/VideLibri%202.765/videlibri-setup.exe/download">
+           <a href="https://sourceforge.net/projects/videlibri/files/VideLibri/VideLibri%202.920/videlibri-setup.exe/download">
 videlibri-setup.exe
-</a></td><td>4.8 MB</td></tr><tr><td>Debian/Ubuntu: 64 Bit</td><td>
-           <a href="https://sourceforge.net/projects/videlibri/files/VideLibri/VideLibri%202.765/videlibri_2.765-1_amd64.deb/download">
-videlibri_2.765-1_amd64.deb
+</a></td><td>4.8 MB</td></tr><tr><td>Quellcode:</td><td>
+           <a href="https://sourceforge.net/projects/videlibri/files/VideLibri/VideLibri%202.920/videlibri-2.920.src.tar.gz/download">
+videlibri-2.920.src.tar.gz
+</a></td><td>9.9 MB</td></tr><tr><td>Debian/Ubuntu: 64 Bit</td><td>
+           <a href="https://sourceforge.net/projects/videlibri/files/VideLibri/VideLibri%202.920/videlibri_2.920-1_amd64.deb/download">
+videlibri_2.920-1_amd64.deb
 </a></td><td>3.4 MB</td></tr><tr><td>Debian/Ubuntu: 32 Bit</td><td>
-           <a href="https://sourceforge.net/projects/videlibri/files/VideLibri/VideLibri%202.765/videlibri_2.765-1_i386.deb/download">
-videlibri_2.765-1_i386.deb
-</a></td><td>2.4 MB</td></tr></table></div>
+           <a href="https://sourceforge.net/projects/videlibri/files/VideLibri/VideLibri%202.920/videlibri_2.920-1_i386.deb/download">
+videlibri_2.920-1_i386.deb
+</a></td><td>34.5 kB</td></tr><tr><td>Android: </td><td>
+           <a href="https://sourceforge.net/projects/videlibri/files/VideLibri/VideLibri%202.920/videlibri_2.920-release.apk/download">
+videlibri_2.920-release.apk
+</a></td><td>7.6 MB</td></tr></table></div>
diff --git a/_meta/tests/pica/update3.html.result b/_meta/tests/pica/update3.html.result
@@ -1,5 +1,6 @@
 book := {}
 reservations := "/loan/DB=1/LNG=DU/USERINFO?ACT=UI_DATA&amp;BOR_U=0012345965&amp;BOR_PW_ENC=%12XY%12%12%12%12%12%12%12%12%12%12%12%12%12%12%12%12%12"
+picaVersion := 1
 delete-current-books() := ()
 book := {"author": "", "duedate:dd-mm-yyyy": "25-05-2011", "extendId": "105005296", "id": "23/434:W XYZ", "status:curious": "ausgeliehen (0 Mahnung/en)", "title": "a title: and subtitle"}
 book := {"author": "Vor Name; Vorr X", "duedate:dd-mm-yyyy": "30-05-2011", "extendId": "101430092", "id": "19/123:X MUI", "status:curious": "ausgeliehen (0 Mahnung/en)", "title": "Titel: ein Untertitel "}

diff --git a/_meta/tests/pica/update_abholen.html.result b/_meta/tests/pica/update_abholen.html.result
@@ -1,5 +1,6 @@
 book := {}
 reservations := "/loan/DB=1/LNG=DU/USERINFO?ACT=UI_LOR&amp;BOR_U=123&amp;BOR_PW_ENC=xxx"
+picaVersion := 1
 delete-current-books() := ()
 book := {"author": "def introductio", "duedate:dd-mm-yyyy": "11-07-2011", "extendId": "1049957", "id": "12/3456:X ABC", "status:curious": "ausgeliehen (0 Mahnung/en)", "title": "Some Systems: a abc"}
 book := {"author": "Sound So; Aber W", "duedate:dd-mm-yyyy": "18-07-2011", "extendId": "123", "id": "18/123:C ABC", "status:curious": "ausgeliehen (0 Mahnung/en)", "title": "Systeme: blabla "}

diff --git a/_meta/tests/pica/update_luebeck.html.result b/_meta/tests/pica/update_luebeck.html.result
@@ -1,4 +1,5 @@
 book := {}
 reservations := "https://lhopc4.ub.uni-kiel.de/loan/DB=4/USERINFO?ACT=UI_LOR&amp;BOR_U=084111403X&amp;BOR_PW_ENC=kKjUaxEsFtzUQ91PqQZPDtRD3U%2BpBk8O1B9ckuxE4YY%3D"
+picaVersion := 1
 delete-current-books() := ()
 book := {"author": "", "duedate:dd-mm-yyyy": "02-10-2013", "extendId": "841$0001709046", "id": "LB:VK:603/2", "status:curious": "ausgeliehen (0 Mahnung(en))", "title": "Public-key cryptography"}
diff --git a/_meta/tests/pica/update_vormerk.khsb.html.result b/_meta/tests/pica/update_vormerk.khsb.html.result
@@ -1,5 +1,6 @@
 book := {}
 reservations := "/loan/DB=40/USERINFO?ACT=UI_LOR&amp;BOR_U=8001770&amp;BOR_PW_ENC=MONg3C25I%2FTUQ91PqQZPDtRD3U%2BpBk8O4qEvrrpMhLw%3D"
+picaVersion := 1
 delete-current-books() := ()
 book := {"author": "Oli", "duedate:dd-mm-yyyy": "10-12-2014", "extendId": "KHSB060062", "id": "LS:A 2000/1", "status:curious": "ausgeliehen, 0 Mahnung(en)", "title": "Souveraen freie Reden halten: die Power der Memo-Rhetorik "}
 book := {"author": "", "duedate:dd-mm-yyyy": "10-12-2014", "extendId": "", "id": "LS:A 2000/3", "status": "ausgeliehen, 0 Mahnung(en)", "statusId": "critical", "title": "Praesentation und Moderation: Arbeitsbuch fuer die Fort- und We"}

diff --git a/_meta/tests/sisis/touchpoint/userAccount_0provided_chem.html.result b/_meta/tests/sisis/touchpoint/userAccount_0provided_chem.html.result
@@ -7,5 +7,5 @@ orderedUrl := ()
 requestedUrl := ()
 mode := 2
 nextPage := ()
-default-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_0provided_chem.html", "_onPageStart": "", "cancelable": false, "statusId": "provided"}
+default-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_0provided_chem.html?anzPos=1", "_onPageStart": "", "cancelable": false, "statusId": "provided"}
 nextPage := ()
diff --git a/_meta/tests/sisis/touchpoint/userAccount_0requests_chem.html.result b/_meta/tests/sisis/touchpoint/userAccount_0requests_chem.html.result
@@ -7,5 +7,5 @@ orderedUrl := ()
 requestedUrl := ()
 mode := 3
 nextPage := ()
-default-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_0request_chem.html", "_onPageStart": "", "cancelable": false, "statusId": "ordered"}
+default-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_0request_chem.html?anzPos=1", "_onPageStart": "", "cancelable": false, "statusId": "ordered"}
 nextPage := ()
diff --git a/_meta/tests/sisis/touchpoint/userAccount_1-10lend_chem.html.result b/_meta/tests/sisis/touchpoint/userAccount_1-10lend_chem.html.result
@@ -8,15 +8,15 @@ requestedUrl := ()
 mode := 1
 books-deleted := true()
 nextPage := ()
-default-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html", "_onPageStart": "", "statusId": "critical"}
-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html", "_onPageStart": "", "actionURI": "vltest://sisis/TouchPoint/renewal.do?methodToCall=renewal&pos=0", "author": "Kipp, Angelika", "cancelable": false, "duedate": "2015-09-17", "id": "A9034165 ", "statusId": "curious", "title": "Lustige Frühlings-Minis"}
-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html", "_onPageStart": "", "actionURI": "vltest://sisis/TouchPoint/renewal.do?methodToCall=renewal&pos=1", "author": "Altmeyer, Maria-Regina", "cancelable": false, "duedate": "2015-09-17", "id": "A3766447 ", "statusId": "curious", "title": "Österlich geschmückt"}
-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html", "_onPageStart": "", "author": "Birkholz, Peter", "duedate": "2015-10-16", "id": "A9560074 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Reparaturen zu Hause"}
-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html", "_onPageStart": "", "author": "Rexrodt von Fircks, Annette", "duedate": "2015-10-19", "id": "B0650122 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "... und flüstere mir vom Leben"}
-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html", "_onPageStart": "", "author": "Bowden, Oliver", "duedate": "2015-10-19", "id": "B0358537 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Assassin's Creed/[2]"}
-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html", "_onPageStart": "", "author": "Hohner, Sigi", "duedate": "2015-10-19", "id": "B0781201 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Betthupferl"}
-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html", "_onPageStart": "", "author": "Fforde, Katie", "duedate": "2015-10-19", "id": "A9350238 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Geschenke aus dem Paradies"}
-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html", "_onPageStart": "", "author": "Scarrow, Simon", "duedate": "2015-10-19", "id": "A7518120 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Gladiator"}
-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html", "_onPageStart": "", "author": "Adlon, Hedda", "duedate": "2015-10-19", "id": "B0955836 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Hotel Adlon"}
-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html", "_onPageStart": "", "author": "Rasheed, Leila", "duedate": "2015-10-19", "id": "B0778007 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Rückkehr nach Somerton Court"}
+default-book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html?anzPos=1", "_onPageStart": "", "statusId": "critical"}
+book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html?anzPos=1", "_onPageStart": "", "actionURI": "vltest://sisis/TouchPoint/renewal.do?methodToCall=renewal&pos=0", "author": "Kipp, Angelika", "cancelable": false, "duedate": "2015-09-17", "id": "A9034165 ", "statusId": "curious", "title": "Lustige Frühlings-Minis"}
+book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html?anzPos=1", "_onPageStart": "", "actionURI": "vltest://sisis/TouchPoint/renewal.do?methodToCall=renewal&pos=1", "author": "Altmeyer, Maria-Regina", "cancelable": false, "duedate": "2015-09-17", "id": "A3766447 ", "statusId": "curious", "title": "Österlich geschmückt"}
+book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html?anzPos=1", "_onPageStart": "", "author": "Birkholz, Peter", "duedate": "2015-10-16", "id": "A9560074 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Reparaturen zu Hause"}
+book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html?anzPos=1", "_onPageStart": "", "author": "Rexrodt von Fircks, Annette", "duedate": "2015-10-19", "id": "B0650122 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "... und flüstere mir vom Leben"}
+book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html?anzPos=1", "_onPageStart": "", "author": "Bowden, Oliver", "duedate": "2015-10-19", "id": "B0358537 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Assassin's Creed/[2]"}
+book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html?anzPos=1", "_onPageStart": "", "author": "Hohner, Sigi", "duedate": "2015-10-19", "id": "B0781201 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Betthupferl"}
+book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html?anzPos=1", "_onPageStart": "", "author": "Fforde, Katie", "duedate": "2015-10-19", "id": "A9350238 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Geschenke aus dem Paradies"}
+book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html?anzPos=1", "_onPageStart": "", "author": "Scarrow, Simon", "duedate": "2015-10-19", "id": "A7518120 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Gladiator"}
+book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html?anzPos=1", "_onPageStart": "", "author": "Adlon, Hedda", "duedate": "2015-10-19", "id": "B0955836 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Hotel Adlon"}
+book := {"_onPage": "vltest://sisis/touchpoint/userAccount_1-10lend_chem.html?anzPos=1", "_onPageStart": "", "author": "Rasheed, Leila", "duedate": "2015-10-19", "id": "B0778007 ", "status": "Eine Verlängerung ist noch nicht möglich.", "statusId": "critical", "title": "Rückkehr nach Somerton Court"}
 nextPage := "/TouchPoint/userAccount.do?methodToCall=pos&amp;accountTyp=loaned&amp;anzPos=11"