Skip to content

Commit

Permalink
Merge pull request #207 from SubmarinerApp/playlist-model-rewrite
Browse files Browse the repository at this point in the history 
Initial attempt at changing the playlist schema
  • Loading branch information
@NattyNarwhal
NattyNarwhal authored Jun 4, 2024
2 parents b6d1c4a + 3f45d81 commit e2b6202
Show file tree
Hide file tree
Showing 15 changed files with 1,537 additions and 527 deletions.
30 changes: 23 additions & 7 deletions Submariner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
3E87E9102B4364CF00E85000 /* Collection+IndexSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E87E90F2B4364CF00E85000 /* Collection+IndexSet.swift */; };
3E87E9122B436B4500E85000 /* PasteboardType+Submariner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E87E9112B436B4500E85000 /* PasteboardType+Submariner.swift */; };
3E87E9142B460FFB00E85000 /* NSManagedObjectContext+Fetch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E87E9132B460FFB00E85000 /* NSManagedObjectContext+Fetch.swift */; };
3E9090A12C0BC9CE0080284F /* SBPlaylistV8MigrationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E9090A02C0BC9CE0080284F /* SBPlaylistV8MigrationPolicy.swift */; };
3E9090AA2C0BD58B0080284F /* MigrateV7ToV8.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 3E9090A92C0BD58B0080284F /* MigrateV7ToV8.xcmappingmodel */; };
3E9090AE2C0E7D3B0080284F /* SBPlaylistController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E9090AD2C0E7D3B0080284F /* SBPlaylistController.swift */; };
3E94E5F62912EEC40080FDF6 /* SBNavigationItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E94E5F52912EEC40080FDF6 /* SBNavigationItem.swift */; };
3E94E5F82915AAB80080FDF6 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E94E5F72915AAB80080FDF6 /* AVKit.framework */; };
3E94E5FA2915AB130080FDF6 /* SBRoutePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E94E5F92915AB130080FDF6 /* SBRoutePickerView.swift */; };
Expand Down Expand Up @@ -108,7 +111,6 @@
4C56868514050B9A00BE3478 /* SBPodcastItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C56868414050B9A00BE3478 /* SBPodcastItemView.m */; };
4C56868814050C1100BE3478 /* SBPodcastViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C56868714050C1100BE3478 /* SBPodcastViewItem.m */; };
4C7AA229139D53A50050BE95 /* SBTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7AA228139D53A50050BE95 /* SBTableView.m */; };
4C7AA22D139D563A0050BE95 /* SBPlaylistController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7AA22B139D563A0050BE95 /* SBPlaylistController.m */; };
4C7AA22E139D563A0050BE95 /* Playlist.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C7AA22C139D563A0050BE95 /* Playlist.xib */; };
4C7AA232139D57A00050BE95 /* SBMusicController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7AA230139D57A00050BE95 /* SBMusicController.m */; };
4C7AA233139D57A00050BE95 /* Music.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C7AA231139D57A00050BE95 /* Music.xib */; };
Expand Down Expand Up @@ -216,6 +218,10 @@
3E87E90F2B4364CF00E85000 /* Collection+IndexSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Collection+IndexSet.swift"; sourceTree = "<group>"; };
3E87E9112B436B4500E85000 /* PasteboardType+Submariner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PasteboardType+Submariner.swift"; sourceTree = "<group>"; };
3E87E9132B460FFB00E85000 /* NSManagedObjectContext+Fetch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Fetch.swift"; sourceTree = "<group>"; };
3E9090A02C0BC9CE0080284F /* SBPlaylistV8MigrationPolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SBPlaylistV8MigrationPolicy.swift; sourceTree = "<group>"; };
3E9090A22C0BCA4D0080284F /* Submariner v8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Submariner v8.xcdatamodel"; sourceTree = "<group>"; };
3E9090A92C0BD58B0080284F /* MigrateV7ToV8.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = MigrateV7ToV8.xcmappingmodel; sourceTree = "<group>"; };
3E9090AD2C0E7D3B0080284F /* SBPlaylistController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SBPlaylistController.swift; sourceTree = "<group>"; };
3E94E5F52912EEC40080FDF6 /* SBNavigationItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SBNavigationItem.swift; sourceTree = "<group>"; };
3E94E5F72915AAB80080FDF6 /* AVKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; };
3E94E5F92915AB130080FDF6 /* SBRoutePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SBRoutePickerView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -272,8 +278,6 @@
4C56868714050C1100BE3478 /* SBPodcastViewItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBPodcastViewItem.m; sourceTree = "<group>"; };
4C7AA227139D53A40050BE95 /* SBTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBTableView.h; sourceTree = "<group>"; };
4C7AA228139D53A50050BE95 /* SBTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBTableView.m; sourceTree = "<group>"; };
4C7AA22A139D563A0050BE95 /* SBPlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBPlaylistController.h; sourceTree = "<group>"; };
4C7AA22B139D563A0050BE95 /* SBPlaylistController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBPlaylistController.m; sourceTree = "<group>"; };
4C7AA22C139D563A0050BE95 /* Playlist.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Playlist.xib; sourceTree = "<group>"; };
4C7AA22F139D57A00050BE95 /* SBMusicController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBMusicController.h; sourceTree = "<group>"; };
4C7AA230139D57A00050BE95 /* SBMusicController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBMusicController.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -413,6 +417,15 @@
name = Pasteboard;
sourceTree = "<group>";
};
3E90909F2C0BC9B30080284F /* Migrations */ = {
isa = PBXGroup;
children = (
3E9090A02C0BC9CE0080284F /* SBPlaylistV8MigrationPolicy.swift */,
3E9090A92C0BD58B0080284F /* MigrateV7ToV8.xcmappingmodel */,
);
name = Migrations;
sourceTree = "<group>";
};
4C7A3E97148F07F7009C6EE6 /* Subprojects */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -540,6 +553,7 @@
4C87ED7B139CD8BE0064DE2E /* Submariner.xcdatamodeld */,
4C87EE12139CE4380064DE2E /* Abstract */,
4C87EE11139CE4370064DE2E /* Concrete */,
3E90909F2C0BC9B30080284F /* Migrations */,
3E189E3F28EF5BAB0062ACA0 /* SBAudioMetadata.swift */,
3E94E5F52912EEC40080FDF6 /* SBNavigationItem.swift */,
3EB2BCCA2992F03A00DC5056 /* SBSearchResult.swift */,
Expand Down Expand Up @@ -716,8 +730,6 @@
4C7AA230139D57A00050BE95 /* SBMusicController.m */,
4CFCE4451402582400D35770 /* SBMusicSearchController.h */,
4CFCE4461402582400D35770 /* SBMusicSearchController.m */,
4C7AA22A139D563A0050BE95 /* SBPlaylistController.h */,
4C7AA22B139D563A0050BE95 /* SBPlaylistController.m */,
4C7AA24A139D64920050BE95 /* SBServerLibraryController.h */,
4C7AA24B139D64920050BE95 /* SBServerLibraryController.m */,
4CFAFC29139EF08800E82B57 /* SBServerHomeController.h */,
Expand All @@ -731,6 +743,7 @@
3E87E90D2B43557400E85000 /* SBServerSearchController.swift */,
3E7491962B6A1AE00052CBCE /* SBTracklistController.swift */,
3E04F5F12B71E33000E24E56 /* SBServerDirectoryController.swift */,
3E9090AD2C0E7D3B0080284F /* SBPlaylistController.swift */,
);
name = "View Controllers";
sourceTree = "<group>";
Expand Down Expand Up @@ -833,6 +846,7 @@
3EC03B4E29F4F2E0001FDE50 /* SBSection.swift in Sources */,
3EC03B4829F4F2E0001FDE50 /* SBNowPlaying.swift in Sources */,
4C87ED8E139CD91B0064DE2E /* SBWindowController.m in Sources */,
3E9090AA2C0BD58B0080284F /* MigrateV7ToV8.xcmappingmodel in Sources */,
3E2155122B26E6F0004BCCFC /* SBSubsonicRequestType.swift in Sources */,
3E04F5F02B71D60F00E24E56 /* SBDirectory.swift in Sources */,
4C87EDA1139CD97B0064DE2E /* SBSplitView.m in Sources */,
Expand Down Expand Up @@ -886,6 +900,7 @@
3EC03B6129F5B0E2001FDE50 /* SBCover+CoreDataProperties.swift in Sources */,
3EB2BCC92992E85F00DC5056 /* NSImage+Additions.swift in Sources */,
3E45201C29FA488C00604079 /* SBServerUserViewController.swift in Sources */,
3E9090AE2C0E7D3B0080284F /* SBPlaylistController.swift in Sources */,
3EC03B3429F4F2E0001FDE50 /* SBMusicItem.swift in Sources */,
4CFB3EF8139D47EA008DC01A /* SBViewController.m in Sources */,
3EC03B5429F4F2E0001FDE50 /* SBPlaylist.swift in Sources */,
Expand All @@ -898,7 +913,6 @@
4C7AA229139D53A50050BE95 /* SBTableView.m in Sources */,
3EC03B5F29F5B0E2001FDE50 /* SBMusicItem+CoreDataProperties.swift in Sources */,
3EC03B5029F4F2E0001FDE50 /* SBPodcast.swift in Sources */,
4C7AA22D139D563A0050BE95 /* SBPlaylistController.m in Sources */,
4C7AA232139D57A00050BE95 /* SBMusicController.m in Sources */,
3E32BE502B8D9A5C00E77CF0 /* SBTableView+DragImage.swift in Sources */,
4C7AA24D139D64930050BE95 /* SBServerLibraryController.m in Sources */,
Expand Down Expand Up @@ -926,6 +940,7 @@
3EC03B4429F4F2E0001FDE50 /* SBGroup.swift in Sources */,
3EB2BCC32992D94E00DC5056 /* Data+Type.swift in Sources */,
4CFCE4471402582400D35770 /* SBMusicSearchController.m in Sources */,
3E9090A12C0BC9CE0080284F /* SBPlaylistV8MigrationPolicy.swift in Sources */,
4CC6B56814041F7E003AEAC0 /* SBServerPodcastController.m in Sources */,
3E45201A29F5DE9100604079 /* SBImportOperation.swift in Sources */,
4C56868514050B9A00BE3478 /* SBPodcastItemView.m in Sources */,
Expand Down Expand Up @@ -1183,6 +1198,7 @@
4C87ED7B139CD8BE0064DE2E /* Submariner.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
3E9090A22C0BCA4D0080284F /* Submariner v8.xcdatamodel */,
3E32BE562B94407300E77CF0 /* Submariner v7.xcdatamodel */,
3E32BE462B82F35900E77CF0 /* Submariner v6.xcdatamodel */,
3E04F5EE2B71D46E00E24E56 /* Submariner v5.xcdatamodel */,
Expand All @@ -1191,7 +1207,7 @@
3EA06A4E28B2C04B0091A75F /* Submariner v2.xcdatamodel */,
4C87ED7C139CD8BE0064DE2E /* Submariner.xcdatamodel */,
);
currentVersion = 3E32BE562B94407300E77CF0 /* Submariner v7.xcdatamodel */;
currentVersion = 3E9090A22C0BCA4D0080284F /* Submariner v8.xcdatamodel */;
path = Submariner.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
Expand Down
Loading

0 comments on commit e2b6202

Please sign in to comment.