flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-07-03 14:06:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Note Backlinks: Use the linkResolver

Browse Source 
The backlinks should use the same algorithm for determining the links as
is used when clicking on a link.
This commit is contained in:
Vishesh Handa
2020-08-14 16:44:54 +02:00
parent bf97887e10
commit 2fcdfa0d6c
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/utils/link_resolver.dart
View File

@ -1,5 +1,6 @@
import 'package:path/path.dart' as p; import 'package:path/path.dart' as p;
import 'package:gitjournal/core/link.dart';
import 'package:gitjournal/core/note.dart'; import 'package:gitjournal/core/note.dart';
class LinkResolver { class LinkResolver {
@ -7,6 +8,13 @@ class LinkResolver {
LinkResolver(this.inputNote); LinkResolver(this.inputNote);
Note resolveLink(Link l) {
var href = l.filePath;
href ??= '[[${l.term}]]';
return resolve(href);
}
Note resolve(String link) { Note resolve(String link) {
var spec = link; var spec = link;
var folder = inputNote.parent; var folder = inputNote.parent;

11
lib/widgets/notes_backlinks.dart
View File

@ -9,6 +9,7 @@ import 'package:gitjournal/core/note.dart';
import 'package:gitjournal/core/notes_folder_fs.dart'; import 'package:gitjournal/core/notes_folder_fs.dart';
import 'package:gitjournal/features.dart'; import 'package:gitjournal/features.dart';
import 'package:gitjournal/folder_views/common.dart'; import 'package:gitjournal/folder_views/common.dart';
import 'package:gitjournal/utils/link_resolver.dart';
import 'package:gitjournal/widgets/pro_overlay.dart'; import 'package:gitjournal/widgets/pro_overlay.dart';
class NoteBacklinkRenderer extends StatefulWidget { class NoteBacklinkRenderer extends StatefulWidget {
@ -39,15 +40,15 @@ class _NoteBacklinkRendererState extends State<NoteBacklinkRenderer> {
// Log.d("NoteBacklinkRenderer Predicate", props: {"filePath": n.filePath}); // Log.d("NoteBacklinkRenderer Predicate", props: {"filePath": n.filePath});
var links = await n.fetchLinks(); var links = await n.fetchLinks();
var linkResolver = LinkResolver(n);
var matchedLink = links.firstWhere( var matchedLink = links.firstWhere(
(l) { (l) {
if (l.filePath != null) { var matchedNote = linkResolver.resolveLink(l);
return l.filePath == widget.note.filePath; if (matchedNote == null) {
return false;
} }
var term = widget.note.pathSpec(); return matchedNote.filePath == widget.note.filePath;
term = p.basenameWithoutExtension(term);
return term == l.term;
}, },
orElse: () => null, orElse: () => null,
); );

1
test/markdown_toolbar_test.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import 'package:gitjournal/widgets/markdown_toolbar.dart'; import 'package:gitjournal/widgets/markdown_toolbar.dart';