Use URL for bookmark completion too (#189).

In case the bookmark has no tags, it was not possible to filter the generated
completion list. This patch allows to use the URL of the bookmark for the tag
matching in case no tags are available. This is done by splitting the URL on
'.' and '/' characters.

diff --git a/doc/vimb.1 b/doc/vimb.1
index d271d34..bb7d586 100644 (file)
--- a/doc/vimb.1
+++ b/doc/vimb.1
@@ -980,8 +980,9 @@ Example:
 .RS
 .PD 0
 .IP ":open \fB!\fPfoo ba"
-will match all bookmark that have the tags "foo" or "foot" and tags starting
-with "ba" like "ball".
+will match all bookmark that have tags starting with "foo" and "ba".
+If the bookmark does not have any tags set, the URL is split on `.' and `/'
+into tags.
 .PD
 .RE
 .TP

diff --git a/src/bookmark.c b/src/bookmark.c
index 8c8ea2d..2054442 100644 (file)
--- a/src/bookmark.c
+++ b/src/bookmark.c
@@ -260,7 +260,8 @@ static GList *load(const char *file)
 }
 
 /**
- * Checks if the given bookmark have all given query strings as prefix.
+ * Checks if the given bookmark matches all given query strings as prefix. If
+ * the bookmark has no tags, the matching is done on the '/' splited URL.
  *
  * @bm:    bookmark to test if it matches
  * @query: char array with tags to search for
@@ -271,22 +272,28 @@ static GList *load(const char *file)
 static gboolean bookmark_contains_all_tags(Bookmark *bm, char **query,
     unsigned int qlen)
 {
+    const char *separators;
+    char *cursor;
     unsigned int i;
     gboolean found;
 
     if (!qlen) {
         return true;
     }
-    /* don't use bookmarks without tags if tags are used to filter */
-    if (!bm->tags) {
-        return false;
+
+    if (bm->tags) {
+        /* If there are tags - use them for matching. */
+        separators = " ";
+        cursor     = bm->tags;
+    } else {
+        /* No tags available - matching is based on the path parts of the URL. */
+        separators = "./";
+        cursor     = bm->uri;
     }
 
     /* iterate over all query parts */
     for (i = 0; i < qlen; i++) {
-        /* put the cursor to the tags string of the bookmarks */
-        char *cursor = bm->tags;
-        found        = false;
+        found = false;
 
         /* we want to do a prefix match on all bookmark tags - so we check for
          * a match on string begin - if this fails we move the cursor to the
@@ -297,9 +304,9 @@ static gboolean bookmark_contains_all_tags(Bookmark *bm, char **query,
                 found = true;
                 break;
             }
-            /* if match was not found at the cursor position - move cursor
-             * behind the next space */
-            if ((cursor = strchr(cursor, ' '))) {
+            /* If match was not found at the cursor position - move cursor
+             * behind the next separator char. */
+            if ((cursor = strpbrk(cursor, separators))) {
                 cursor++;
             }
         }