'split probeMatch scope containing html'

faithoflifedev · May 7, 2023 · 50a2dcb · 50a2dcb
1 parent 41425b4
commit 50a2dcb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.2+12
+
+split probeMatch scope containing html
+
 ## 2.1.2+11
 
 convert html entities appearing in probe response

diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ To use this package in your code, first add the dependency to your project:
 ```yml
 dependencies:
   ...
-  easy_onvif: ^2.1.2+11
+  easy_onvif: ^2.1.2+12
 ```
 
 If you need additional help getting started with dart, check out these [guides](https://dart.dev/guides).

diff --git a/lib/meta.dart b/lib/meta.dart
@@ -3,4 +3,4 @@
 import 'dart:convert' show json;
 
 final pubSpec = json.decode(
-    '{"name":"easy_onvif","version":"2.1.2+11","homepage":"https://github.com/faithoflifedev/easy_onvif","environment":{"sdk":">=2.19.2 <4.0.0"},"description":"A pure Dart library designed primarily for command line automation of Onvif compatible devices, but can be used anywhere Dart is used.","dependencies":{"args":"^2.3.1","crypto":"^3.0.2","dio":"^5.1.1","html_unescape":"^2.0.0","intl":"^0.18.1","json_annotation":"^4.8.0","loggy":"^2.0.3","shelf":"^1.4.1","shelf_router":"^1.1.4","sprintf":"^7.0.0","universal_io":"^2.2.0","uuid":"^3.0.7","xml":"^6.3.0","xml2json":"^5.3.6","yaml":"^3.1.1"},"dev_dependencies":{"build_runner":"^2.3.3","grinder":"^0.9.2","json_serializable":"^6.6.1","lints":"^2.0.1","mustache_template":"^2.0.0","process_run":"^0.12.3+2","pub_semver":"^2.1.3","publish_tools":"^0.1.0+10","pubspec":"^2.3.0","test":"^1.24.2"},"executables":{"onvif":""},"repository":"https://github.com/faithoflifedev/easy_onvif"}');
+    '{"name":"easy_onvif","version":"2.1.2+12","homepage":"https://github.com/faithoflifedev/easy_onvif","environment":{"sdk":">=2.19.2 <4.0.0"},"description":"A pure Dart library designed primarily for command line automation of Onvif compatible devices, but can be used anywhere Dart is used.","dependencies":{"args":"^2.3.1","crypto":"^3.0.2","dio":"^5.1.1","html_unescape":"^2.0.0","intl":"^0.18.1","json_annotation":"^4.8.0","loggy":"^2.0.3","shelf":"^1.4.1","shelf_router":"^1.1.4","sprintf":"^7.0.0","universal_io":"^2.2.0","uuid":"^3.0.7","xml":"^6.3.0","xml2json":"^5.3.6","yaml":"^3.1.1"},"dev_dependencies":{"build_runner":"^2.3.3","grinder":"^0.9.2","json_serializable":"^6.6.1","lints":"^2.0.1","mustache_template":"^2.0.0","process_run":"^0.12.3+2","pub_semver":"^2.1.3","publish_tools":"^0.1.0+10","pubspec":"^2.3.0","test":"^1.24.2"},"executables":{"onvif":""},"repository":"https://github.com/faithoflifedev/easy_onvif"}');
diff --git a/lib/src/model/probe/probe_match.dart b/lib/src/model/probe/probe_match.dart
@@ -108,8 +108,8 @@ class ProbeMatch with UiLoggy {
   String toString() => json.encode(toJson());
 
   static List<String> _listFromXmlJson(Map<String, dynamic> value) =>
-      OnvifUtil.parseHtmlString(OnvifUtil.mappedToString(value))
-          .split(RegExp('[ |,|\n]'));
+      OnvifUtil.mappedToString(value)
+          .split(RegExp([' ', ',', r'\r\\n'].map(RegExp.escape).join('|')));
 
   static List<String> _listFromJson(dynamic json) {
     if (json is Map) {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: easy_onvif
-version: 2.1.2+11
+version: 2.1.2+12
 homepage: https://github.com/faithoflifedev/easy_onvif
 description: A pure Dart library designed primarily for command line automation of Onvif compatible devices, but can be used anywhere Dart is used.
 repository: https://github.com/faithoflifedev/easy_onvif