Better algorithms, more error handling

ModernDepictions/ModernHome/FeaturedBannersView.mm

@@ -33,7 +33,8 @@ - (instancetype)initWithPackages:(NSArray *)packages bannerLimit:(NSUInteger)ban
 	// V:|-16-[image(==148)]-16-|
 	// H:[previous]-16-[image(==263)]
 	// Radius: 10
-	for (NSUInteger i = 0; i < bannerLimit; i++) {
+	NSLog(@"Packages: %@", packages);
+	for (NSUInteger i = 0; i < min(packages.count, bannerLimit); i++) {
 		NSDictionary *packageInfo = packages[i];
 		FeaturedBannerView *banner = [FeaturedBannerView bannerWithPackageInfo:packageInfo];
 		[banner addTarget:self action:@selector(handleBannerTap:) forControlEvents:UIControlEventTouchUpInside];

ModernDepictions/ModernHome/FeaturedDummyPackage.h

@@ -0,0 +1,7 @@
+#import <Foundation/Foundation.h>
+
+@interface FeaturedDummyPackage : NSObject
+@property (nonatomic, readonly) NSString *identifier;
+@property (nonatomic, readonly) NSString *name;
+- (instancetype)initWithPackageName:(NSString *)name identifier:(NSString *)identifier;
+@end

ModernDepictions/ModernHome/FeaturedDummyPackage.mm

@@ -0,0 +1,46 @@
+#import "FeaturedDummyPackage.h"
+
+@implementation FeaturedDummyPackage
+
+static UIImage *qmarkIcon;
+
++ (void)initialize {
+	if ([self class] == [FeaturedDummyPackage class]) {
+		qmarkIcon = [UIImage imageNamed:@"unknown"];
+	}
+}
+
+- (void)parse {}
+
+- (NSString *)mode {
+	return nil;
+}
+
+- (UIImage *)icon {
+	return qmarkIcon;
+}
+
+- (NSString *)id {
+	return _identifier;
+}
+
+- (id)author {
+	return nil;
+}
+
+- (BOOL)uninstalled {
+	return YES;
+}
+
+- (NSString *)shortDescription {
+	return @"This package is not available in your sources.";
+}
+
+- (instancetype)initWithPackageName:(NSString *)name identifier:(NSString *)identifier {
+	self = [super init];
+	_name = name;
+	_identifier = identifier;
+	return self;
+}
+
+@end

ModernDepictions/ModernHome/ModernHomeController.h

@@ -7,6 +7,7 @@
 	Cydia *_cydiaDelegate;
 	Database *database;
 	UIBarButtonItem *refreshButton;
+	NSMutableDictionary *dummies;
 	NSArray *cells; // Contains both actual cells and dictionaries
 }
 @property (nonatomic, assign, setter=setDelegate:, getter=delegate) Cydia *cydiaDelegate;

ModernDepictions/ModernHome/ModernHomeController.mm

@@ -2,8 +2,11 @@
 #import "FeaturedPackageCell.h"
 #import "FeaturedBannersView.h"
 #import "FeaturedHeaderView.h"
+#import "FeaturedDummyPackage.h"
 #import <Tweak/Tweak.h>
 
+#define REFRESH_ALGORITHM_VERSION 1
+
 @implementation ModernHomeController
 
 - (instancetype)init {
@@ -33,9 +36,16 @@ - (void)viewDidLoad {
 			toDate:lastRefresh 
 			options:0
 		];
+		NSNumber *lastRefreshedWith = [stddef objectForKey:@"ModernDepictionsLastRefreshVersion"];
 		shouldRefresh = (
-			![stddef objectForKey:@"ModernDepictionsCachedFeaturedPackages"] ||
-			([aWeekAfterRefresh compare:[NSDate date]] == NSOrderedAscending)
+			(
+				![stddef objectForKey:@"ModernDepictionsCachedFeaturedPackages"] ||
+				([aWeekAfterRefresh compare:[NSDate date]] == NSOrderedAscending)
+			) ||
+			(
+				![lastRefreshedWith isKindOfClass:[NSNumber class]] ||
+				[lastRefreshedWith unsignedLongValue] < REFRESH_ALGORITHM_VERSION
+			)
 		);
 	}
 	else {
@@ -74,10 +84,11 @@ - (void)loadFeaturedPackages {
 	}
 	NSLog(@"Featured packages: %@", featuredPackages);
 	NSMutableArray *chosenPackages = [NSMutableArray new];
-	for (int i = featuredPackages.count; i > max(0, featuredPackages.count - 9); i--) {
+	for (int i = featuredPackages.count; i > 0; i--) {
 		NSInteger index = arc4random_uniform(i);
 		[chosenPackages addObject:featuredPackages[index]];
 		[featuredPackages removeObjectAtIndex:index];
+		if ([chosenPackages count] >= 9) break;
 	}
 	NSLog(@"Chose packages: %@", chosenPackages);
 	[self createCellsFromPackages:chosenPackages];
@@ -112,7 +123,8 @@ - (void)refreshFeaturedPackages {
 			dispatch_sync(dispatch_get_main_queue(), ^{
 				self.title = [NSString stringWithFormat:@"%@...", source.name];
 			});
-			NSURL *featuredURL = [[NSURL URLWithString:source.rooturi] URLByAppendingPathComponent:@"sileo-featured.json"];
+			NSURL *rootURI = [NSURL URLWithString:source.rooturi];
+			NSURL *featuredURL = [rootURI URLByAppendingPathComponent:@"sileo-featured.json"];
 			if (!featuredURL) continue;
 			NSData *rawJSON = [NSData dataWithContentsOfURL:featuredURL];
 			NSLog(@"Featured URL: %@, Data: %@", featuredURL, rawJSON);
@@ -136,10 +148,11 @@ - (void)refreshFeaturedPackages {
 					if (data) banner[@"imageData"] = data;
 				}
 			}
-			finalDictionary[featuredURL.absoluteString] = [JSON copy];
+			finalDictionary[rootURI.absoluteString] = [JSON copy];
 		}
 		[stddef setObject:finalDictionary forKey:@"ModernDepictionsCachedFeaturedPackages"];
 		[stddef setObject:[NSDate date] forKey:@"ModernDepictionsLastRefreshDate"];
+		[stddef setObject:@(REFRESH_ALGORITHM_VERSION) forKey:@"ModernDepictionsLastRefreshVersion"];
 		dispatch_sync(dispatch_get_main_queue(), ^{
 			[self loadFeaturedPackages];
 			refreshButton.enabled = YES;
@@ -171,7 +184,16 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 	else if ([object isKindOfClass:[NSDictionary class]]) {
 		cell = [tableView dequeueReusableCellWithIdentifier:@"Package"];
 		if (!cell) cell = [[FeaturedPackageCell alloc] initWithIconSize:65.0 centerText:YES reuseIdentifier:@"Package"];
-		((FeaturedPackageCell *)cell).package = [database packageWithName:cells[indexPath.row][@"package"]];
+		NSString *packageID = cells[indexPath.row][@"package"];
+		__kindof NSObject *package = [database packageWithName:packageID];
+		if (!package) {
+			if (!dummies) dummies = [NSMutableDictionary new];
+			if (!dummies[packageID]) {
+				dummies[packageID] = [[FeaturedDummyPackage alloc] initWithPackageName:cells[indexPath.row][@"title"] identifier:packageID];
+			}
+			package = dummies[packageID];
+		}
+		((FeaturedPackageCell *)cell).package = package;
 	}
 	else {
 		cell = (UITableViewCell *)object;
@@ -196,16 +218,4 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 	} 
 }
 
-- (void)didSelectPackage:(NSString *)packageID {
-	Package *package = [database packageWithName:packageID];
-	NSLog(@"Did select: %@", package);
-	[self.navigationController 
-		pushViewController:[(Cydia *)[UIApplication sharedApplication]
-			pageForPackage:[package id]
-			withReferrer:ModernDepictionsGeneratePackageURL([package id])
-		]
-		animated:YES
-	];
-}
-
 @end

Tweak/ModernHome.xm

@@ -1,10 +1,23 @@
 #import <UIKit/UIKit.h>
 #import <Headers/Headers.h>
 #import <ModernDepictions/ModernHome/ModernHomeController.h>
+#import "Tweak.h"
 
 @interface HomeController : CyteViewController
 @end
 
+static void _logos_method$ModernHome$Shared$didSelectPackage$(UIViewController *self, SEL _cmd, NSString *packageID) {
+	Package *package = [[%c(Database) sharedInstance] packageWithName:packageID];
+	NSLog(@"Did select: %@", package);
+	[self.navigationController
+		pushViewController:[(Cydia *)[UIApplication sharedApplication]
+			pageForPackage:[package id]
+			withReferrer:ModernDepictionsGeneratePackageURL([package id])
+		]
+		animated:YES
+	];
+}
+
 %group ModernHome
 %hook Cydia
 
@@ -17,6 +30,19 @@
 %end
 %end
 
+
 void ModernDepictionsInitializeHome(void) {
 	%init(ModernHome);
+	class_addMethod(
+		objc_getClass("ModernHomeController"),
+		@selector(didSelectPackage:),
+		(IMP)_logos_method$ModernHome$Shared$didSelectPackage$,
+		"@:@"
+	);
+	class_addMethod(
+		objc_getClass("SectionController"),
+		@selector(didSelectPackage:),
+		(IMP)_logos_method$ModernHome$Shared$didSelectPackage$,
+		"@:@"
+	);
 }