From d48eecac695d0b33e5f9188e635fd19a41407255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Tue, 5 Apr 2022 17:06:25 +0200 Subject: [PATCH] Oprava burzy v jidelnicekDen --- CHANGELOG.md | 3 +++ lib/src/canteen.dart | 12 ++++++------ lib/src/tridy.dart | 4 ++-- pubspec.yaml | 3 ++- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66a276e..55396d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.1.0-alpha.8 +- Opravit získávání URL z burzy v `jidelnicekDen` +- tridy.dart - Burza: ~~jidlo~~ --> __nazev__ ## 0.1.0-alpha.7 - Nastavovat `prihlasen` na `false` v případě chyby i u `ziskejUzivatele` - Vylepšení dokumentace diff --git a/lib/src/canteen.dart b/lib/src/canteen.dart index e47a8d0..696dc79 100644 --- a/lib/src/canteen.dart +++ b/lib/src/canteen.dart @@ -135,7 +135,6 @@ class Canteen { if (res.headers['set-cookie']!.contains("remember-me=;")) { return false; // špatné heslo } - print(res.statusCode); if (res.statusCode != 302) { return Future.error("Chyba: ${res.body}"); } @@ -261,10 +260,11 @@ class Canteen { .group(0) .toString()); var jidla = []; - var jidelnicek = - RegExp(r'(?<=
).+?(?=
)', dotAll: true) - .allMatches(res) - .toList(); + var jidelnicek = RegExp( + r'((?<=
).+?do burzy)|((?<=
).+?(?=
))', + dotAll: true) + .allMatches(res) + .toList(); for (var obed in jidelnicek) { // formátování do třídy var o = obed @@ -487,7 +487,7 @@ class Canteen { var jidlo = Burza( den: datum, varianta: varianta, - jidlo: nazev, + nazev: nazev, pocet: pocet, url: url); burza.add(jidlo); diff --git a/lib/src/tridy.dart b/lib/src/tridy.dart index 88bc0b5..9f82447 100644 --- a/lib/src/tridy.dart +++ b/lib/src/tridy.dart @@ -47,7 +47,7 @@ class Burza { final String? url; /// Název jídla - String jidlo; + String nazev; /// Varianta String? varianta; @@ -58,7 +58,7 @@ class Burza { Burza( {required this.den, required this.url, - required this.jidlo, + required this.nazev, required this.pocet, this.varianta}); } diff --git a/pubspec.yaml b/pubspec.yaml index f05f145..dc4b512 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,8 +1,9 @@ name: canteenlib description: Library for communication with the czech canteen food ordering system iCanteen -version: 0.1.0-alpha.7 +version: 0.1.0-alpha.8 repository: 'https://github.com/hernikplays/canteenlib' issue_tracker: 'https://github.com/hernikplays/canteenlib/issues' +documentation: 'https://docs.hernikplays.cz' environment: sdk: '>=2.16.1 <3.0.0'