neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-18 11:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fixes always showing non-featured apps last in FeaturedViewController"

Browse Source 
This reverts commit f76e3a12b6.

We’re not sure we want to commit to this behavior, so reverting for now.
This commit is contained in:
Riley Testut
2023-12-11 14:06:34 -06:00
committed by Magesh K
parent f2ab214f27
commit 6a520b3410
2 changed files with 19 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AltStore/Browse/FeaturedViewController.swift
View File

@@ -348,6 +348,11 @@ private extension FeaturedViewController
// Instead, sort by StoreApp.installedApp.storeApp.source.sourceIdentifier, which will be either nil OR source ID. // Instead, sort by StoreApp.installedApp.storeApp.source.sourceIdentifier, which will be either nil OR source ID.
NSSortDescriptor(keyPath: \StoreApp.installedApp?.storeApp?.sourceIdentifier, ascending: true), NSSortDescriptor(keyPath: \StoreApp.installedApp?.storeApp?.sourceIdentifier, ascending: true),
// Show featured apps first.
// Sorting by StoreApp.featuringSource crashes because Source does not respond to compare:
// Instead, sort by StoreApp.featuringSource.identifier, which will be either nil OR source ID.
NSSortDescriptor(keyPath: \StoreApp.featuringSource?.identifier, ascending: false),
// Randomize order within sections. // Randomize order within sections.
NSSortDescriptor(keyPath: \StoreApp.featuredSortID, ascending: true), NSSortDescriptor(keyPath: \StoreApp.featuredSortID, ascending: true),

52
AltStoreCore/Model/DatabaseManager.swift
View File

@@ -188,15 +188,11 @@ public extension DatabaseManager
{ {
// Randomize source order // Randomize source order
let fetchRequest = Source.fetchRequest() let fetchRequest = Source.fetchRequest()
fetchRequest.relationshipKeyPathsForPrefetching = [#keyPath(Source._apps)]
let sources = try context.fetch(fetchRequest) let sources = try context.fetch(fetchRequest)
for source in sources for source in sources
{ {
source.featuredSortID = UUID().uuidString source.featuredSortID = UUID().uuidString
// Randomize app order
self.updateAppFeaturedSortIDs(for: source)
} }
try context.save() try context.save()
@@ -205,43 +201,23 @@ public extension DatabaseManager
{ {
Logger.main.error("Failed to update source order. \(error.localizedDescription, privacy: .public)") Logger.main.error("Failed to update source order. \(error.localizedDescription, privacy: .public)")
} }
}
}
private func updateAppFeaturedSortIDs(for source: Source) do
{
let featuredAppSlots = 5
// Filter out already installed apps.
var featuredApps = Set(source.effectiveFeaturedApps.filter { $0.installedApp == nil }.prefix(featuredAppSlots)) // Take just first 5 featured apps
var otherApps = source.apps.filter { $0.installedApp == nil && !featuredApps.contains($0) }
let remainingSlots = featuredAppSlots - featuredApps.count
// Fill in remaining featured app slots with random uninstalled apps.
for _ in 0 ..< remainingSlots
{
guard let index = otherApps.indices.randomElement() else {
// No remaining apps, so stop filling in slots.
break
}
let randomApp = otherApps[index]
featuredApps.insert(randomApp)
otherApps.remove(at: index)
}
for storeApp in source.apps
{
if featuredApps.contains(storeApp)
{ {
storeApp.featuredSortID = UUID().uuidString // Randomize app order
let fetchRequest = StoreApp.fetchRequest()
let apps = try context.fetch(fetchRequest)
for app in apps
{
app.featuredSortID = UUID().uuidString
}
try context.save()
} }
else catch
{ {
// Prepend "_" to ensure it's sorted after featuredApps. Logger.main.error("Failed to update app order. \(error.localizedDescription, privacy: .public)")
storeApp.featuredSortID = "_" + UUID().uuidString
} }
} }
} }