feat: Show private bookmarks in the sidebar (#211)

inseven · Jul 29, 2021 · 674fe73 · 674fe73
1 parent 02ed4f5
commit 674fe73
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 11 deletions.
diff --git a/core/BookmarksCore/Common/Updater.swift b/core/BookmarksCore/Common/Updater.swift
@@ -82,7 +82,8 @@ public class Updater {
                                 url: url,
                                 tags: Set(post.tags),
                                 date: date,
-                                toRead: post.toRead)
+                                toRead: post.toRead,
+                                shared: post.shared)
                 identifiers.insert(item.identifier)
                 _ = try AsyncOperation({ self.database.insertOrUpdate(item, completion: $0) }).wait()
             }

diff --git a/core/BookmarksCore/Store/Database.swift b/core/BookmarksCore/Store/Database.swift
@@ -36,7 +36,8 @@ extension Item {
                   url: try row.get(Database.Schema.url).asUrl(),
                   tags: [],
                   date: try row.get(Database.Schema.date),
-                  toRead: try row.get(Database.Schema.toRead))
+                  toRead: try row.get(Database.Schema.toRead),
+                  shared: try row.get(Database.Schema.shared))
     }
 
 }
@@ -112,6 +113,7 @@ public class Database {
         static let url = Expression<String>("url")
         static let date = Expression<Date>("date")
         static let toRead = Expression<Bool>("to_read")
+        static let shared = Expression<Bool>("shared")
         static let name = Expression<String>("name")
         static let itemId = Expression<Int64>("item_id")
         static let tagId = Expression<Int64>("tag_id")
@@ -169,6 +171,10 @@ public class Database {
             print("add the to_read column...")
             try db.run(Schema.items.addColumn(Schema.toRead, defaultValue: false))
         },
+        11: { db in
+            print("add the shared column...")
+            try db.run(Schema.items.addColumn(Schema.shared, defaultValue: false))
+        },
     ]
 
     static var schemaVersion: Int32 = Array(migrations.keys).max() ?? 0
@@ -257,7 +263,8 @@ public class Database {
                     url: result.url,
                     tags: Set(tags),
                     date: result.date,
-                    toRead: result.toRead)
+                    toRead: result.toRead,
+                    shared: result.shared)
     }
 
     fileprivate func syncQueue_fetchOrInsertTag(name: String) throws -> Int64 {
@@ -325,7 +332,8 @@ public class Database {
                                 Schema.title <- item.title,
                                 Schema.url <- item.url.absoluteString,
                                 Schema.date <- item.date,
-                                Schema.toRead <- item.toRead
+                                Schema.toRead <- item.toRead,
+                                Schema.shared <- item.shared
             ))
         for tagId in tags {
             _ = try self.db.run(
@@ -428,7 +436,8 @@ public class Database {
                 url,
                 tags,
                 date,
-                to_read
+                to_read,
+                shared
             FROM
                 items
             LEFT JOIN
@@ -459,7 +468,8 @@ public class Database {
                         url: try row.url(2),
                         tags: try row.set(3),
                         date: try row.date(4),
-                        toRead: try row.bool(5))
+                        toRead: try row.bool(5),
+                        shared: try row.bool(6))
         }
 
         return items

diff --git a/core/BookmarksCore/Store/Item.swift b/core/BookmarksCore/Store/Item.swift
@@ -32,15 +32,24 @@ public class Item: Equatable {
     public let tags: Set<String>
     public let date: Date
     public let toRead: Bool
+    public let shared: Bool
     public let thumbnail: SafeImage?
 
-    init(identifier: String, title: String, url: URL, tags: Set<String>, date: Date, toRead: Bool, thumbnail: SafeImage? = nil) {
+    init(identifier: String,
+         title: String,
+         url: URL,
+         tags: Set<String>,
+         date: Date,
+         toRead: Bool,
+         shared: Bool,
+         thumbnail: SafeImage? = nil) {
         self.identifier = identifier
         self.title = title
         self.url = url
         self.tags = Set(tags.map { $0.lowercased() })
         self.date = date
         self.toRead = toRead
+        self.shared = shared
         self.thumbnail = thumbnail
     }
 
@@ -63,6 +72,9 @@ public class Item: Equatable {
         guard lhs.toRead == rhs.toRead else {
             return false
         }
+        guard lhs.shared == rhs.shared else {
+            return false
+        }
         return true
     }
 

diff --git a/core/BookmarksCore/Store/QueryDescription.swift b/core/BookmarksCore/Store/QueryDescription.swift
@@ -44,6 +44,15 @@ public struct Unread: QueryDescription {
 
 }
 
+public struct Shared: QueryDescription {
+
+    public var sql: String { "items.shared = 1" }
+
+    public init() { }
+
+}
+
+
 public struct Tag: QueryDescription {
 
     let name: String

diff --git a/core/BookmarksCoreTests/DatabaseTests.swift b/core/BookmarksCoreTests/DatabaseTests.swift
@@ -25,13 +25,20 @@ import XCTest
 
 extension Item {
 
-    convenience init(title: String, url: URL, tags: Set<String>, date: Date, toRead: Bool = false, thumbnail: SafeImage? = nil) {
+    convenience init(title: String,
+                     url: URL,
+                     tags: Set<String>,
+                     date: Date,
+                     toRead: Bool = false,
+                     shared: Bool = false,
+                     thumbnail: SafeImage? = nil) {
         self.init(identifier: UUID().uuidString,
                   title: title,
                   url: url,
                   tags: tags,
                   date: date,
                   toRead: toRead,
+                  shared: shared,
                   thumbnail: thumbnail)
     }
 
@@ -308,7 +315,8 @@ class DatabaseTests: XCTestCase {
                         url: item.url,
                         tags: tags,
                         date: item.date,
-                        toRead: item.toRead)
+                        toRead: item.toRead,
+                        shared: item.shared)
         })
     }
 

diff --git a/macos/Bookmarks/BookmarksApp.swift b/macos/Bookmarks/BookmarksApp.swift
@@ -56,14 +56,18 @@ struct BookmarksApp: App {
                     selection = .today
                 }
                 .keyboardShortcut("2", modifiers: .command)
+                Button("Public") {
+                    selection = .shared
+                }
+                .keyboardShortcut("3", modifiers: .command)
                 Button("Unread") {
                     selection = .unread
                 }
-                .keyboardShortcut("3", modifiers: .command)
+                .keyboardShortcut("4", modifiers: .command)
                 Button("Untagged") {
                     selection = .untagged
                 }
-                .keyboardShortcut("4", modifiers: .command)
+                .keyboardShortcut("5", modifiers: .command)
             }
         }
         SwiftUI.Settings {

diff --git a/macos/Bookmarks/BookmarksSection.swift b/macos/Bookmarks/BookmarksSection.swift
@@ -25,6 +25,7 @@ enum BookmarksSection {
     case untagged
     case today
     case unread
+    case shared
     case favorite(tag: String)
     case tag(tag: String)
 }
@@ -43,6 +44,8 @@ extension BookmarksSection: CustomStringConvertible, Hashable, Identifiable {
             return "uk.co.inseven.bookmarks.unread"
         case .today:
             return "uk.co.inseven.bookmarks.today"
+        case .shared:
+            return "uk.co.inseven.bookmarks.shared"
         case .favorite(let tag):
             return "uk.co.inseven.bookmarks.favorites.\(tag)"
         case .tag(let tag):

diff --git a/macos/Bookmarks/Views/Sidebar.swift b/macos/Bookmarks/Views/Sidebar.swift
@@ -55,6 +55,13 @@ struct Sidebar: View {
                                 systemImage: "sun.max.fill",
                                 databaseView: ItemsView(database: manager.database, query: Today()))
 
+                    SidebarLink(selection: $selection,
+                                tag: .shared,
+                                title: "Public",
+                                systemImage: "globe",
+                                databaseView: ItemsView(database: manager.database, query: Shared()))
+
+
                     SidebarLink(selection: $selection,
                                 tag: .unread,
                                 title: "Unread",