Add view to show all tracks on a server

This takes advantage of the fact OpenSubsonic specifies that an empty query should return all tracks. With infinite scrolling, this means we can just reuse the search controller and have tracks page in as needed without having a massive download. This also makes it easy to i.e. download all tracks (fixes GH-147).
SubmarinerApp · Mar 1, 2025 · e14de5f · e14de5f
1 parent 11b9055
commit e14de5f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -35,6 +35,8 @@ Doing so isn't fatal (it's not a secret), but it is annoying for other contribut
 
 * Infinite scrolling is added to search results and server albums.
   * This enables pulling results beyond the first page of results.
+* All tracks on the server can be shown in a new view.
+  * This can be accessed by Go - By Tracks (Cmd+3).
 * Fix album information not getting pulled in from tracks on search.
 * Use updated Core Data features for automatic merging of changes between threads.
   * This should reduce weirdness such as faults appearing where they shouldn't.

diff --git a/Submariner/SBDatabaseController.h b/Submariner/SBDatabaseController.h
@@ -193,6 +193,7 @@
 - (IBAction)showIndices:(id)sender;
 - (IBAction)showAlbums:(id)sender;
 - (IBAction)showDirectories:(id)sender;
+- (IBAction)showSongs:(id)sender;
 - (IBAction)showPodcasts:(id)sender;
 - (IBAction)cleanTracklist:(id)sender;
 - (IBAction)goToCurrentTrack:(id)sender;

diff --git a/Submariner/SBDatabaseController.m b/Submariner/SBDatabaseController.m
@@ -890,6 +890,15 @@ - (IBAction)showDirectories:(id)sender {
     [self navigateForwardToNavItem: navItem];
 }
 
+- (IBAction)showSongs:(id)sender {
+    if (!self.server) {
+        return;
+    }
+    [self.server setSelectedTabIndex: 4];
+    SBNavigationItem *navItem = [[SBServerSearchNavigationItem alloc] initWithServer: self.server query: @""];
+    [self navigateForwardToNavItem: navItem];
+}
+
 - (IBAction)showPodcasts:(id)sender {
     if (!self.server) {
         return;
@@ -1352,6 +1361,9 @@ - (void)displayViewControllerForResource:(SBResource *)resource {
             case 3:
                 navItem = [[SBServerDirectoriesNavigationItem alloc] initWithServer: server];
                 break;
+            case 4:
+                navItem = [[SBServerSearchNavigationItem alloc] initWithServer: server query: @""];
+                break;
         }
     } else if([resource isKindOfClass:[SBAlbum class]]) {
         SBAlbum *album = (SBAlbum*)resource;
@@ -1917,7 +1929,11 @@ - (void)pageController:(NSPageController *)pageController didTransitionToObject:
     } else if ([navItem isKindOfClass: SBServerSearchNavigationItem.class]) {
         SBServerSearchNavigationItem *searchNavItem = (SBServerSearchNavigationItem*)navItem;
         // HACK: No sum types in ObjC, see SBNavigationItem
-        if (searchNavItem.searchQuery) {
+        if (searchNavItem.searchQuery && [searchNavItem.searchQuery isEqualToString:@""]) {
+            [self.server searchWithQuery: @""];
+            [searchField setStringValue: @""];
+            [searchToolbarItem endSearchInteraction];
+        } else if (searchNavItem.searchQuery) {
             [self.server searchWithQuery: searchNavItem.searchQuery];
             [searchField setStringValue: searchNavItem.searchQuery];
         } else if (searchNavItem.topTracksForArtist) {

diff --git a/Submariner/SBServerSearchController.swift b/Submariner/SBServerSearchController.swift
@@ -14,6 +14,8 @@ import Cocoa
     @objc dynamic var searchResult: SBSearchResult? {
         didSet {
             switch self.searchResult?.query {
+            case .search(query: let query) where query.isEmpty:
+                self.title = "All Tracks"
             case .search(let query):
                 self.title = "Search Results for \(query)"
             case .similarTo(let artist):

diff --git a/Submariner/en.lproj/MainMenu.xib b/Submariner/en.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -330,12 +330,17 @@ CA
                                     <action selector="showAlbums:" target="494" id="J9l-xR-deB"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="By Directories" keyEquivalent="3" id="7L2-8m-bYP">
+                            <menuItem title="By Tracks" keyEquivalent="3" id="RFV-59-ghe">
+                                <connections>
+                                    <action selector="showSongs:" target="-1" id="bcY-fY-ct4"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="By Directories" keyEquivalent="4" id="7L2-8m-bYP">
                                 <connections>
                                     <action selector="showDirectories:" target="494" id="wSR-kt-g5D"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Podcasts" keyEquivalent="4" id="q8o-ph-bkR">
+                            <menuItem title="Podcasts" keyEquivalent="5" id="q8o-ph-bkR">
                                 <connections>
                                     <action selector="showPodcasts:" target="494" id="hjt-sE-qFb"/>
                                 </connections>