admin/linkding-ios
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Validate URL after import

Browse Source
This commit is contained in:
Juan Gilsanz Polo
2024-04-03 16:18:02 +02:00
parent a37d0866f4
commit 340b37d6e6
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/screens/bookmarks/provider/bookmark_form.provider.dart
View File

@@ -66,9 +66,12 @@ class BookmarkForm extends _$BookmarkForm {
} }
void initializeProviderUrl(String url) { void initializeProviderUrl(String url) {
state.urlController.text = url; final decoded = Uri.decodeComponent(url);
if (Regexps.urlWithoutProtocol.hasMatch(url)) { var value = decoded.contains(":~:text=") ? decoded.split(":~:text=")[1] : null;
state.urlController.text = value ?? decoded;
if (Regexps.urlWithoutProtocol.hasMatch(value ?? decoded)) {
state.urlError = null; state.urlError = null;
checkUrlDetails(updateState: false);
} else { } else {
state.urlError = t.bookmarks.addBookmark.invalidUrl; state.urlError = t.bookmarks.addBookmark.invalidUrl;
} }
@@ -86,11 +89,13 @@ class BookmarkForm extends _$BookmarkForm {
} }
} }
void checkUrlDetails() async { void checkUrlDetails({required bool updateState}) async {
if (state.urlError == null && state.urlController.text != "") { if (state.urlError == null && state.urlController.text != "") {
state.checkBookmarkLoadStatus = LoadStatus.loading; state.checkBookmarkLoadStatus = LoadStatus.loading;
state.checkBookmark = null; state.checkBookmark = null;
ref.notifyListeners(); if (updateState == true) {
ref.notifyListeners();
}
final result = await ref.read(checkBookmarkProvider(state.urlController.text).future); final result = await ref.read(checkBookmarkProvider(state.urlController.text).future);
if (result.successful == true) { if (result.successful == true) {
state.checkBookmark = result.content; state.checkBookmark = result.content;

2
lib/screens/bookmarks/ui/bookmark_form_modal.dart
View File

@@ -197,7 +197,7 @@ class _ModalContent extends ConsumerWidget {
onPressed: provider.checkBookmarkLoadStatus == null && onPressed: provider.checkBookmarkLoadStatus == null &&
provider.urlError == null && provider.urlError == null &&
provider.urlController.text != "" provider.urlController.text != ""
? () => ref.read(bookmarkFormProvider.notifier).checkUrlDetails() ? () => ref.read(bookmarkFormProvider.notifier).checkUrlDetails(updateState: true)
: null, : null,
style: ButtonStyle( style: ButtonStyle(
foregroundColor: provider.checkBookmarkLoadStatus == LoadStatus.loaded foregroundColor: provider.checkBookmarkLoadStatus == LoadStatus.loaded