Merge branch 'master' of skyjake.fi:skyjake/lagrange

1 files changed, 56 insertions, 1 deletions

diff --git a/src/visited.c b/src/visited.c
index af976be5..912a6318 100644
--- a/src/visited.c
+++ b/src/visited.c
@@ -1,8 +1,31 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
 #include "visited.h"
 #include "app.h"
 
 #include <the_Foundation/file.h>
 #include <the_Foundation/path.h>
+#include <the_Foundation/ptrarray.h>
 #include <the_Foundation/sortedarray.h>
 
 static const size_t maxAgeVisited_Visited_ = 3600 * 24 * 30; /* one month */
@@ -73,7 +96,7 @@ void load_Visited(iVisited *d, const char *dirPath) {
         iRangecc       line = iNullRange;
         iTime          now;
         initCurrent_Time(&now);
-        while (nextSplit_Rangecc(&src, "\n", &line)) {
+        while (nextSplit_Rangecc(src, "\n", &line)) {
             int y, m, D, H, M, S;
             sscanf(line.start, "%04d-%02d-%02dT%02d:%02d:%02d ", &y, &m, &D, &H, &M, &S);
             if (!y) break;
@@ -99,6 +122,16 @@ void clear_Visited(iVisited *d) {
     clear_SortedArray(&d->visited);
 }
 
+static size_t find_Visited_(const iVisited *d, const iString *url) {
+    iVisitedUrl visit;
+    init_VisitedUrl(&visit);
+    set_String(&visit.url, url);
+    size_t pos = iInvalidPos;
+    locate_SortedArray(&d->visited, &visit, &pos);
+    deinit_VisitedUrl(&visit);
+    return pos;
+}
+
 void visitUrl_Visited(iVisited *d, const iString *url) {
     iVisitedUrl visit;
     init_VisitedUrl(&visit);
@@ -115,6 +148,14 @@ void visitUrl_Visited(iVisited *d, const iString *url) {
     insert_SortedArray(&d->visited, &visit);
 }
 
+void removeUrl_Visited(iVisited *d, const iString *url) {
+    size_t pos = find_Visited_(d, url);
+    if (pos != iInvalidPos) {
+        deinit_VisitedUrl(at_SortedArray(&d->visited, pos));
+        remove_Array(&d->visited.values, pos);
+    }
+}
+
 iTime urlVisitTime_Visited(const iVisited *d, const iString *url) {
     iVisitedUrl item;
     size_t pos;
@@ -126,3 +167,17 @@ iTime urlVisitTime_Visited(const iVisited *d, const iString *url) {
     deinit_String(&item.url);
     return item.when;
 }
+
+static int cmpWhenDescending_VisitedUrlPtr_(const void *a, const void *b) {
+    const iVisitedUrl *s = *(const void **) a, *t = *(const void **) b;
+    return -cmp_Time(&s->when, &t->when);
+}
+
+const iArray *list_Visited(const iVisited *d, size_t count) {
+    iPtrArray *urls = collectNew_PtrArray();
+    iConstForEach(Array, i, &d->visited.values) {
+        pushBack_PtrArray(urls, i.value);
+    }
+    sort_Array(urls, cmpWhenDescending_VisitedUrlPtr_);
+    return urls;
+}