From 579eaad8785384f2289b9520539cf8ab3227779e Mon Sep 17 00:00:00 2001 From: TommusRhodus Date: Tue, 17 Nov 2026 12:27:38 +0000 Subject: [PATCH 1/2] Meetings at the top level are listed in the sidebar by their call's title A one-off call with no folder of its own is saved at the top of the Meetings folder, and the sidebar only drew folders, so it could only be found under All meetings. Each one now has a row after the folders, with its title and date: clicking it opens the meeting, and it can be dragged onto a folder to file it. Co-Authored-By: Claude Opus 5.5 --- README.md | 5 +++-- Sources/Oatcake/SidebarView.swift | 20 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b5d11e6..a76e561 100644 --- a/README.md +++ b/README.md @@ -105,8 +105,9 @@ text (the transcript and your notes), never audio. You can point Oatcake at a mo your own, on your Mac or your network, instead. The window has three columns: the sidebar (a recording in progress, Upcoming from your -calendar, Needs review, and your folders), the meetings in the selected folder, and the -meeting itself. Settings (⌘,) is its own window, in panes; changes apply as you make them. +calendar, Needs review, and your folders, then any meetings at the top level, listed by their +call's title), the meetings in the selected folder, and the meeting itself. A one-off call with +no folder of its own is saved at the top level; drag it onto a folder to file it. Settings (⌘,) is its own window, in panes; changes apply as you make them. ⌘N starts a new recording, ⌥⌘F searches every meeting from the box above the meeting list (its title, folder, summary, to-dos, notes and transcript; a meeting found by its text shows the line with the words and opens there), and ⌘F finds words in the transcript you're reading. ⇧⌘N makes a diff --git a/Sources/Oatcake/SidebarView.swift b/Sources/Oatcake/SidebarView.swift index df1d57c..b726b1d 100644 --- a/Sources/Oatcake/SidebarView.swift +++ b/Sources/Oatcake/SidebarView.swift @@ -5,7 +5,7 @@ import SwiftUI let dragPrefix = "oatcake-item:" enum SidebarItem: Hashable { - case live, todos, job(String), folder(String) + case live, todos, job(String), folder(String), meeting(String) } /// A section's header runs closer to the sidebar's edge than its rows do. This brings a button at the @@ -36,7 +36,10 @@ struct SidebarView: View { FolderRow(node: item.node, depth: item.depth, open: $open, renaming: $renaming, draft: $draft, newFolderIn: $newFolderIn, dropTarget: $dropTarget) } - if tree.subfolders.isEmpty { Text("No folders yet.").foregroundStyle(.secondary).font(.callout) } + // A one-off call with no folder of its own is saved at the top level. It's listed here + // under its call's title, after the folders, to open or to drag into one. + ForEach(tree.meetings, id: \.path) { m in topLevelRow(m).tag(SidebarItem.meeting(m.path)) } + if tree.children.isEmpty { Text("No folders yet.").foregroundStyle(.secondary).font(.callout) } } } header: { HStack { @@ -112,6 +115,7 @@ struct SidebarView: View { case .live: .live case .todos: .todos case .job(let id): .job(id) + case .meeting(let path, _) where parentOf(path).isEmpty: .meeting(path) case .meeting, .folder, nil: .folder(model.folder) case .new: nil } @@ -121,6 +125,7 @@ struct SidebarView: View { case .todos: model.selection = .todos case .job(let id): model.selection = .job(id) case .folder(let path): model.openFolder(path) + case .meeting(let path): model.openMeeting(path) case nil: break } } @@ -177,6 +182,17 @@ struct SidebarView: View { } } + private func topLevelRow(_ m: TreeNode) -> some View { + HStack(spacing: 4) { + // Where a folder's disclosure arrow is, so the names line up. + Color.clear.frame(width: 12, height: 16) + Label(meetingTitle(m), systemImage: "doc.text").lineLimit(1) + Spacer() + if let date = m.startedAt { Text("\(shortMonth(date)) \(gregorian.component(.day, from: date))").foregroundStyle(.secondary).monospacedDigit() } + } + .draggable(dragPrefix + m.path) + } + private var todosRow: some View { let counts = model.library.todoCounts return HStack { From 3d05155935ab64495a42921f7b67383861a9d6cb Mon Sep 17 00:00:00 2001 From: TommusRhodus Date: Tue, 17 Nov 2026 12:32:36 +0000 Subject: [PATCH 2/2] Review: a top-level row's date comes from its folder name when meeting.json has none, and the README paragraph is wrapped again Co-Authored-By: Claude Opus 5.5 --- README.md | 3 ++- Sources/Oatcake/SidebarView.swift | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a76e561..af5ffdb 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,8 @@ your own, on your Mac or your network, instead. The window has three columns: the sidebar (a recording in progress, Upcoming from your calendar, Needs review, and your folders, then any meetings at the top level, listed by their call's title), the meetings in the selected folder, and the meeting itself. A one-off call with -no folder of its own is saved at the top level; drag it onto a folder to file it. Settings (⌘,) is its own window, in panes; changes apply as you make them. +no folder of its own is saved at the top level; drag it onto a folder to file it. Settings (⌘,) +is its own window, in panes; changes apply as you make them. ⌘N starts a new recording, ⌥⌘F searches every meeting from the box above the meeting list (its title, folder, summary, to-dos, notes and transcript; a meeting found by its text shows the line with the words and opens there), and ⌘F finds words in the transcript you're reading. ⇧⌘N makes a diff --git a/Sources/Oatcake/SidebarView.swift b/Sources/Oatcake/SidebarView.swift index b726b1d..14677bf 100644 --- a/Sources/Oatcake/SidebarView.swift +++ b/Sources/Oatcake/SidebarView.swift @@ -188,7 +188,7 @@ struct SidebarView: View { Color.clear.frame(width: 12, height: 16) Label(meetingTitle(m), systemImage: "doc.text").lineLimit(1) Spacer() - if let date = m.startedAt { Text("\(shortMonth(date)) \(gregorian.component(.day, from: date))").foregroundStyle(.secondary).monospacedDigit() } + if let date = meetingDate(m) { Text("\(shortMonth(date)) \(gregorian.component(.day, from: date))").foregroundStyle(.secondary).monospacedDigit() } } .draggable(dragPrefix + m.path) }