From 73b144ed16279a3d1eba56941e90d335f7a386ef Mon Sep 17 00:00:00 2001 From: Yegor Shovkun Date: Sat, 14 Dec 2024 14:01:42 +0200 Subject: [PATCH] refactor: move try-catch --- lib/eval/dart/service.dart | 10 +++++++++- lib/eval/javascript/service.dart | 10 +++++++++- lib/services/get_filter_list.dart | 6 +----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/lib/eval/dart/service.dart b/lib/eval/dart/service.dart index a479726a..9da8c17c 100644 --- a/lib/eval/dart/service.dart +++ b/lib/eval/dart/service.dart @@ -114,7 +114,15 @@ class DartExtensionService implements ExtensionService { @override FilterList getFilterList() { - return FilterList(_executeLib().getFilterList().map((e) => e is $Value ? e.$reified : e).toList()); + List list; + + try { + list = _executeLib().getFilterList().map((e) => e is $Value ? e.$reified : e).toList(); + } catch (_) { + list = []; + } + + return FilterList(list); } @override diff --git a/lib/eval/javascript/service.dart b/lib/eval/javascript/service.dart index ed7dc591..9cc1ab9d 100644 --- a/lib/eval/javascript/service.dart +++ b/lib/eval/javascript/service.dart @@ -131,7 +131,15 @@ var extention = new DefaultExtension(); @override FilterList getFilterList() { - return FilterList(fromJsonFilterValuesToList(_extensionCall('getFilterList()', []))); + List list; + + try { + list = fromJsonFilterValuesToList(_extensionCall('getFilterList()', [])); + } catch (_) { + list = []; + } + + return FilterList(list); } @override diff --git a/lib/services/get_filter_list.dart b/lib/services/get_filter_list.dart index 3822d588..6fb387b2 100644 --- a/lib/services/get_filter_list.dart +++ b/lib/services/get_filter_list.dart @@ -2,9 +2,5 @@ import 'package:mangayomi/eval/lib.dart'; import 'package:mangayomi/models/source.dart'; List getFilterList({required Source source}) { - try { - return getExtensionService(source).getFilterList().filters; - } catch (_) { - return []; - } + return getExtensionService(source).getFilterList().filters; }