#include <Cytore.hpp>
+#include <CydiaSubstrate/CydiaSubstrate.h>
#include "Menes/Menes.h"
#include "CyteKit/PerlCompatibleRegEx.hpp"
+#include "CyteKit/TableViewCell.h"
#include "CyteKit/WebScriptObject-Cyte.h"
#include "CyteKit/WebViewController.h"
#include "CyteKit/stringWithUTF8Bytes.h"
+#include "Cydia/MIMEAddress.h"
+#include "Cydia/LoadingViewController.h"
#include "Cydia/ProgressEvent.h"
#include "SDURLCache/SDURLCache.h"
-
-#include <CydiaSubstrate/CydiaSubstrate.h>
/* }}} */
/* Profiler {{{ */
#define _end }
/* }}} */
-#define _pooled _H<NSAutoreleasePool> _pool([[NSAutoreleasePool alloc] init], true);
-
-#define CYPoolStart() \
- NSAutoreleasePool *_pool([[NSAutoreleasePool alloc] init]); \
- do
-#define CYPoolEnd() \
- while (false); \
- [_pool release];
-
+#include "Version.h"
#define Cydia_ CYDIA_VERSION
#define lprintf(args...) fprintf(stderr, args)
notify_post("com.saurik.Cydia.status");
}
+static CGFloat CYStatusBarHeight(UIInterfaceOrientation orientation) {
+ CGSize size([[UIApplication sharedApplication] statusBarFrame].size);
+ return UIInterfaceOrientationIsPortrait(orientation) ? size.height : size.width;
+}
+
/* NSForcedOrderingSearch doesn't work on the iPhone */
static const NSStringCompareOptions MatchCompareOptions_ = NSLiteralSearch | NSCaseInsensitiveSearch;
static const NSStringCompareOptions LaxCompareOptions_ = NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSCaseInsensitiveSearch;
static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | kCFCompareNonliteral | kCFCompareLocalized | kCFCompareNumerically | kCFCompareWidthInsensitive | kCFCompareForcedOrdering;
-/* Radix Sort {{{ */
-typedef uint32_t (*SKRadixFunction)(id, void *);
-
-@interface NSMutableArray (Radix)
-- (void) radixSortUsingFunction:(SKRadixFunction)function withContext:(void *)argument;
-@end
-
-struct RadixItem_ {
- size_t index;
- uint32_t key;
-};
-
-@implementation NSMutableArray (Radix)
-
-- (void) radixSortUsingFunction:(SKRadixFunction)function withContext:(void *)argument {
- size_t count([self count]);
- struct RadixItem_ *swap(new RadixItem_[count * 2]);
-
- for (size_t i(0); i != count; ++i) {
- RadixItem_ &item(swap[i]);
- item.index = i;
-
- id object([self objectAtIndex:i]);
- item.key = function(object, argument);
- }
-
- struct RadixItem_ *lhs(swap), *rhs(swap + count);
-
- static const size_t width = 32;
- static const size_t bits = 11;
- static const size_t slots = 1 << bits;
- static const size_t passes = (width + (bits - 1)) / bits;
-
- size_t *hist(new size_t[slots]);
-
- for (size_t pass(0); pass != passes; ++pass) {
- memset(hist, 0, sizeof(size_t) * slots);
-
- for (size_t i(0); i != count; ++i) {
- uint32_t key(lhs[i].key);
- key >>= pass * bits;
- key &= _not(uint32_t) >> width - bits;
- ++hist[key];
- }
-
- size_t offset(0);
- for (size_t i(0); i != slots; ++i) {
- size_t local(offset);
- offset += hist[i];
- hist[i] = local;
- }
-
- for (size_t i(0); i != count; ++i) {
- uint32_t key(lhs[i].key);
- key >>= pass * bits;
- key &= _not(uint32_t) >> width - bits;
- rhs[hist[key]++] = lhs[i];
- }
-
- RadixItem_ *tmp(lhs);
- lhs = rhs;
- rhs = tmp;
- }
-
- delete [] hist;
-
- const void **values(new const void *[count]);
- for (size_t i(0); i != count; ++i)
- values[i] = [self objectAtIndex:lhs[i].index];
- CFArrayReplaceValues((CFMutableArrayRef) self, CFRangeMake(0, count), values, count);
- delete [] values;
-
- delete [] swap;
-}
-
-@end
-/* }}} */
/* Insertion Sort {{{ */
CFIndex SKBSearch_(const void *element, CFIndex elementSize, const void *list, CFIndex count, CFComparatorFunction comparator, void *context) {
};
/* }}} */
-/* Mime Addresses {{{ */
-@interface Address : NSObject {
- NSString *name_;
- NSString *address_;
-}
-
-- (NSString *) name;
-- (NSString *) address;
-
-- (void) setAddress:(NSString *)address;
-
-+ (Address *) addressWithString:(NSString *)string;
-- (Address *) initWithString:(NSString *)string;
-
-@end
-
-@implementation Address
-
-- (void) dealloc {
- [name_ release];
- if (address_ != nil)
- [address_ release];
- [super dealloc];
-}
-
-- (NSString *) name {
- return name_;
-}
-
-- (NSString *) address {
- return address_;
-}
-
-- (void) setAddress:(NSString *)address {
- if (address_ != nil)
- [address_ autorelease];
- if (address == nil)
- address_ = nil;
- else
- address_ = [address retain];
-}
-
-+ (Address *) addressWithString:(NSString *)string {
- return [[[Address alloc] initWithString:string] autorelease];
-}
-
-+ (NSArray *) _attributeKeys {
- return [NSArray arrayWithObjects:
- @"address",
- @"name",
- nil];
-}
-
-- (NSArray *) attributeKeys {
- return [[self class] _attributeKeys];
-}
-
-+ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
- return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
-}
-
-- (Address *) initWithString:(NSString *)string {
- if ((self = [super init]) != nil) {
- const char *data = [string UTF8String];
- size_t size = [string length];
-
- static Pcre address_r("^\"?(.*)\"? <([^>]*)>$");
-
- if (address_r(data, size)) {
- name_ = [address_r[1] retain];
- address_ = [address_r[2] retain];
- } else {
- name_ = [string retain];
- address_ = nil;
- }
- } return self;
-}
-
-@end
-/* }}} */
/* CoreGraphics Primitives {{{ */
class CYColor {
private:
static BOOL Advanced_;
static BOOL Ignored_;
-static UIFont *Font12_;
-static UIFont *Font12Bold_;
-static UIFont *Font14_;
-static UIFont *Font18Bold_;
-static UIFont *Font22Bold_;
+static _H<UIFont> Font12_;
+static _H<UIFont> Font12Bold_;
+static _H<UIFont> Font14_;
+static _H<UIFont> Font18Bold_;
+static _H<UIFont> Font22Bold_;
static const char *Machine_ = NULL;
static NSString *System_ = nil;
static CGFloat ScreenScale_;
static NSString *Idiom_;
-static NSMutableDictionary *SessionData_;
-static NSObject *HostConfig_;
-static NSMutableSet *BridgedHosts_;
-static NSMutableSet *PipelinedHosts_;
+static _H<NSMutableDictionary> SessionData_;
+static _H<NSObject> HostConfig_;
+static _H<NSMutableSet> BridgedHosts_;
+static _H<NSMutableSet> TokenHosts_;
+static _H<NSMutableSet> InsecureHosts_;
+static _H<NSMutableSet> PipelinedHosts_;
+static _H<NSMutableSet> CachedURLs_;
static NSString *kCydiaProgressEventTypeError = @"Error";
static NSString *kCydiaProgressEventTypeInformation = @"Information";
return hidden == nil || ![hidden boolValue];
}
-static id CYIOGetValue(const char *path, NSString *property) {
+static NSObject *CYIOGetValue(const char *path, NSString *property) {
io_registry_entry_t entry(IORegistryEntryFromPath(kIOMasterPortDefault, path));
if (entry == MACH_PORT_NULL)
return nil;
return [(id) value autorelease];
}
-static NSString *CYHex(NSData *data, bool reverse, bool capital) {
+static NSString *CYHex(NSData *data, bool reverse = false) {
if (data == nil)
return nil;
char string[length * 2 + 1];
for (size_t i(0); i != length; ++i)
- sprintf(string + i * 2, capital ? "%.2X" : "%.2x", bytes[reverse ? length - i - 1 : i]);
+ sprintf(string + i * 2, "%.2x", bytes[reverse ? length - i - 1 : i]);
return [NSString stringWithUTF8String:string];
}
pkgSourceList *list_;
SourceMap sourceMap_;
- NSMutableArray *sourceList_;
+ _H<NSMutableArray> sourceList_;
CFMutableArrayRef packages_;
CYString uri_;
CYString distribution_;
CYString type_;
+ CYString base_;
CYString version_;
_H<NSString> host_;
- (NSString *) uri;
- (NSString *) distribution;
- (NSString *) type;
+
+- (NSString *) base;
+
- (NSString *) key;
- (NSString *) host;
distribution_.clear();
type_.clear();
+ base_.clear();
+
description_.clear();
label_.clear();
origin_.clear();
authority_ = nil;
}
-- (void) dealloc {
- // XXX: this is a very inefficient way to call these deconstructors
- [self _clear];
- [super dealloc];
-}
-
+ (NSArray *) _attributeKeys {
return [NSArray arrayWithObjects:
@"distribution",
debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
if (dindex != NULL) {
+ base_.set(pool, dindex->MetaIndexURI(""));
+
FileFd fd;
if (!fd.Open(dindex->MetaIndexFile("Release"), FileFd::ReadOnly))
_error->Discard();
host_ = [host_ lowercaseString];
if (host_ != nil)
- // XXX: this is due to a bug in _H<>
- authority_ = (id) host_;
+ authority_ = host_;
else
authority_ = [url path];
}
return type_;
}
+- (NSString *) base {
+ return base_;
+}
+
- (NSString *) key {
return [NSString stringWithFormat:@"%@:%@:%@", (NSString *) type_, (NSString *) uri_, (NSString *) distribution_];
}
/* }}} */
/* CydiaOperation Class {{{ */
@interface CydiaOperation : NSObject {
- NSString *operator_;
- NSString *value_;
+ _H<NSString> operator_;
+ _H<NSString> value_;
}
- (NSString *) operator;
@implementation CydiaOperation
-- (void) dealloc {
- [operator_ release];
- [value_ release];
- [super dealloc];
-}
-
- (id) initWithOperator:(const char *)_operator value:(const char *)value {
if ((self = [super init]) != nil) {
- operator_ = [[NSString alloc] initWithUTF8String:_operator];
- value_ = [[NSString alloc] initWithUTF8String:value];
+ operator_ = [NSString stringWithUTF8String:_operator];
+ value_ = [NSString stringWithUTF8String:value];
} return self;
}
/* }}} */
/* CydiaClause Class {{{ */
@interface CydiaClause : NSObject {
- NSString *package_;
- CydiaOperation *version_;
+ _H<NSString> package_;
+ _H<CydiaOperation> version_;
}
- (NSString *) package;
@implementation CydiaClause
-- (void) dealloc {
- [package_ release];
- [version_ release];
- [super dealloc];
-}
-
- (id) initWithIterator:(pkgCache::DepIterator &)dep {
if ((self = [super init]) != nil) {
- package_ = [[NSString alloc] initWithUTF8String:dep.TargetPkg().Name()];
+ package_ = [NSString stringWithUTF8String:dep.TargetPkg().Name()];
if (const char *version = dep.TargetVer())
- version_ = [[CydiaOperation alloc] initWithOperator:dep.CompType() value:version];
+ version_ = [[[CydiaOperation alloc] initWithOperator:dep.CompType() value:version] autorelease];
else
- version_ = [[NSNull null] retain];
+ version_ = (id) [NSNull null];
} return self;
}
/* }}} */
/* CydiaRelation Class {{{ */
@interface CydiaRelation : NSObject {
- NSString *relationship_;
- NSMutableArray *clauses_;
+ _H<NSString> relationship_;
+ _H<NSMutableArray> clauses_;
}
- (NSString *) relationship;
@implementation CydiaRelation
-- (void) dealloc {
- [relationship_ release];
- [clauses_ release];
- [super dealloc];
-}
-
- (id) initWithIterator:(pkgCache::DepIterator &)dep {
if ((self = [super init]) != nil) {
- relationship_ = [[NSString alloc] initWithUTF8String:dep.DepType()];
- clauses_ = [[NSMutableArray alloc] initWithCapacity:8];
+ relationship_ = [NSString stringWithUTF8String:dep.DepType()];
+ clauses_ = [NSMutableArray arrayWithCapacity:8];
pkgCache::DepIterator start;
pkgCache::DepIterator end;
apr_pool_t *pool_;
+ uint32_t rank_;
+
_transient Database *database_;
pkgCache::VerIterator version_;
const char *section_;
_transient NSString *section$_;
- Source *source_;
+ _H<Source> source_;
PackageValue *metadata_;
ParsedPackage *parsed_;
- NSMutableArray *tags_;
+ _H<NSMutableArray> tags_;
}
- (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;
- (NSString *) uri;
-- (Address *) maintainer;
+- (MIMEAddress *) maintainer;
- (size_t) size;
- (NSString *) longDescription;
- (NSString *) shortDescription;
- (UIImage *) icon;
- (NSString *) homepage;
- (NSString *) depiction;
-- (Address *) author;
+- (MIMEAddress *) author;
- (NSString *) support;
- (Source *) source;
-- (BOOL) matches:(NSString *)text;
+- (uint32_t) rank;
+- (BOOL) matches:(NSArray *)query;
- (bool) hasSupportingRole;
- (BOOL) hasTag:(NSString *)tag;
- (void) install;
- (void) remove;
-- (bool) isUnfilteredAndSearchedForBy:(NSString *)search;
+- (bool) isUnfilteredAndSearchedForBy:(NSArray *)query;
- (bool) isUnfilteredAndSelectedForBy:(NSString *)search;
- (bool) isInstalledAndUnfiltered:(NSNumber *)number;
- (bool) isVisibleInSection:(NSString *)section;
- (void) dealloc {
if (parsed_ != NULL)
delete parsed_;
- if (source_ != nil)
- [source_ release];
- if (tags_ != nil)
- [tags_ release];
[super dealloc];
}
_profile(Package$initWithVersion$Tags)
pkgCache::TagIterator tag(iterator.TagList());
if (!tag.end()) {
- tags_ = [[NSMutableArray alloc] initWithCapacity:8];
+ tags_ = [NSMutableArray arrayWithCapacity:8];
do {
const char *name(tag.Name());
[tags_ addObject:[(NSString *)CYStringCreate(name) autorelease]];
#endif
}
-- (Address *) maintainer {
+- (MIMEAddress *) maintainer {
@synchronized (database_) {
if ([database_ era] != era_ || file_.end())
return nil;
pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
const std::string &maintainer(parser->Maintainer());
- return maintainer.empty() ? nil : [Address addressWithString:[NSString stringWithUTF8String:maintainer.c_str()]];
+ return maintainer.empty() ? nil : [MIMEAddress addressWithString:[NSString stringWithUTF8String:maintainer.c_str()]];
} }
- (size_t) size {
return parsed_ != NULL && !parsed_->depiction_.empty() ? parsed_->depiction_ : [[self source] depictionForPackage:id_];
}
-- (Address *) sponsor {
- return parsed_ == NULL || parsed_->sponsor_.empty() ? nil : [Address addressWithString:parsed_->sponsor_];
+- (MIMEAddress *) sponsor {
+ return parsed_ == NULL || parsed_->sponsor_.empty() ? nil : [MIMEAddress addressWithString:parsed_->sponsor_];
}
-- (Address *) author {
- return parsed_ == NULL || parsed_->author_.empty() ? nil : [Address addressWithString:parsed_->author_];
+- (MIMEAddress *) author {
+ return parsed_ == NULL || parsed_->author_.empty() ? nil : [MIMEAddress addressWithString:parsed_->author_];
}
- (NSString *) support {
if ([database_ era] != era_ || file_.end())
source_ = (Source *) [NSNull null];
else
- source_ = [([database_ getSource:file_.File()] ?: (Source *) [NSNull null]) retain];
+ source_ = [database_ getSource:file_.File()] ?: (Source *) [NSNull null];
}
}
return source_ == (Source *) [NSNull null] ? nil : source_;
}
-- (BOOL) matches:(NSString *)text {
- if (text == nil)
+- (uint32_t) rank {
+ return rank_;
+}
+
+- (BOOL) matches:(NSArray *)query {
+ if (query == nil || [query count] == 0)
return NO;
+ rank_ = 0;
+
+ NSString *string;
NSRange range;
+ NSUInteger length;
- range = [[self id] rangeOfString:text options:MatchCompareOptions_];
- if (range.location != NSNotFound)
- return YES;
+ [self parse];
- range = [[self name] rangeOfString:text options:MatchCompareOptions_];
- if (range.location != NSNotFound)
- return YES;
+ string = [self id];
+ length = [string length];
- [self parse];
+ for (NSString *term in query) {
+ range = [string rangeOfString:term options:MatchCompareOptions_];
+ if (range.location != NSNotFound)
+ rank_ -= 10 * 100000 / length;
+ }
- NSString *description([self shortDescription]);
- NSUInteger length([description length]);
+ string = [self name];
- range = [[self shortDescription] rangeOfString:text options:MatchCompareOptions_ range:NSMakeRange(0, std::min<NSUInteger>(length, 100))];
- if (range.location != NSNotFound)
- return YES;
+ for (NSString *term in query) {
+ range = [string rangeOfString:term options:MatchCompareOptions_];
+ if (range.location != NSNotFound)
+ rank_ -= 6 * 100000 / length;
+ }
- return NO;
+ string = [self shortDescription];
+ length = [string length];
+ NSUInteger stop(std::min<NSUInteger>(length, 100));
+
+ for (NSString *term in query) {
+ range = [string rangeOfString:term options:MatchCompareOptions_ range:NSMakeRange(0, stop)];
+ if (range.location != NSNotFound)
+ rank_ -= 2 * 100000 / length;
+ }
+
+ return rank_ != 0;
}
- (bool) hasSupportingRole {
}
- (NSString *) primaryPurpose {
- for (NSString *tag in tags_)
+ for (NSString *tag in (NSArray *) tags_)
if ([tag hasPrefix:@"purpose::"])
return [tag substringFromIndex:9];
return nil;
- (NSArray *) purposes {
NSMutableArray *purposes([NSMutableArray arrayWithCapacity:2]);
- for (NSString *tag in tags_)
+ for (NSString *tag in (NSArray *) tags_)
if ([tag hasPrefix:@"purpose::"])
[purposes addObject:[tag substringFromIndex:9]];
return [purposes count] == 0 ? nil : purposes;
cache->MarkDelete(iterator_, true);
} }
-- (bool) isUnfilteredAndSearchedForBy:(NSString *)search {
+- (bool) isUnfilteredAndSearchedForBy:(NSArray *)query {
_profile(Package$isUnfilteredAndSearchedForBy)
bool value(true);
_end
_profile(Package$isUnfilteredAndSearchedForBy$Match)
- value &= [self matches:search];
+ value &= [self matches:query];
_end
return value;
/* }}} */
/* Section Class {{{ */
@interface Section : NSObject {
- NSString *name_;
+ _H<NSString> name_;
unichar index_;
size_t row_;
size_t count_;
- NSString *localized_;
+ _H<NSString> localized_;
}
- (NSComparisonResult) compareByLocalized:(Section *)section;
@implementation Section
-- (void) dealloc {
- [name_ release];
- if (localized_ != nil)
- [localized_ release];
- [super dealloc];
-}
-
- (NSComparisonResult) compareByLocalized:(Section *)section {
NSString *lhs(localized_);
NSString *rhs([section localized]);
- (Section *) initWithName:(NSString *)name localized:(NSString *)localized {
if ((self = [self initWithName:name localize:NO]) != nil) {
if (localized != nil)
- localized_ = [localized retain];
+ localized_ = localized;
} return self;
}
- (Section *) initWithName:(NSString *)name row:(size_t)row localize:(BOOL)localize {
if ((self = [super init]) != nil) {
- name_ = [name retain];
+ name_ = name;
index_ = '\0';
row_ = row;
if (localize)
- localized_ = [LocalizeSection(name_) retain];
+ localized_ = LocalizeSection(name_);
} return self;
}
/* XXX: localize the index thingees */
- (Section *) initWithIndex:(unichar)index row:(size_t)row {
if ((self = [super init]) != nil) {
- name_ = [[NSString stringWithCharacters:&index length:1] retain];
+ name_ = [NSString stringWithCharacters:&index length:1];
index_ = index;
row_ = row;
} return self;
/* }}} */
static NSString *Colon_;
-static NSString *Elision_;
+NSString *Elision_;
static NSString *Error_;
static NSString *Warning_;
+class CydiaLogCleaner :
+ public pkgArchiveCleaner
+{
+ protected:
+ virtual void Erase(const char *File, std::string Pkg, std::string Ver, struct stat &St) {
+ unlink(File);
+ }
+};
+
/* Database Implementation {{{ */
@implementation Database
+ (Database *) sharedInstance {
- static Database *instance;
+ static _H<Database> instance;
if (instance == nil)
- instance = [[Database alloc] init];
+ instance = [[[Database alloc] init] autorelease];
return instance;
}
- (void) dealloc {
// XXX: actually implement this thing
_assert(false);
- [sourceList_ release];
[self releasePackages];
apr_pool_destroy(pool_);
NSRecycleZone(zone_);
[super dealloc];
}
-- (void) _readCydia:(NSNumber *)fd { _pooled
+- (void) _readCydia:(NSNumber *)fd {
__gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
std::istream is(&ib);
std::string line;
static Pcre finish_r("^finish:([^:]*)$");
while (std::getline(is, line)) {
+ NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+
const char *data(line.c_str());
size_t size = line.size();
lprintf("C:%s\n", data);
if (index != INT_MAX && index > Finish_)
Finish_ = index;
}
+
+ [pool release];
}
_assume(false);
}
-- (void) _readStatus:(NSNumber *)fd { _pooled
+- (void) _readStatus:(NSNumber *)fd {
__gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
std::istream is(&ib);
std::string line;
static Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$");
while (std::getline(is, line)) {
+ NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+
const char *data(line.c_str());
size_t size(line.size());
lprintf("S:%s\n", data);
lprintf("E:unknown pmstatus\n");
} else
lprintf("E:unknown status\n");
+
+ [pool release];
}
_assume(false);
}
-- (void) _readOutput:(NSNumber *)fd { _pooled
+- (void) _readOutput:(NSNumber *)fd {
__gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
std::istream is(&ib);
std::string line;
while (std::getline(is, line)) {
+ NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+
lprintf("O:%s\n", line.c_str());
CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:line.c_str()] ofType:kCydiaProgressEventTypeInformation]);
[progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
+
+ [pool release];
}
_assume(false);
capacity += 1024;
packages_ = CFArrayCreateMutable(kCFAllocatorDefault, capacity, NULL);
- sourceList_ = [[NSMutableArray alloc] initWithCapacity:16];
+ sourceList_ = [NSMutableArray arrayWithCapacity:16];
int fds[2];
return [self popErrorWithTitle:title] || !success;
}
-- (void) reloadDataWithInvocation:(NSInvocation *)invocation { CYPoolStart() {
+- (void) reloadDataWithInvocation:(NSInvocation *)invocation {
@synchronized (self) {
++era_;
{
/*std::vector<Package *> packages;
packages.reserve(std::max(10000U, [packages_ count] + 1000));
- [packages_ release];
packages_ = nil;*/
_trace();
for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
if (Package *package = [Package packageWithIterator:iterator withZone:zone_ inPool:pool_ database:self])
//packages.push_back(package);
- CFArrayAppendValue(packages_, [package retain]);
+ CFArrayAppendValue(packages_, CFRetain(package));
_trace();
packages_ = [[NSArray alloc] initWithObjects:&packages.front() count:packages.size()];
_trace();*/
- [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<SKRadixFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(16)];
- [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<SKRadixFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(4)];
- [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<SKRadixFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(0)];
+ [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(16)];
+ [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(4)];
+ [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(0)];
/*_trace();
PrintTimes();
_trace();
}
-} } CYPoolEnd() _trace(); }
+} }
- (void) clear {
@synchronized (self) {
pkgAcquire fetcher;
fetcher.Clean(_config->FindDir("Dir::Cache::Archives"));
- class LogCleaner :
- public pkgArchiveCleaner
- {
- protected:
- virtual void Erase(const char *File, std::string Pkg, std::string Ver, struct stat &St) {
- unlink(File);
- }
- } cleaner;
-
+ CydiaLogCleaner cleaner;
if ([self popErrorWithTitle:title forOperation:cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)])
return false;
bool success(ListUpdate(status, list, PulseInterval_));
if (status.WasCancelled())
_error->Discard();
- else
+ else {
[self popErrorWithTitle:title forOperation:success];
+ [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
+ Changed_ = true;
+ }
[delegate_ performSelectorOnMainThread:@selector(releaseNetworkActivityIndicator) withObject:nil waitUntilDone:YES];
-
- [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
- Changed_ = true;
}
- (void) setDelegate:(NSObject<DatabaseDelegate> *)delegate {
@end
/* }}} */
-static NSMutableSet *Diversions_;
+static _H<NSMutableSet> Diversions_;
@interface Diversion : NSObject {
Pcre pattern_;
divert:
NSString *href([url absoluteString]);
- for (Diversion *diversion in Diversions_)
+ for (Diversion *diversion in (id) Diversions_)
if (NSString *diverted = [diversion divert:href]) {
#if !ForRelease
NSLog(@"div: %@", diverted);
@end
@interface CydiaObject : NSObject {
- id indirect_;
+ _H<IndirectDelegate> indirect_;
_transient id delegate_;
}
@end
@interface CydiaWebViewController : CyteWebViewController {
- CydiaObject *cydia_;
+ _H<CydiaObject> cydia_;
}
+ (void) addDiversion:(Diversion *)diversion;
/* Web Scripting {{{ */
@implementation CydiaObject
-- (void) dealloc {
- [indirect_ release];
- [super dealloc];
-}
-
- (id) initWithDelegate:(IndirectDelegate *)indirect {
if ((self = [super init]) != nil) {
- indirect_ = [indirect retain];
+ indirect_ = indirect;
} return self;
}
if (false);
else if (selector == @selector(addBridgedHost:))
return @"addBridgedHost";
+ else if (selector == @selector(addInsecureHost:))
+ return @"addInsecureHost";
else if (selector == @selector(addInternalRedirect::))
return @"addInternalRedirect";
else if (selector == @selector(addPipelinedHost:scheme:))
return @"addPipelinedHost";
+ else if (selector == @selector(addTokenHost:))
+ return @"addTokenHost";
else if (selector == @selector(addTrivialSource:))
return @"addTrivialSource";
else if (selector == @selector(close))
return @"getKernelString";
else if (selector == @selector(getInstalledPackages))
return @"getInstalledPackages";
+ else if (selector == @selector(getIORegistryEntry::))
+ return @"getIORegistryEntry";
else if (selector == @selector(getLocaleIdentifier))
return @"getLocaleIdentifier";
else if (selector == @selector(getPreferredLanguages))
return @"statfs";
else if (selector == @selector(supports:))
return @"supports";
+ else if (selector == @selector(unload))
+ return @"unload";
else
return nil;
}
return [feature isEqualToString:@"window.open"];
}
+- (void) unload {
+ [delegate_ performSelectorOnMainThread:@selector(unloadData) withObject:nil waitUntilDone:NO];
+}
+
- (void) addInternalRedirect:(NSString *)from :(NSString *)to {
[CydiaWebViewController performSelectorOnMainThread:@selector(addDiversion:) withObject:[[[Diversion alloc] initWithFrom:from to:to] autorelease] waitUntilDone:NO];
}
return [NSString stringWithCString:value];
}
+- (NSObject *) getIORegistryEntry:(NSString *)path :(NSString *)entry {
+ NSObject *value(CYIOGetValue([path UTF8String], entry));
+
+ if (value != nil)
+ if ([value isKindOfClass:[NSData class]])
+ value = CYHex((NSData *) value);
+
+ return value;
+}
+
- (id) getSessionValue:(NSString *)key {
@synchronized (SessionData_) {
return [SessionData_ objectForKey:key];
[BridgedHosts_ addObject:host];
} }
+- (void) addInsecureHost:(NSString *)host {
+@synchronized (HostConfig_) {
+ [InsecureHosts_ addObject:host];
+} }
+
+- (void) addTokenHost:(NSString *)host {
+@synchronized (HostConfig_) {
+ [TokenHosts_ addObject:host];
+} }
+
- (void) addPipelinedHost:(NSString *)host scheme:(NSString *)scheme {
@synchronized (HostConfig_) {
if (scheme != (id) [WebUndefined undefined])
@end
/* }}} */
-/* @ Loading... Indicator {{{ */
-@interface CYLoadingIndicator : UIView {
- _H<UIActivityIndicatorView> spinner_;
- _H<UILabel> label_;
- _H<UIView> container_;
-}
-
-@property (readonly, nonatomic) UILabel *label;
-@property (readonly, nonatomic) UIActivityIndicatorView *activityIndicatorView;
-
-@end
-
-@implementation CYLoadingIndicator
-
-- (id) initWithFrame:(CGRect)frame {
- if ((self = [super initWithFrame:frame]) != nil) {
- container_ = [[[UIView alloc] init] autorelease];
- [container_ setAutoresizingMask:UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin];
-
- spinner_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray] autorelease];
- [spinner_ startAnimating];
- [container_ addSubview:spinner_];
-
- label_ = [[[UILabel alloc] init] autorelease];
- [label_ setFont:[UIFont boldSystemFontOfSize:15.0f]];
- [label_ setBackgroundColor:[UIColor clearColor]];
- [label_ setTextColor:[UIColor blackColor]];
- [label_ setShadowColor:[UIColor whiteColor]];
- [label_ setShadowOffset:CGSizeMake(0, 1)];
- [label_ setText:[NSString stringWithFormat:Elision_, UCLocalize("LOADING"), nil]];
- [container_ addSubview:label_];
-
- CGSize viewsize = frame.size;
- CGSize spinnersize = [spinner_ bounds].size;
- CGSize textsize = [[label_ text] sizeWithFont:[label_ font]];
- float bothwidth = spinnersize.width + textsize.width + 5.0f;
-
- CGRect containrect = {
- CGPointMake(floorf((viewsize.width / 2) - (bothwidth / 2)), floorf((viewsize.height / 2) - (spinnersize.height / 2))),
- CGSizeMake(bothwidth, spinnersize.height)
- };
- CGRect textrect = {
- CGPointMake(spinnersize.width + 5.0f, floorf((spinnersize.height / 2) - (textsize.height / 2))),
- textsize
- };
- CGRect spinrect = {
- CGPointZero,
- spinnersize
- };
-
- [container_ setFrame:containrect];
- [spinner_ setFrame:spinrect];
- [label_ setFrame:textrect];
- [self addSubview:container_];
- } return self;
-}
-
-- (UILabel *) label {
- return label_;
-}
-
-- (UIActivityIndicatorView *) activityIndicatorView {
- return spinner_;
-}
-
-@end
-/* }}} */
-/* Emulated Loading Controller {{{ */
-@interface CYEmulatedLoadingController : CyteViewController {
- _transient Database *database_;
- _H<CYLoadingIndicator> indicator_;
- _H<UITabBar> tabbar_;
- _H<UINavigationBar> navbar_;
-}
-
+@interface NSURL (CydiaSecure)
@end
-@implementation CYEmulatedLoadingController
-
-- (id) initWithDatabase:(Database *)database {
- if ((self = [super init]) != nil) {
- database_ = database;
- } return self;
-}
-
-- (void) loadView {
- [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
-
- UITableView *table([[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped] autorelease]);
- [table setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
- [[self view] addSubview:table];
-
- indicator_ = [[[CYLoadingIndicator alloc] initWithFrame:[[self view] bounds]] autorelease];
- [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
- [[self view] addSubview:indicator_];
+@implementation NSURL (CydiaSecure)
- tabbar_ = [[[UITabBar alloc] initWithFrame:CGRectMake(0, 0, 0, 49.0f)] autorelease];
- [tabbar_ setFrame:CGRectMake(0.0f, [[self view] bounds].size.height - [tabbar_ bounds].size.height, [[self view] bounds].size.width, [tabbar_ bounds].size.height)];
- [tabbar_ setAutoresizingMask:UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth];
- [[self view] addSubview:tabbar_];
+- (bool) isCydiaSecure {
+ if ([[[self scheme] lowercaseString] isEqualToString:@"https"])
+ return true;
- navbar_ = [[[UINavigationBar alloc] initWithFrame:CGRectMake(0, 0, 0, 44.0f)] autorelease];
- [navbar_ setFrame:CGRectMake(0.0f, 0.0f, [[self view] bounds].size.width, [navbar_ bounds].size.height)];
- [navbar_ setAutoresizingMask:UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleWidth];
- [[self view] addSubview:navbar_];
-}
+ @synchronized (HostConfig_) {
+ if ([InsecureHosts_ containsObject:[self host]])
+ return true;
+ }
-- (void) releaseSubviews {
- indicator_ = nil;
- tabbar_ = nil;
- navbar_ = nil;
+ return false;
}
@end
-/* }}} */
/* Cydia Browser Controller {{{ */
@implementation CydiaWebViewController
-- (void) dealloc {
- [cydia_ release];
- [super dealloc];
-}
-
- (NSURL *) navigationURL {
- return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://url/%@", [[request_ URL] absoluteString]]];
+ return request_ == nil ? nil : [NSURL URLWithString:[NSString stringWithFormat:@"cydia://url/%@", [[request_ URL] absoluteString]]];
}
+ (void) initialize {
- Diversions_ = [[NSMutableSet alloc] initWithCapacity:0];
+ Diversions_ = [NSMutableSet setWithCapacity:0];
}
+ (void) addDiversion:(Diversion *)diversion {
[window setValue:cydia_ forKey:@"cydia"];
}
+- (void) _setupMail:(MFMailComposeViewController *)controller {
+ [controller addAttachmentData:[NSData dataWithContentsOfFile:@"/tmp/cydia.log"] mimeType:@"text/plain" fileName:@"cydia.log"];
+
+ system("/usr/bin/dpkg -l >/tmp/dpkgl.log");
+ [controller addAttachmentData:[NSData dataWithContentsOfFile:@"/tmp/dpkgl.log"] mimeType:@"text/plain" fileName:@"dpkgl.log"];
+}
+
- (NSURL *) URLWithURL:(NSURL *)url {
return [Diversion divertURL:url];
}
- (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
+ NSURL *url([request URL]);
+ NSString *host([url host]);
+
NSMutableURLRequest *copy([[super webView:view resource:resource willSendRequest:request redirectResponse:response fromDataSource:source] mutableCopy]);
- if (System_ != NULL)
+ if (System_ != NULL && [copy valueForHTTPHeaderField:@"X-System"] == nil)
[copy setValue:System_ forHTTPHeaderField:@"X-System"];
- if (Machine_ != NULL)
+ if (Machine_ != NULL && [copy valueForHTTPHeaderField:@"X-Machine"] == nil)
[copy setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
- if (Token_ != nil)
- [copy setValue:Token_ forHTTPHeaderField:@"X-Cydia-Token"];
+
+ bool token;
+ @synchronized (HostConfig_) {
+ token = [TokenHosts_ containsObject:host] || [BridgedHosts_ containsObject:host];
+ }
+
+ if ([url isCydiaSecure] && token) {
+ if (Token_ != nil && [copy valueForHTTPHeaderField:@"X-Cydia-Token"] == nil)
+ [copy setValue:Token_ forHTTPHeaderField:@"X-Cydia-Token"];
+ }
return copy;
}
[cydia_ setDelegate:delegate];
}
-- (id) init {
- if ((self = [super initWithWidth:0 ofClass:[CydiaWebViewController class]]) != nil) {
- cydia_ = [[CydiaObject alloc] initWithDelegate:indirect_];
-
- WebView *webview([[webview_ _documentView] webView]);
+- (NSString *) applicationNameForUserAgent {
+ NSString *application([NSString stringWithFormat:@"Cydia/%@", @ Cydia_]);
- NSString *application([NSString stringWithFormat:@"Cydia/%@", @ Cydia_]);
+ if (Safari_ != nil)
+ application = [NSString stringWithFormat:@"Safari/%@ %@", Safari_, application];
+ if (Build_ != nil)
+ application = [NSString stringWithFormat:@"Mobile/%@ %@", Build_, application];
+ if (Product_ != nil)
+ application = [NSString stringWithFormat:@"Version/%@ %@", Product_, application];
- if (Safari_ != nil)
- application = [NSString stringWithFormat:@"Safari/%@ %@", Safari_, application];
- if (Build_ != nil)
- application = [NSString stringWithFormat:@"Mobile/%@ %@", Build_, application];
- if (Product_ != nil)
- application = [NSString stringWithFormat:@"Version/%@ %@", Product_, application];
+ return application;
+}
- [webview setApplicationNameForUserAgent:application];
+- (id) init {
+ if ((self = [super initWithWidth:0 ofClass:[CydiaWebViewController class]]) != nil) {
+ cydia_ = [[[CydiaObject alloc] initWithDelegate:indirect_] autorelease];
} return self;
}
@interface ConfirmationController : CydiaWebViewController {
_transient Database *database_;
- UIAlertView *essential_;
+ _H<UIAlertView> essential_;
- NSDictionary *changes_;
- NSMutableArray *issues_;
- NSDictionary *sizes_;
+ _H<NSDictionary> changes_;
+ _H<NSMutableArray> issues_;
+ _H<NSDictionary> sizes_;
BOOL substrate_;
}
@implementation ConfirmationController
-- (void) dealloc {
- [changes_ release];
- [issues_ release];
- [sizes_ release];
-
- if (essential_ != nil)
- [essential_ release];
-
- [super dealloc];
-}
-
- (void) complete {
if (substrate_)
RestartSubstrate_ = true;
[super webView:view didClearWindowObject:window forFrame:frame];
[window setValue:[[NSDictionary dictionaryWithObjectsAndKeys:
- changes_, @"changes",
- issues_, @"issues",
- sizes_, @"sizes",
+ (id) changes_, @"changes",
+ (id) issues_, @"issues",
+ (id) sizes_, @"sizes",
self, @"queue",
nil] Cydia$webScriptObjectInContext:window] forKey:@"cydiaConfirm"];
}
NSArray *packages([database_ packages]);
pkgDepCache::Policy *policy([database_ policy]);
- issues_ = [[NSMutableArray arrayWithCapacity:4] retain];
+ issues_ = [NSMutableArray arrayWithCapacity:4];
for (Package *package in packages) {
pkgCache::PkgIterator iterator([package iterator]);
else if (Advanced_) {
NSString *parenthetical(UCLocalize("PARENTHETICAL"));
- essential_ = [[UIAlertView alloc]
+ essential_ = [[[UIAlertView alloc]
initWithTitle:UCLocalize("REMOVING_ESSENTIALS")
message:UCLocalize("REMOVING_ESSENTIALS_EX")
delegate:self
otherButtonTitles:
[NSString stringWithFormat:parenthetical, UCLocalize("FORCE_REMOVAL"), UCLocalize("UNSAFE")],
nil
- ];
+ ] autorelease];
[essential_ setContext:@"remove"];
} else {
- essential_ = [[UIAlertView alloc]
+ essential_ = [[[UIAlertView alloc]
initWithTitle:UCLocalize("UNABLE_TO_COMPLY")
message:UCLocalize("UNABLE_TO_COMPLY_EX")
delegate:self
cancelButtonTitle:UCLocalize("OKAY")
otherButtonTitles:nil
- ];
+ ] autorelease];
[essential_ setContext:@"unable"];
}
- changes_ = [[NSDictionary alloc] initWithObjectsAndKeys:
+ changes_ = [NSDictionary dictionaryWithObjectsAndKeys:
installs, @"installs",
reinstalls, @"reinstalls",
upgrades, @"upgrades",
removes, @"removes",
nil];
- sizes_ = [[NSDictionary alloc] initWithObjectsAndKeys:
+ sizes_ = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInteger:[database_ fetcher].FetchNeeded()], @"downloading",
[NSNumber numberWithInteger:[database_ fetcher].PartialPresent()], @"resuming",
nil];
ProgressDelegate
> {
_transient Database *database_;
- _H<CydiaProgressData> progress_;
+ _H<CydiaProgressData, 1> progress_;
unsigned cancel_;
}
- (void) dealloc {
[database_ setProgressDelegate:nil];
- [progress_ setDelegate:nil];
[super dealloc];
}
@end
/* }}} */
-/* Cell Content View {{{ */
-@protocol ContentDelegate
-- (void) drawContentRect:(CGRect)rect;
-@end
-
-@interface ContentView : UIView {
- _transient id<ContentDelegate> delegate_;
+/* Package Cell {{{ */
+@interface PackageCell : CyteTableViewCell <
+ CyteTableViewCellDelegate
+> {
+ _H<UIImage> icon_;
+ _H<NSString> name_;
+ _H<NSString> description_;
+ bool commercial_;
+ _H<NSString> source_;
+ _H<UIImage> badge_;
+ _H<Package> package_;
+ _H<UIImage> placard_;
+ bool summarized_;
}
-@end
+- (PackageCell *) init;
+- (void) setPackage:(Package *)package asSummary:(bool)summary;
-@implementation ContentView
+- (void) drawContentRect:(CGRect)rect;
-- (id) initWithFrame:(CGRect)frame {
- if ((self = [super initWithFrame:frame]) != nil) {
- [self setNeedsDisplayOnBoundsChange:YES];
- } return self;
-}
+@end
-- (void) setDelegate:(id<ContentDelegate>)delegate {
- delegate_ = delegate;
-}
-
-- (void) drawRect:(CGRect)rect {
- [super drawRect:rect];
- [delegate_ drawContentRect:rect];
-}
-
-@end
-/* }}} */
-/* Cydia TableView Cell {{{ */
-@interface CYTableViewCell : UITableViewCell {
- ContentView *content_;
- bool highlighted_;
-}
-
-@end
-
-@implementation CYTableViewCell
-
-- (void) dealloc {
- [content_ release];
- [super dealloc];
-}
-
-- (void) _updateHighlightColorsForView:(id)view highlighted:(BOOL)highlighted {
- //NSLog(@"_updateHighlightColorsForView:%@ highlighted:%s [content_=%@]", view, highlighted ? "YES" : "NO", content_);
-
- if (view == content_) {
- //NSLog(@"_updateHighlightColorsForView:content_ highlighted:%s", highlighted ? "YES" : "NO", content_);
- highlighted_ = highlighted;
- }
-
- [super _updateHighlightColorsForView:view highlighted:highlighted];
-}
-
-- (void) setSelected:(BOOL)selected animated:(BOOL)animated {
- //NSLog(@"setSelected:%s animated:%s", selected ? "YES" : "NO", animated ? "YES" : "NO");
- highlighted_ = selected;
-
- [super setSelected:selected animated:animated];
- [content_ setNeedsDisplay];
-}
-
-@end
-/* }}} */
-
-/* Package Cell {{{ */
-@interface PackageCell : CYTableViewCell <
- ContentDelegate
-> {
- UIImage *icon_;
- NSString *name_;
- NSString *description_;
- bool commercial_;
- NSString *source_;
- UIImage *badge_;
- Package *package_;
- UIImage *placard_;
-}
-
-- (PackageCell *) init;
-- (void) setPackage:(Package *)package;
-
-- (void) drawContentRect:(CGRect)rect;
-
-@end
-
-@implementation PackageCell
-
-- (void) clearPackage {
- if (icon_ != nil) {
- [icon_ release];
- icon_ = nil;
- }
-
- if (name_ != nil) {
- [name_ release];
- name_ = nil;
- }
-
- if (description_ != nil) {
- [description_ release];
- description_ = nil;
- }
-
- if (source_ != nil) {
- [source_ release];
- source_ = nil;
- }
-
- if (badge_ != nil) {
- [badge_ release];
- badge_ = nil;
- }
-
- if (placard_ != nil) {
- [placard_ release];
- placard_ = nil;
- }
-
- [package_ release];
- package_ = nil;
-}
-
-- (void) dealloc {
- [self clearPackage];
- [super dealloc];
-}
+@implementation PackageCell
- (PackageCell *) init {
CGRect frame(CGRectMake(0, 0, 320, 74));
UIView *content([self contentView]);
CGRect bounds([content bounds]);
- content_ = [[ContentView alloc] initWithFrame:bounds];
+ content_ = [[[CyteTableViewCellContentView alloc] initWithFrame:bounds] autorelease];
[content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
[content addSubview:content_];
}
- (NSString *) accessibilityLabel {
- return [NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), name_, description_];
+ return [NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), (id) name_, (id) description_];
}
-- (void) setPackage:(Package *)package {
- [self clearPackage];
+- (void) setPackage:(Package *)package asSummary:(bool)summary {
+ summarized_ = summary;
+
+ icon_ = nil;
+ name_ = nil;
+ description_ = nil;
+ source_ = nil;
+ badge_ = nil;
+ placard_ = nil;
+ package_ = nil;
+
[package parse];
Source *source = [package source];
- icon_ = [[package icon] retain];
- name_ = [[package name] retain];
+ icon_ = [package icon];
- if (IsWildcat_)
- description_ = [package longDescription];
- if (description_ == nil)
- description_ = [package shortDescription];
- if (description_ != nil)
- description_ = [description_ retain];
+ if (NSString *name = [package name])
+ name_ = [NSString stringWithString:name];
+
+ NSString *description(nil);
+
+ if (description == nil && IsWildcat_)
+ description = [package longDescription];
+ if (description == nil)
+ description = [package shortDescription];
+
+ if (description != nil)
+ description_ = [NSString stringWithString:description];
commercial_ = [package isCommercial];
- package_ = [package retain];
+ package_ = package;
NSString *label = nil;
bool trusted = false;
from = [NSString stringWithFormat:UCLocalize("PARENTHETICAL"), from, section];
}
- from = [NSString stringWithFormat:UCLocalize("FROM"), from];
- source_ = [from retain];
+ source_ = [NSString stringWithFormat:UCLocalize("FROM"), from];
if (NSString *purpose = [package primaryPurpose])
- if ((badge_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Purposes/%@.png", App_, purpose]]) != nil)
- badge_ = [badge_ retain];
+ badge_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Purposes/%@.png", App_, purpose]];
UIColor *color;
NSString *placard;
[content_ setBackgroundColor:color];
if (placard != nil)
- if ((placard_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/%@.png", App_, placard]]) != nil)
- placard_ = [placard_ retain];
+ placard_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/%@.png", App_, placard]];
[self setNeedsDisplay];
[content_ setNeedsDisplay];
}
-- (void) drawContentRect:(CGRect)rect {
+- (void) drawSummaryContentRect:(CGRect)rect {
bool highlighted(highlighted_);
float width([self bounds].size.width);
-#if 0
- CGContextRef context(UIGraphicsGetCurrentContext());
- [([[self selectedBackgroundView] superview] != nil ? [UIColor clearColor] : [self backgroundColor]) set];
- CGContextFillRect(context, rect);
-#endif
+ if (icon_ != nil) {
+ CGRect rect;
+ rect.size = [(UIImage *) icon_ size];
+
+ rect.size.width /= 4;
+ rect.size.height /= 4;
+
+ rect.origin.x = 14 - rect.size.width / 4;
+ rect.origin.y = 14 - rect.size.height / 4;
+
+ [icon_ drawInRect:rect];
+ }
+
+ if (badge_ != nil) {
+ CGRect rect;
+ rect.size = [(UIImage *) badge_ size];
+
+ rect.size.width /= 4;
+ rect.size.height /= 4;
+
+ rect.origin.x = 20 - rect.size.width / 4;
+ rect.origin.y = 20 - rect.size.height / 4;
+
+ [badge_ drawInRect:rect];
+ }
+
+ if (highlighted)
+ UISetColor(White_);
+
+ if (!highlighted)
+ UISetColor(commercial_ ? Purple_ : Black_);
+ [name_ drawAtPoint:CGPointMake(36, 8) forWidth:(width - (placard_ == nil ? 68 : 94)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
+
+ if (placard_ != nil)
+ [placard_ drawAtPoint:CGPointMake(width - 52, 9)];
+}
+
+- (void) drawNormalContentRect:(CGRect)rect {
+ bool highlighted(highlighted_);
+ float width([self bounds].size.width);
if (icon_ != nil) {
CGRect rect;
- rect.size = [icon_ size];
+ rect.size = [(UIImage *) icon_ size];
rect.size.width /= 2;
rect.size.height /= 2;
if (badge_ != nil) {
CGRect rect;
- rect.size = [badge_ size];
+ rect.size = [(UIImage *) badge_ size];
rect.size.width /= 2;
rect.size.height /= 2;
[placard_ drawAtPoint:CGPointMake(width - 52, 9)];
}
+- (void) drawContentRect:(CGRect)rect {
+ if (summarized_)
+ [self drawSummaryContentRect:rect];
+ else
+ [self drawNormalContentRect:rect];
+}
+
@end
/* }}} */
/* Section Cell {{{ */
-@interface SectionCell : CYTableViewCell <
- ContentDelegate
+@interface SectionCell : CyteTableViewCell <
+ CyteTableViewCellDelegate
> {
- NSString *basic_;
- NSString *section_;
- NSString *name_;
- NSString *count_;
- UIImage *icon_;
- UISwitch *switch_;
+ _H<NSString> basic_;
+ _H<NSString> section_;
+ _H<NSString> name_;
+ _H<NSString> count_;
+ _H<UIImage> icon_;
+ _H<UISwitch> switch_;
BOOL editing_;
}
@implementation SectionCell
-- (void) clearSection {
- if (basic_ != nil) {
- [basic_ release];
- basic_ = nil;
- }
-
- if (section_ != nil) {
- [section_ release];
- section_ = nil;
- }
-
- if (name_ != nil) {
- [name_ release];
- name_ = nil;
- }
-
- if (count_ != nil) {
- [count_ release];
- count_ = nil;
- }
-}
-
-- (void) dealloc {
- [self clearSection];
- [icon_ release];
- [switch_ release];
- [super dealloc];
-}
-
- (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
if ((self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) != nil) {
- icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain];
- switch_ = [[UISwitch alloc] initWithFrame:CGRectMake(218, 9, 60, 25)];
+ icon_ = [UIImage applicationImageNamed:@"folder.png"];
+ switch_ = [[[UISwitch alloc] initWithFrame:CGRectMake(218, 9, 60, 25)] autorelease];
[switch_ addTarget:self action:@selector(onSwitch:) forEvents:UIControlEventValueChanged];
UIView *content([self contentView]);
CGRect bounds([content bounds]);
- content_ = [[ContentView alloc] initWithFrame:bounds];
+ content_ = [[[CyteTableViewCellContentView alloc] initWithFrame:bounds] autorelease];
[content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
[content addSubview:content_];
[content_ setBackgroundColor:[UIColor whiteColor]];
editing_ = editing;
}
- [self clearSection];
+ basic_ = nil;
+ section_ = nil;
+ name_ = nil;
+ count_ = nil;
if (section == nil) {
- name_ = [UCLocalize("ALL_PACKAGES") retain];
+ name_ = UCLocalize("ALL_PACKAGES");
count_ = nil;
} else {
basic_ = [section name];
- if (basic_ != nil)
- basic_ = [basic_ retain];
-
section_ = [section localized];
- if (section_ != nil)
- section_ = [section_ retain];
- name_ = [(section_ == nil || [section_ length] == 0 ? UCLocalize("NO_SECTION") : section_) retain];
- count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
+ name_ = section_ == nil || [section_ length] == 0 ? UCLocalize("NO_SECTION") : (NSString *) section_;
+ count_ = [NSString stringWithFormat:@"%d", [section count]];
if (editing_)
[switch_ setOn:(isSectionVisible(basic_) ? 1 : 0) animated:NO];
UITableViewDelegate
> {
_transient Database *database_;
- Package *package_;
- NSString *name_;
- NSMutableArray *files_;
- UITableView *list_;
+ _H<Package> package_;
+ _H<NSString> name_;
+ _H<NSMutableArray> files_;
+ _H<UITableView, 2> list_;
}
- (id) initWithDatabase:(Database *)database;
@implementation FileTable
-- (void) dealloc {
- [self releaseSubviews];
-
- [package_ release];
- [name_ release];
- [files_ release];
-
- [super dealloc];
-}
-
- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
return files_ == nil ? 0 : [files_ count];
}
- (void) loadView {
[self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
- list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];
+ list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds]] autorelease];
[list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
[list_ setRowHeight:24.0f];
- [list_ setDataSource:self];
+ [(UITableView *) list_ setDataSource:self];
[list_ setDelegate:self];
[[self view] addSubview:list_];
}
}
- (void) releaseSubviews {
- [list_ release];
list_ = nil;
+
+ [super releaseSubviews];
}
- (id) initWithDatabase:(Database *)database {
if ((self = [super init]) != nil) {
database_ = database;
- files_ = [[NSMutableArray arrayWithCapacity:32] retain];
+ files_ = [NSMutableArray arrayWithCapacity:32];
} return self;
}
- (void) setPackage:(Package *)package {
- if (package_ != nil) {
- [package_ autorelease];
- package_ = nil;
- }
-
- if (name_ != nil) {
- [name_ release];
- name_ = nil;
- }
+ package_ = nil;
+ name_ = nil;
[files_ removeAllObjects];
if (package != nil) {
- package_ = [package retain];
- name_ = [[package id] retain];
+ package_ = package;
+ name_ = [package id];
if (NSArray *files = [package files])
[files_ addObjectsFromArray:files];
> {
_transient Database *database_;
unsigned era_;
- NSMutableArray *packages_;
- NSMutableArray *sections_;
- UITableView *list_;
- NSMutableArray *index_;
- NSMutableDictionary *indices_;
- NSString *title_;
+ _H<NSArray> packages_;
+ _H<NSMutableArray> sections_;
+ _H<UITableView, 2> list_;
+ _H<NSMutableArray> index_;
+ _H<NSMutableDictionary> indices_;
+ _H<NSString> title_;
+ unsigned reloading_;
}
- (id) initWithDatabase:(Database *)database title:(NSString *)title;
- (void) setDelegate:(id)delegate;
- (void) resetCursor;
+- (void) clearData;
@end
@implementation PackageListController
-- (void) dealloc {
- [packages_ release];
- [sections_ release];
- [list_ release];
- [index_ release];
- [indices_ release];
- [title_ release];
+- (bool) isSummarized {
+ return false;
+}
- [super dealloc];
+- (bool) showsSections {
+ return true;
}
- (void) deselectWithAnimation:(BOOL)animated {
[self resizeForKeyboardBounds:bounds duration:0];
}
+- (void) getKeyboardCurve:(UIViewAnimationCurve *)curve duration:(NSTimeInterval *)duration forNotification:(NSNotification *)notification {
+ if (&UIKeyboardAnimationCurveUserInfoKey == NULL)
+ *curve = UIViewAnimationCurveEaseInOut;
+ else
+ [[[notification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] getValue:curve];
+
+ if (&UIKeyboardAnimationDurationUserInfoKey == NULL)
+ *duration = 0.3;
+ else
+ [[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] getValue:duration];
+}
+
- (void) keyboardWillShow:(NSNotification *)notification {
CGRect bounds;
CGPoint center;
- NSTimeInterval duration;
- UIViewAnimationCurve curve;
[[[notification userInfo] objectForKey:UIKeyboardBoundsUserInfoKey] getValue:&bounds];
[[[notification userInfo] objectForKey:UIKeyboardCenterEndUserInfoKey] getValue:¢er];
- [[[notification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] getValue:&curve];
- [[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] getValue:&duration];
+
+ NSTimeInterval duration;
+ UIViewAnimationCurve curve;
+ [self getKeyboardCurve:&curve duration:&duration forNotification:notification];
CGRect kbframe = CGRectMake(round(center.x - bounds.size.width / 2.0), round(center.y - bounds.size.height / 2.0), bounds.size.width, bounds.size.height);
UIViewController *base = self;
CGRect viewframe = [[base view] convertRect:[list_ frame] fromView:[list_ superview]];
CGRect intersection = CGRectIntersection(viewframe, kbframe);
+ if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) // XXX: _UIApplicationLinkedOnOrAfter(4)
+ intersection.size.height += CYStatusBarHeight([self interfaceOrientation]);
+
[self resizeForKeyboardBounds:intersection duration:duration curve:curve];
}
- (void) keyboardWillHide:(NSNotification *)notification {
NSTimeInterval duration;
UIViewAnimationCurve curve;
- [[[notification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] getValue:&curve];
- [[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] getValue:&duration];
+ [self getKeyboardCurve:&curve duration:&duration forNotification:notification];
[self resizeForKeyboardBounds:CGRectZero duration:duration curve:curve];
}
PackageCell *cell((PackageCell *) [table dequeueReusableCellWithIdentifier:@"Package"]);
if (cell == nil)
cell = [[[PackageCell alloc] init] autorelease];
- [cell setPackage:[self packageAtIndexPath:path]];
+ [cell setPackage:[self packageAtIndexPath:path] asSummary:[self isSummarized]];
return cell;
}
}
- (NSArray *) sectionIndexTitlesForTableView:(UITableView *)tableView {
- // XXX: is 20 the most optimal number here?
- return [packages_ count] > 20 ? index_ : nil;
+ if ([self showsSections])
+ return nil;
+
+ return index_;
}
- (NSInteger) tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index {
return index;
}
+- (void) updateHeight {
+ [list_ setRowHeight:([self isSummarized] ? 38 : 73)];
+}
+
- (id) initWithDatabase:(Database *)database title:(NSString *)title {
if ((self = [super init]) != nil) {
database_ = database;
#if TryIndexedCollation
if ([[self class] hasIndexedCollation])
- index_ = [[[objc_getClass("UILocalizedIndexedCollation") currentCollation] sectionIndexTitles] retain]
+ index_ = [[objc_getClass("UILocalizedIndexedCollation") currentCollation] sectionIndexTitles];
else
#endif
- index_ = [[NSMutableArray alloc] initWithCapacity:32];
+ index_ = [NSMutableArray arrayWithCapacity:32];
- indices_ = [[NSMutableDictionary alloc] initWithCapacity:32];
+ indices_ = [NSMutableDictionary dictionaryWithCapacity:32];
- packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
- sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
+ packages_ = [NSArray array];
+ sections_ = [NSMutableArray arrayWithCapacity:16];
+ } return self;
+}
- list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
- [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
- [list_ setRowHeight:73];
- [[self view] addSubview:list_];
+- (void) loadView {
+ [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
- [list_ setDataSource:self];
- [list_ setDelegate:self];
- } return self;
+ list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain] autorelease];
+ [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
+ [[self view] addSubview:list_];
+
+ // XXX: is 20 the most optimal number here?
+ [list_ setSectionIndexMinimumDisplayRowCount:20];
+
+ [(UITableView *) list_ setDataSource:self];
+ [list_ setDelegate:self];
+
+ [self updateHeight];
+}
+
+- (void) releaseSubviews {
+ list_ = nil;
+
+ [super releaseSubviews];
}
- (void) setDelegate:(id)delegate {
delegate_ = delegate;
}
-- (bool) hasPackage:(Package *)package {
- return true;
+- (bool) shouldYield {
+ return false;
}
-- (void) reloadData {
- [super reloadData];
+- (bool) shouldBlock {
+ return false;
+}
+- (NSMutableArray *) _reloadPackages {
+@synchronized (database_) {
era_ = [database_ era];
- NSArray *packages = [database_ packages];
+ NSArray *packages([database_ packages]);
- [packages_ removeAllObjects];
- [sections_ removeAllObjects];
+ return [NSMutableArray arrayWithArray:packages];
+} }
- _profile(PackageTable$reloadData$Filter)
- for (Package *package in packages)
- if ([self hasPackage:package])
- [packages_ addObject:package];
- _end
+- (void) _reloadData {
+ if (reloading_ != 0) {
+ reloading_ = 2;
+ return;
+ }
+
+ NSArray *packages;
+
+ if ([self shouldYield]) {
+ do {
+ UIProgressHUD *hud;
+
+ if (![self shouldBlock])
+ hud = nil;
+ else {
+ hud = [delegate_ addProgressHUD];
+ [hud setText:UCLocalize("LOADING")];
+ }
+
+ reloading_ = 1;
+ packages = [self yieldToSelector:@selector(_reloadPackages)];
+
+ if (hud != nil)
+ [delegate_ removeProgressHUD:hud];
+ } while (reloading_ == 2);
+
+ reloading_ = 0;
+ } else {
+ packages = [self _reloadPackages];
+ }
+
+ packages_ = packages;
[indices_ removeAllObjects];
+ [sections_ removeAllObjects];
Section *section = nil;
{
[index_ removeAllObjects];
+ bool sectioned([self showsSections]);
+ if (!sectioned) {
+ section = [[[Section alloc] initWithName:nil localize:false] autorelease];
+ [sections_ addObject:section];
+ }
+
_profile(PackageTable$reloadData$Section)
for (size_t offset(0), end([packages_ count]); offset != end; ++offset) {
Package *package;
index = [package index];
_end
- if (section == nil || [section index] != index) {
+ if (sectioned && (section == nil || [section index] != index)) {
_profile(PackageTable$reloadData$Section$Allocate)
section = [[[Section alloc] initWithIndex:index row:offset] autorelease];
_end
_end
}
+ [self updateHeight];
+
_profile(PackageTable$reloadData$List)
+ [(UITableView *) list_ setDataSource:self];
[list_ reloadData];
_end
}
+- (void) reloadData {
+ [super reloadData];
+ [self performSelector:@selector(_reloadData) withObject:nil afterDelay:0];
+}
+
- (void) resetCursor {
- [list_ scrollRectToVisible:CGRectMake(0, 0, 0, 0) animated:NO];
+ [list_ scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:NO];
+}
+
+- (void) clearData {
+ [self updateHeight];
+
+ [list_ setDataSource:nil];
+ [list_ reloadData];
+
+ [self resetCursor];
}
@end
@interface FilteredPackageListController : PackageListController {
SEL filter_;
IMP imp_;
- id object_;
+ _H<NSObject> object_;
}
- (void) setObject:(id)object;
- (void) setObject:(id)object forFilter:(SEL)filter;
+- (SEL) filter;
+- (void) setFilter:(SEL)filter;
+
- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object;
@end
@implementation FilteredPackageListController
-- (void) dealloc {
- if (object_ != nil)
- [object_ release];
- [super dealloc];
+- (SEL) filter {
+ return filter_;
}
- (void) setFilter:(SEL)filter {
+@synchronized (self) {
filter_ = filter;
/* XXX: this is an unsafe optimization of doomy hell */
_assert(method != NULL);
imp_ = method_getImplementation(method);
_assert(imp_ != NULL);
-}
+} }
- (void) setObject:(id)object {
- if (object_ != nil)
- [object_ release];
- if (object == nil)
- object_ = nil;
- else
- object_ = [object retain];
-}
+@synchronized (self) {
+ object_ = object;
+} }
- (void) setObject:(id)object forFilter:(SEL)filter {
+@synchronized (self) {
[self setFilter:filter];
[self setObject:object];
-}
+} }
+
+- (NSMutableArray *) _reloadPackages {
+@synchronized (database_) {
+ era_ = [database_ era];
+ NSArray *packages([database_ packages]);
+
+ NSMutableArray *filtered([NSMutableArray arrayWithCapacity:[packages count]]);
+
+ IMP imp;
+ SEL filter;
+ _H<NSObject> object;
-- (bool) hasPackage:(Package *)package {
- _profile(FilteredPackageTable$hasPackage)
- return [package valid] && (*reinterpret_cast<bool (*)(id, SEL, id)>(imp_))(package, filter_, object_);
+ @synchronized (self) {
+ imp = imp_;
+ filter = filter_;
+ object = object_;
+ }
+
+ _profile(PackageTable$reloadData$Filter)
+ for (Package *package in packages)
+ if ([package valid] && (*reinterpret_cast<bool (*)(id, SEL, id)>(imp))(package, filter, object))
+ [filtered addObject:package];
_end
-}
+
+ return filtered;
+} }
- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
if ((self = [super initWithDatabase:database title:title]) != nil) {
] autorelease];
}
-- (void) unloadData {
- [super unloadData];
- [self reloadData];
-}
-
@end
/* }}} */
/* Manage Controller {{{ */
/* Refresh Bar {{{ */
@interface RefreshBar : UINavigationBar {
- UIProgressIndicator *indicator_;
- UITextLabel *prompt_;
- UIProgressBar *progress_;
- UINavigationButton *cancel_;
+ _H<UIProgressIndicator> indicator_;
+ _H<UITextLabel> prompt_;
+ _H<UIProgressBar> progress_;
+ _H<UINavigationButton> cancel_;
}
@end
@implementation RefreshBar
-- (void) dealloc {
- [indicator_ release];
- [prompt_ release];
- [progress_ release];
- [cancel_ release];
- [super dealloc];
-}
-
- (void) positionViews {
CGRect frame = [cancel_ frame];
frame.size = [cancel_ sizeThatFits:frame.size];
UIProgressIndicatorStyleMediumBrown :
UIProgressIndicatorStyleMediumWhite;
- indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectZero];
- [indicator_ setStyle:style];
+ indicator_ = [[[UIProgressIndicator alloc] initWithFrame:CGRectZero] autorelease];
+ [(UIProgressIndicator *) indicator_ setStyle:style];
[indicator_ startAnimation];
[self addSubview:indicator_];
- prompt_ = [[UITextLabel alloc] initWithFrame:CGRectZero];
+ prompt_ = [[[UITextLabel alloc] initWithFrame:CGRectZero] autorelease];
[prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
[prompt_ setBackgroundColor:[UIColor clearColor]];
[prompt_ setFont:[UIFont systemFontOfSize:15]];
[self addSubview:prompt_];
- progress_ = [[UIProgressBar alloc] initWithFrame:CGRectZero];
+ progress_ = [[[UIProgressBar alloc] initWithFrame:CGRectZero] autorelease];
[progress_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleLeftMargin];
- [progress_ setStyle:0];
+ [(UIProgressBar *) progress_ setStyle:0];
[self addSubview:progress_];
- cancel_ = [[UINavigationButton alloc] initWithTitle:UCLocalize("CANCEL") style:UINavigationButtonStyleHighlighted];
+ cancel_ = [[[UINavigationButton alloc] initWithTitle:UCLocalize("CANCEL") style:UINavigationButtonStyleHighlighted] autorelease];
[cancel_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
[cancel_ addTarget:delegate action:@selector(cancelPressed) forControlEvents:UIControlEventTouchUpInside];
[cancel_ setBarStyle:barstyle];
ProgressDelegate
> {
_transient Database *database_;
- RefreshBar *refreshbar_;
+ _H<RefreshBar, 1> refreshbar_;
bool dropped_;
bool updating_;
// XXX: ok, "updatedelegate_"?...
_transient NSObject<CydiaDelegate> *updatedelegate_;
- id root_;
- UIViewController *remembered_;
+ _H<UIViewController> remembered_;
_transient UIViewController *transient_;
}
NSMutableArray *controllers = [[self viewControllers] mutableCopy];
if (transient != nil) {
if (transient_ == nil)
- remembered_ = [[controllers objectAtIndex:0] retain];
+ remembered_ = [controllers objectAtIndex:0];
transient_ = transient;
[transient_ setTabBarItem:[remembered_ tabBarItem]];
[controllers replaceObjectAtIndex:0 withObject:transient_];
[remembered_ setTabBarItem:[transient_ tabBarItem]];
transient_ = transient;
[controllers replaceObjectAtIndex:0 withObject:remembered_];
- [remembered_ release];
remembered_ = nil;
[self setViewControllers:controllers];
[self revealTabBarSelection];
}
- (void) unloadData {
- UIViewController *selected([self selectedViewController]);
+ [super unloadData];
+
for (UINavigationController *controller in [self viewControllers])
[controller unloadData];
- [selected reloadData];
+ if (UIViewController *selected = [self selectedViewController])
+ [selected reloadData];
- if (UIViewController *unselected = [self unselectedViewController])
+ if (UIViewController *unselected = [self unselectedViewController]) {
+ [unselected unloadData];
[unselected reloadData];
-
- [super unloadData];
+ }
}
- (void) dealloc {
- [refreshbar_ release];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[super dealloc];
[[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarFrameChanged:) name:UIApplicationDidChangeStatusBarFrameNotification object:nil];
- refreshbar_ = [[RefreshBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, [UINavigationBar defaultSize].height) delegate:self];
+ refreshbar_ = [[[RefreshBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, [UINavigationBar defaultSize].height) delegate:self] autorelease];
} return self;
}
}
- (void) beginUpdate {
- [refreshbar_ start];
+ [(RefreshBar *) refreshbar_ start];
[self dropBar:YES];
[updatedelegate_ retainNetworkActivityIndicator];
];
}
-- (void) performUpdate { _pooled
+- (void) performUpdate {
+ NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+
Status status;
status.setDelegate(self);
[database_ updateWithStatus:status];
withObject:nil
waitUntilDone:NO
];
+
+ [pool release];
}
- (void) stopUpdateWithSelector:(SEL)selector {
updatedelegate_ = delegate;
}
-- (CGFloat) statusBarHeight {
- if (UIInterfaceOrientationIsPortrait([self interfaceOrientation])) {
- return [[UIApplication sharedApplication] statusBarFrame].size.height;
- } else {
- return [[UIApplication sharedApplication] statusBarFrame].size.width;
- }
-}
-
- (UIView *) transitionView {
if ([self respondsToSelector:@selector(_transitionView)])
return [self _transitionView];
CGRect barframe([refreshbar_ frame]);
if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iPhoneOS_3_0) // XXX: _UIApplicationLinkedOnOrAfter(4)
- barframe.origin.y = [self statusBarHeight];
+ barframe.origin.y = CYStatusBarHeight([self interfaceOrientation]);
else
barframe.origin.y = 0;
// Ensure bar has the proper width for our view, it might have changed
barframe.size.width = viewframe.size.width;
[refreshbar_ setFrame:barframe];
-
- // XXX: fix Apple's layout bug
- [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
}
- (void) raiseBar:(BOOL)animated {
if (animated)
[UIView commitAnimations];
-
- // XXX: fix Apple's layout bug
- // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
-}
-
-#if 0
-- (void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration {
- // XXX: fix Apple's layout bug
- // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
}
-#endif
- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
bool dropped(dropped_);
if (dropped)
[self dropBar:NO];
-
- // XXX: fix Apple's layout bug
- // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
}
- (void) statusBarFrameChanged:(NSNotification *)notification {
Package *package([database packageWithName:path]);
if (package == nil)
goto fail;
+ [package parse];
UIImage *icon([package icon]);
[self _returnPNGWithImage:icon forRequest:request];
} else if ([command isEqualToString:@"source-icon"]) {
goto fail;
path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
NSString *section(Simplify(path));
- UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]]);
+ UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, [section stringByReplacingOccurrencesOfString:@" " withString:@"_"]]]);
if (icon == nil)
icon = [UIImage applicationImageNamed:@"unknown.png"];
[self _returnPNGWithImage:icon forRequest:request];
UITableViewDelegate
> {
_transient Database *database_;
- NSMutableArray *sections_;
- NSMutableArray *filtered_;
- UITableView *list_;
+ _H<NSMutableArray> sections_;
+ _H<NSMutableArray> filtered_;
+ _H<UITableView, 2> list_;
}
- (id) initWithDatabase:(Database *)database;
@implementation SectionsController
-- (void) dealloc {
- [self releaseSubviews];
- [sections_ release];
- [filtered_ release];
-
- [super dealloc];
-}
-
- (NSURL *) navigationURL {
return [NSURL URLWithString:@"cydia://sections"];
}
- (void) loadView {
[self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
- list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];
+ list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds]] autorelease];
[list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
[list_ setRowHeight:45.0f];
- [list_ setDataSource:self];
+ [(UITableView *) list_ setDataSource:self];
[list_ setDelegate:self];
[[self view] addSubview:list_];
}
}
- (void) releaseSubviews {
- [list_ release];
list_ = nil;
+
+ [super releaseSubviews];
}
- (id) initWithDatabase:(Database *)database {
if ((self = [super init]) != nil) {
database_ = database;
- sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
- filtered_ = [[NSMutableArray arrayWithCapacity:16] retain];
+ sections_ = [NSMutableArray arrayWithCapacity:16];
+ filtered_ = [NSMutableArray arrayWithCapacity:16];
} return self;
}
[sections_ sortUsingSelector:@selector(compareByLocalized:)];
- for (Section *section in sections_) {
+ for (Section *section in (id) sections_) {
size_t count([section row]);
if (count == 0)
continue;
> {
_transient Database *database_;
unsigned era_;
- CFMutableArrayRef packages_;
- NSMutableArray *sections_;
- UITableView *list_;
+ _H<NSArray> packages_;
+ _H<NSMutableArray> sections_;
+ _H<UITableView, 2> list_;
unsigned upgrades_;
}
@implementation ChangesController
-- (void) dealloc {
- [self releaseSubviews];
- CFRelease(packages_);
- [sections_ release];
-
- [super dealloc];
-}
-
- (NSURL *) navigationURL {
return [NSURL URLWithString:@"cydia://changes"];
}
return [[sections_ objectAtIndex:section] count];
}
-- (Package *) packageAtIndex:(NSUInteger)index {
- return (Package *) CFArrayGetValueAtIndex(packages_, index);
-}
-
- (Package *) packageAtIndexPath:(NSIndexPath *)path {
@synchronized (database_) {
if ([database_ era] != era_)
return nil;
Section *section([sections_ objectAtIndex:sectionIndex]);
NSInteger row([path row]);
- return [[[self packageAtIndex:([section row] + row)] retain] autorelease];
+ return [[[packages_ objectAtIndex:([section row] + row)] retain] autorelease];
} }
- (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path {
PackageCell *cell((PackageCell *) [table dequeueReusableCellWithIdentifier:@"Package"]);
if (cell == nil)
cell = [[[PackageCell alloc] init] autorelease];
- [cell setPackage:[self packageAtIndexPath:path]];
+ [cell setPackage:[self packageAtIndexPath:path] asSummary:false];
return cell;
}
- (void) loadView {
[self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
- list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
+ list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain] autorelease];
[list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
[list_ setRowHeight:73];
- [list_ setDataSource:self];
+ [(UITableView *) list_ setDataSource:self];
[list_ setDelegate:self];
[[self view] addSubview:list_];
}
}
- (void) releaseSubviews {
- [list_ release];
list_ = nil;
+
+ [super releaseSubviews];
}
- (id) initWithDatabase:(Database *)database {
if ((self = [super init]) != nil) {
database_ = database;
- packages_ = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
- sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
+ packages_ = [NSArray array];
+ sections_ = [NSMutableArray arrayWithCapacity:16];
} return self;
}
-// this mostly works because reloadData (below) is @synchronized (database_)
-// XXX: that said, I've been running into problems with NSRangeExceptions :(
-- (void) _reloadPackages:(NSArray *)packages {
- CFRelease(packages_);
- packages_ = CFArrayCreateMutable(kCFAllocatorDefault, [packages count], NULL);
+- (NSMutableArray *) _reloadPackages {
+@synchronized (database_) {
+ era_ = [database_ era];
+ NSArray *packages([database_ packages]);
+
+ NSMutableArray *filtered([NSMutableArray arrayWithCapacity:[packages count]]);
_trace();
_profile(ChangesController$_reloadPackages$Filter)
for (Package *package in packages)
if ([package upgradableAndEssential:YES] || [package visible])
- CFArrayAppendValue(packages_, package);
+ CFArrayAppendValue((CFMutableArrayRef) filtered, package);
_end
_trace();
_profile(ChangesController$_reloadPackages$radixSort)
- [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<SKRadixFunction>(&PackageChangesRadix) withContext:NULL];
+ [filtered radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackageChangesRadix) withContext:NULL];
_end
_trace();
-}
+
+ return filtered;
+} }
- (void) _reloadData {
+ NSArray *packages;
+
+ reload:
+ if (true) {
+ UIProgressHUD *hud([delegate_ addProgressHUD]);
+ [hud setText:UCLocalize("LOADING")];
+ //NSLog(@"HUD:%@::%@", delegate_, hud);
+ packages = [self yieldToSelector:@selector(_reloadPackages)];
+ [delegate_ removeProgressHUD:hud];
+ } else {
+ packages = [self _reloadPackages];
+ }
+
@synchronized (database_) {
- era_ = [database_ era];
- NSArray *packages = [database_ packages];
+ if (era_ != [database_ era])
+ goto reload;
+ packages_ = packages;
[sections_ removeAllObjects];
-#if 1
- UIProgressHUD *hud([delegate_ addProgressHUD]);
- [hud setText:UCLocalize("LOADING")];
- //NSLog(@"HUD:%@::%@", delegate_, hud);
- [self yieldToSelector:@selector(_reloadPackages:) withObject:packages];
- [delegate_ removeProgressHUD:hud];
-#else
- [self _reloadPackages:packages];
-#endif
-
Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease];
Section *ignored = nil;
Section *section = nil;
CFDateFormatterRef formatter(CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle));
- for (size_t offset = 0, count = CFArrayGetCount(packages_); offset != count; ++offset) {
- Package *package = [self packageAtIndex:offset];
+ for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
+ Package *package = [packages_ objectAtIndex:offset];
BOOL uae = [package upgradableAndEssential:YES];
if (unseens) {
Section *last = [sections_ lastObject];
size_t count = [last count];
- CFArrayReplaceValues(packages_, CFRangeMake(CFArrayGetCount(packages_) - count, count), NULL, 0);
+ [packages_ removeObjectsInRange:NSMakeRange([packages_ count] - count, count)];
[sections_ removeLastObject];
}
@interface SearchController : FilteredPackageListController <
UISearchBarDelegate
> {
- _H<UISearchBar> search_;
+ _H<UISearchBar, 1> search_;
BOOL searchloaded_;
}
@implementation SearchController
-- (void) dealloc {
- [search_ setDelegate:nil];
- [super dealloc];
-}
-
- (NSURL *) navigationURL {
if ([search_ text] == nil || [[search_ text] isEqualToString:@""])
return [NSURL URLWithString:@"cydia://search"];
return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://search/%@", [search_ text]]];
}
-- (void) searchBarSearchButtonClicked:(UISearchBar *)searchBar {
- [self setObject:[search_ text] forFilter:@selector(isUnfilteredAndSearchedForBy:)];
- [search_ resignFirstResponder];
+- (void) useSearch {
+ [self setObject:[[search_ text] componentsSeparatedByString:@" "] forFilter:@selector(isUnfilteredAndSearchedForBy:)];
+ [self clearData];
+ [self reloadData];
+}
+
+- (void) viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ if ([self filter] == @selector(isUnfilteredAndSelectedForBy:))
+ [self useSearch];
+}
+
+- (void) searchBarTextDidBeginEditing:(UISearchBar *)searchBar {
+ [self setObject:[search_ text] forFilter:@selector(isUnfilteredAndSelectedForBy:)];
+ [self clearData];
[self reloadData];
}
+- (void) searchBarButtonClicked:(UISearchBar *)searchBar {
+ [search_ resignFirstResponder];
+ [self useSearch];
+}
+
+- (void) searchBarCancelButtonClicked:(UISearchBar *)searchBar {
+ [search_ setText:@""];
+ [self searchBarButtonClicked:searchBar];
+}
+
+- (void) searchBarSearchButtonClicked:(UISearchBar *)searchBar {
+ [self searchBarButtonClicked:searchBar];
+}
+
- (void) searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)text {
[self setObject:text forFilter:@selector(isUnfilteredAndSelectedForBy:)];
[self reloadData];
}
+- (bool) shouldYield {
+ return YES;
+}
+
+- (bool) shouldBlock {
+ return [self filter] == @selector(isUnfilteredAndSearchedForBy:);
+}
+
+- (bool) isSummarized {
+ return [self filter] == @selector(isUnfilteredAndSelectedForBy:);
+}
+
+- (bool) showsSections {
+ return false;
+}
+
+- (NSMutableArray *) _reloadPackages {
+ NSMutableArray *packages([super _reloadPackages]);
+ if ([self filter] == @selector(isUnfilteredAndSearchedForBy:))
+ [packages radixSortUsingSelector:@selector(rank)];
+ return packages;
+}
+
- (id) initWithDatabase:(Database *)database query:(NSString *)query {
- if ((self = [super initWithDatabase:database title:UCLocalize("SEARCH") filter:@selector(isUnfilteredAndSearchedForBy:) with:query])) {
+ if ((self = [super initWithDatabase:database title:UCLocalize("SEARCH") filter:@selector(isUnfilteredAndSearchedForBy:) with:[query componentsSeparatedByString:@" "]])) {
search_ = [[[UISearchBar alloc] init] autorelease];
[search_ setDelegate:self];
}
- (void) reloadData {
- [self setObject:[search_ text]];
+ id object([search_ text]);
+ if ([self filter] == @selector(isUnfilteredAndSearchedForBy:))
+ object = [object componentsSeparatedByString:@" "];
+
+ [self setObject:object];
[self resetCursor];
[super reloadData];
UITableViewDelegate
> {
_transient Database *database_;
- NSString *name_;
- Package *package_;
- UITableView *table_;
- UISwitch *subscribedSwitch_;
- UISwitch *ignoredSwitch_;
- UITableViewCell *subscribedCell_;
- UITableViewCell *ignoredCell_;
+ _H<NSString> name_;
+ _H<Package> package_;
+ _H<UITableView, 2> table_;
+ _H<UISwitch> subscribedSwitch_;
+ _H<UISwitch> ignoredSwitch_;
+ _H<UITableViewCell> subscribedCell_;
+ _H<UITableViewCell> ignoredCell_;
}
- (id) initWithDatabase:(Database *)database package:(NSString *)package;
@implementation PackageSettingsController
-- (void) dealloc {
- [self releaseSubviews];
- [name_ release];
- [package_ release];
-
- [super dealloc];
-}
-
- (NSURL *) navigationURL {
return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@/settings", [package_ id]]];
}
- (void) loadView {
[self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
- table_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped];
+ table_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped] autorelease];
[table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
- [table_ setDataSource:self];
+ [(UITableView *) table_ setDataSource:self];
[table_ setDelegate:self];
[[self view] addSubview:table_];
- subscribedSwitch_ = [[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)];
+ subscribedSwitch_ = [[[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)] autorelease];
[subscribedSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
[subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:UIControlEventValueChanged];
- ignoredSwitch_ = [[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)];
+ ignoredSwitch_ = [[[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)] autorelease];
[ignoredSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
[ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:UIControlEventValueChanged];
- subscribedCell_ = [[UITableViewCell alloc] init];
+ subscribedCell_ = [[[UITableViewCell alloc] init] autorelease];
[subscribedCell_ setText:UCLocalize("SHOW_ALL_CHANGES")];
[subscribedCell_ setAccessoryView:subscribedSwitch_];
[subscribedCell_ setSelectionStyle:UITableViewCellSelectionStyleNone];
- ignoredCell_ = [[UITableViewCell alloc] init];
+ ignoredCell_ = [[[UITableViewCell alloc] init] autorelease];
[ignoredCell_ setText:UCLocalize("IGNORE_UPGRADES")];
[ignoredCell_ setAccessoryView:ignoredSwitch_];
[ignoredCell_ setSelectionStyle:UITableViewCellSelectionStyleNone];
}
- (void) releaseSubviews {
- [ignoredCell_ release];
ignoredCell_ = nil;
-
- [subscribedCell_ release];
subscribedCell_ = nil;
-
- [table_ release];
table_ = nil;
-
- [ignoredSwitch_ release];
ignoredSwitch_ = nil;
-
- [subscribedSwitch_ release];
subscribedSwitch_ = nil;
+
+ [super releaseSubviews];
}
- (id) initWithDatabase:(Database *)database package:(NSString *)package {
if ((self = [super init]) != nil) {
database_ = database;
- name_ = [package retain];
+ name_ = package;
} return self;
}
- (void) reloadData {
[super reloadData];
- if (package_ != nil)
- [package_ autorelease];
package_ = [database_ packageWithName:name_];
if (package_ != nil) {
- package_ = [package_ retain];
[subscribedSwitch_ setOn:([package_ subscribed] ? 1 : 0) animated:NO];
[ignoredSwitch_ setOn:([package_ ignored] ? 1 : 0) animated:NO];
} // XXX: what now, G?
@implementation InstalledController
-- (void) dealloc {
- [super dealloc];
-}
-
- (NSURL *) navigationURL {
return [NSURL URLWithString:@"cydia://installed"];
}
/* }}} */
/* Source Cell {{{ */
-@interface SourceCell : CYTableViewCell <
- ContentDelegate
+@interface SourceCell : CyteTableViewCell <
+ CyteTableViewCellDelegate
> {
- UIImage *icon_;
- NSString *origin_;
- NSString *label_;
+ _H<UIImage> icon_;
+ _H<NSString> origin_;
+ _H<NSString> label_;
}
- (void) setSource:(Source *)source;
@implementation SourceCell
-- (void) clearSource {
- [icon_ release];
- [origin_ release];
- [label_ release];
+- (void) _setImage:(UIImage *)image {
+ icon_ = image;
+ [content_ setNeedsDisplay];
+}
- icon_ = nil;
- origin_ = nil;
- label_ = nil;
+- (void) _setSource:(Source *)source {
+ NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+
+ if (NSString *base = [source base])
+ if ([base length] != 0) {
+ NSURL *url([NSURL URLWithString:[base stringByAppendingString:@"CydiaIcon.png"]]);
+
+ if (NSData *data = [NSURLConnection
+ sendSynchronousRequest:[NSURLRequest
+ requestWithURL:url
+ //cachePolicy:NSURLRequestUseProtocolCachePolicy
+ //timeoutInterval:5
+ ]
+
+ returningResponse:NULL
+ error:NULL
+ ])
+ if (UIImage *image = [UIImage imageWithData:data])
+ [self performSelectorOnMainThread:@selector(_setImage:) withObject:image waitUntilDone:NO];
+ }
+
+ [pool release];
}
- (void) setSource:(Source *)source {
- [self clearSource];
+ icon_ = [UIImage applicationImageNamed:@"unknown.png"];
- if (icon_ == nil)
- icon_ = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sources/%@.png", [source host]]];
- if (icon_ == nil)
- icon_ = [UIImage applicationImageNamed:@"unknown.png"];
- icon_ = [icon_ retain];
-
- origin_ = [[source name] retain];
- label_ = [[source uri] retain];
+ origin_ = [source name];
+ label_ = [source uri];
[content_ setNeedsDisplay];
-}
-- (void) dealloc {
- [self clearSource];
- [super dealloc];
+ [NSThread detachNewThreadSelector:@selector(_setSource:) toTarget:self withObject:source];
}
- (SourceCell *) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
UIView *content([self contentView]);
CGRect bounds([content bounds]);
- content_ = [[ContentView alloc] initWithFrame:bounds];
+ content_ = [[[CyteTableViewCellContentView alloc] initWithFrame:bounds] autorelease];
[content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
[content_ setBackgroundColor:[UIColor whiteColor]];
[content addSubview:content_];
/* Source Controller {{{ */
@interface SourceController : FilteredPackageListController {
_transient Source *source_;
- NSString *key_;
+ _H<NSString> key_;
}
- (id) initWithDatabase:(Database *)database source:(Source *)source;
- (id) initWithDatabase:(Database *)database source:(Source *)source {
if ((self = [super initWithDatabase:database title:[source label] filter:@selector(isVisibleInSource:) with:source]) != nil) {
source_ = source;
- key_ = [[source key] retain];
+ key_ = [source key];
} return self;
}
- (void) reloadData {
source_ = [database_ sourceWithKey:key_];
- [key_ release];
- key_ = [[source_ key] retain];
+ key_ = [source_ key];
[self setObject:source_];
[[self navigationItem] setTitle:[source_ label]];
UITableViewDelegate
> {
_transient Database *database_;
- UITableView *list_;
- NSMutableArray *sources_;
+ _H<UITableView, 2> list_;
+ _H<NSMutableArray> sources_;
int offset_;
- NSString *href_;
- UIProgressHUD *hud_;
- NSError *error_;
+ _H<NSString> href_;
+ _H<UIProgressHUD> hud_;
+ _H<NSError> error_;
//NSURLConnection *installer_;
NSURLConnection *trivial_;
}
- (void) dealloc {
- [self releaseSubviews];
-
- [href_ release];
- [hud_ release];
- [error_ release];
-
//[self _releaseConnection:installer_];
[self _releaseConnection:trivial_];
[self _releaseConnection:trivial_gz_];
[self _releaseConnection:trivial_bz2_];
//[self _releaseConnection:automatic_];
- [sources_ release];
[super dealloc];
}
}
- (void) tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
- Source *source = [self sourceAtIndexPath:indexPath];
- [Sources_ removeObjectForKey:[source key]];
- [delegate_ syncData];
+ if (editingStyle == UITableViewCellEditingStyleDelete) {
+ Source *source = [self sourceAtIndexPath:indexPath];
+ [Sources_ removeObjectForKey:[source key]];
+ [delegate_ syncData];
+ }
}
- (void) complete {
trivial_bz2_ == nil &&
trivial_gz_ == nil
) {
+ [delegate_ releaseNetworkActivityIndicator];
+
+ [delegate_ removeProgressHUD:hud_];
+ hud_ = nil;
+
bool defer(false);
if (cydia_) {
[alert show];
}
- [delegate_ releaseNetworkActivityIndicator];
-
- [delegate_ removeProgressHUD:hud_];
- [hud_ autorelease];
- hud_ = nil;
-
- if (!defer) {
- [href_ release];
- href_ = nil;
- }
-
- if (error_ != nil) {
- [error_ release];
- error_ = nil;
- }
+ href_ = nil;
+ error_ = nil;
}
}
- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
lprintf("connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]);
- if (error_ != nil)
- error_ = [error retain];
+ error_ = error;
[self _endConnection:connection];
}
}
- (NSURLConnection *) _requestHRef:(NSString *)href method:(NSString *)method {
+ NSURL *url([NSURL URLWithString:href]);
+
NSMutableURLRequest *request = [NSMutableURLRequest
- requestWithURL:[NSURL URLWithString:href]
+ requestWithURL:url
cachePolicy:NSURLRequestUseProtocolCachePolicy
timeoutInterval:120.0
];
if (Machine_ != NULL)
[request setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
- if (UniqueID_ != nil)
- [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"];
+
+ if ([url isCydiaSecure]) {
+ if (UniqueID_ != nil)
+ [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"];
+ }
return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
}
href_ = [href stringByAppendingString:@"/"];
else
href_ = href;
- href_ = [href_ retain];
trivial_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages"] method:@"HEAD"] retain];
trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.bz2"] method:@"HEAD"] retain];
cydia_ = false;
// XXX: this is stupid
- hud_ = [[delegate_ addProgressHUD] retain];
+ hud_ = [delegate_ addProgressHUD];
[hud_ setText:UCLocalize("VERIFYING_URL")];
[delegate_ retainNetworkActivityIndicator];
} break;
_nodefault
}
- [href_ release];
href_ = nil;
[alert dismissWithClickedButtonIndex:-1 animated:YES];
- (void) loadView {
[self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
- list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
+ list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain] autorelease];
[list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
[list_ setRowHeight:56];
- [list_ setDataSource:self];
+ [(UITableView *) list_ setDataSource:self];
[list_ setDelegate:self];
[[self view] addSubview:list_];
}
}
- (void) releaseSubviews {
- [list_ release];
list_ = nil;
+
+ [super releaseSubviews];
}
- (id) initWithDatabase:(Database *)database {
if ((self = [super init]) != nil) {
database_ = database;
- sources_ = [[NSMutableArray arrayWithCapacity:16] retain];
+ sources_ = [NSMutableArray arrayWithCapacity:16];
} return self;
}
] autorelease];
[alert setContext:@"source"];
- [alert setTransform:CGAffineTransformTranslate([alert transform], 0.0, 100.0)];
[alert setNumberOfRows:1];
[alert addTextFieldWithValue:@"http://" label:@""];
_transient Database *database_;
// XXX: ok, "roledelegate_"?...
_transient id roledelegate_;
- UITableView *table_;
- UISegmentedControl *segment_;
- UIView *container_;
+ _H<UITableView, 2> table_;
+ _H<UISegmentedControl> segment_;
+ _H<UIView> container_;
}
- (void) showDoneButton;
@implementation SettingsController
-- (void) dealloc {
- [self releaseSubviews];
-
- [super dealloc];
-}
-
- (void) loadView {
[self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
- table_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped];
+ table_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped] autorelease];
[table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
[table_ setDelegate:self];
- [table_ setDataSource:self];
+ [(UITableView *) table_ setDataSource:self];
[[self view] addSubview:table_];
NSArray *items = [NSArray arrayWithObjects:
UCLocalize("HACKER"),
UCLocalize("DEVELOPER"),
nil];
- segment_ = [[UISegmentedControl alloc] initWithItems:items];
- container_ = [[UIView alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, 44.0f)];
+ segment_ = [[[UISegmentedControl alloc] initWithItems:items] autorelease];
+ container_ = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, 44.0f)] autorelease];
[container_ addSubview:segment_];
}
}
- (void) releaseSubviews {
- [table_ release];
table_ = nil;
-
- [segment_ release];
segment_ = nil;
-
- [container_ release];
container_ = nil;
+
+ [super releaseSubviews];
}
- (id) initWithDatabase:(Database *)database delegate:(id)delegate {
/* }}} */
/* Stash Controller {{{ */
@interface StashController : CyteViewController {
- UIActivityIndicatorView *spinner_;
- UILabel *status_;
- UILabel *caption_;
+ _H<UIActivityIndicatorView> spinner_;
+ _H<UILabel> status_;
+ _H<UILabel> caption_;
}
@end
@implementation StashController
-- (void) dealloc {
- [self releaseSubviews];
-
- [super dealloc];
-}
-
- (void) loadView {
[self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
[[self view] setBackgroundColor:[UIColor viewFlipsideBackgroundColor]];
}
- (void) releaseSubviews {
- [spinner_ release];
spinner_ = nil;
-
- [status_ release];
status_ = nil;
-
- [caption_ release];
caption_ = nil;
+
+ [super releaseSubviews];
}
@end
#endif
}
+- (void) storeCachedResponse:(NSCachedURLResponse *)cached forRequest:(NSURLRequest *)request {
+ if (NSURLResponse *response = [cached response])
+ if (NSString *mime = [response MIMEType])
+ if ([mime isEqualToString:@"text/cache-manifest"]) {
+ NSURL *url([response URL]);
+
+#if !ForRelease
+ NSLog(@"###: %@", [url absoluteString]);
+#endif
+
+ @synchronized (HostConfig_) {
+ [CachedURLs_ addObject:url];
+ }
+ }
+
+ [super storeCachedResponse:cached forRequest:request];
+}
+
@end
@interface Cydia : UIApplication <
UINavigationControllerDelegate,
UITabBarControllerDelegate
> {
- // XXX: evaluate all fields for _transient
-
- UIWindow *window_;
- CYTabBarController *tabbar_;
- CYEmulatedLoadingController *emulated_;
+ _H<UIWindow> window_;
+ _H<CYTabBarController> tabbar_;
+ _H<CydiaLoadingViewController> emulated_;
- NSMutableArray *essential_;
- NSMutableArray *broken_;
+ _H<NSMutableArray> essential_;
+ _H<NSMutableArray> broken_;
Database *database_;
- NSURL *starturl_;
+ _H<NSURL> starturl_;
unsigned locked_;
unsigned activity_;
- StashController *stash_;
+ _H<StashController> stash_;
bool loaded_;
}
// - We already auto-refreshed this launch.
// - Auto-refresh is disabled.
if (recently || loaded_ || ManualRefresh) {
- [self performSelectorOnMainThread:@selector(_loaded) withObject:nil waitUntilDone:NO];
-
// If we are cancelling, we need to make sure it knows it's already loaded.
loaded_ = true;
- return;
+
+ [self performSelectorOnMainThread:@selector(_loaded) withObject:nil waitUntilDone:NO];
} else {
// We are going to load, so remember that.
loaded_ = true;
- }
- SCNetworkReachabilityFlags flags; {
- SCNetworkReachabilityRef reachability(SCNetworkReachabilityCreateWithName(NULL, "cydia.saurik.com"));
- SCNetworkReachabilityGetFlags(reachability, &flags);
- CFRelease(reachability);
- }
+ SCNetworkReachabilityFlags flags; {
+ SCNetworkReachabilityRef reachability(SCNetworkReachabilityCreateWithName(NULL, "cydia.saurik.com"));
+ SCNetworkReachabilityGetFlags(reachability, &flags);
+ CFRelease(reachability);
+ }
- // XXX: this elaborate mess is what Apple is using to determine this? :(
- // XXX: do we care if the user has to intervene? maybe that's ok?
- bool reachable(
- (flags & kSCNetworkReachabilityFlagsReachable) != 0 && (
- (flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0 || (
- (flags & kSCNetworkReachabilityFlagsConnectionOnDemand) != 0 ||
- (flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0
- ) && (flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0 ||
- (flags & kSCNetworkReachabilityFlagsIsWWAN) != 0
- )
- );
+ // XXX: this elaborate mess is what Apple is using to determine this? :(
+ // XXX: do we care if the user has to intervene? maybe that's ok?
+ bool reachable(
+ (flags & kSCNetworkReachabilityFlagsReachable) != 0 && (
+ (flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0 || (
+ (flags & kSCNetworkReachabilityFlagsConnectionOnDemand) != 0 ||
+ (flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0
+ ) && (flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0 ||
+ (flags & kSCNetworkReachabilityFlagsIsWWAN) != 0
+ )
+ );
- // If we can reach the server, auto-refresh!
- if (reachable)
- [tabbar_ performSelectorOnMainThread:@selector(setUpdate:) withObject:update waitUntilDone:NO];
+ // If we can reach the server, auto-refresh!
+ if (reachable)
+ [tabbar_ performSelectorOnMainThread:@selector(setUpdate:) withObject:update waitUntilDone:NO];
+ }
[pool release];
}
[NSThread detachNewThreadSelector:@selector(_refreshIfPossible:) toTarget:self withObject:[Metadata_ objectForKey:@"LastUpdate"]];
}
-- (void) _reloadDataWithInvocation:(NSInvocation *)invocation {
+- (void) reloadDataWithInvocation:(NSInvocation *)invocation {
+@synchronized (self) {
UIProgressHUD *hud(loaded_ ? [self addProgressHUD] : nil);
[hud setText:UCLocalize("RELOADING_DATA")];
}
}
- NSLog(@"changes:#%u", changes);
-
UITabBarItem *changesItem = [[[tabbar_ viewControllers] objectAtIndex:2] tabBarItem];
if (changes != 0) {
_trace();
[self _updateData];
[self refreshIfPossible];
-}
+} }
- (void) updateData {
[self _updateData];
- (void) update_ {
[database_ update];
-}
-
-- (void) complete {
- @synchronized (self) {
- [self _reloadDataWithInvocation:nil];
- }
+ [self performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:YES];
}
- (void) disemulate {
[window_ addSubview:[tabbar_ view]];
[[emulated_ view] removeFromSuperview];
- [emulated_ release];
emulated_ = nil;
[window_ setUserInteractionEnabled:YES];
}
[self performSelectorOnMainThread:@selector(repairWithInvocation:) withObject:[NSInvocation invocationWithSelector:selector forTarget:database_] waitUntilDone:YES];
}
+- (void) reloadData {
+ [self reloadDataWithInvocation:nil];
+}
+
- (void) syncData {
[self _saveConfig];
fclose(file);
[self detachNewProgressSelector:@selector(update_) toTarget:self forController:nil title:@"UPDATING_SOURCES"];
-
- [self complete];
}
- (void) addTrivialSource:(NSString *)href {
Changed_ = true;
}
-- (void) reloadDataWithInvocation:(NSInvocation *)invocation {
- @synchronized (self) {
- [self _reloadDataWithInvocation:invocation];
- }
-}
-
-- (void) reloadData {
- [self reloadDataWithInvocation:nil];
-}
-
- (void) resolve {
pkgProblemResolver *resolver = [database_ resolver];
}
}
+- (void) perform_ {
+ [database_ perform];
+ [self performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:YES];
+}
+
- (void) confirmWithNavigationController:(UINavigationController *)navigation {
Queuing_ = false;
++locked_;
- [self detachNewProgressSelector:@selector(perform) toTarget:database_ forController:navigation title:@"RUNNING"];
+ [self detachNewProgressSelector:@selector(perform_) toTarget:self forController:navigation title:@"RUNNING"];
--locked_;
- [self complete];
}
- (void) showSettings {
} else if ([context isEqualToString:@"fixhalf"]) {
if (button == [alert cancelButtonIndex]) {
@synchronized (self) {
- for (Package *broken in broken_) {
+ for (Package *broken in (id) broken_) {
[broken remove];
NSString *id = [broken id];
} else if ([context isEqualToString:@"upgrade"]) {
if (button == [alert firstOtherButtonIndex]) {
@synchronized (self) {
- for (Package *essential in essential_)
+ for (Package *essential in (id) essential_)
[essential install];
[self resolve];
}
}
-- (void) system:(NSString *)command { _pooled
+- (void) system:(NSString *)command {
+ NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+
_trace();
system([command UTF8String]);
_trace();
+
+ [pool release];
}
- (void) applicationWillSuspend {
- (void) applicationOpenURL:(NSURL *)url {
[super applicationOpenURL:url];
- if (!loaded_) starturl_ = [url retain];
- else [self openCydiaURL:url forExternal:YES];
+ if (!loaded_)
+ starturl_ = url;
+ else
+ [self openCydiaURL:url forExternal:YES];
}
- (void) applicationWillResignActive:(UIApplication *)application {
- (void) addStashController {
++locked_;
- stash_ = [[StashController alloc] init];
+ stash_ = [[[StashController alloc] init] autorelease];
[window_ addSubview:[stash_ view]];
}
- (void) removeStashController {
[[stash_ view] removeFromSuperview];
- [stash_ release];
+ stash_ = nil;
--locked_;
}
}
- (void) setupViewControllers {
- tabbar_ = [[CYTabBarController alloc] initWithDatabase:database_];
+ tabbar_ = [[[CYTabBarController alloc] initWithDatabase:database_] autorelease];
NSMutableArray *items([NSMutableArray arrayWithObjects:
[[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home.png"] tag:0] autorelease],
// this would disallow http{,s} URLs from accessing this data
//[WebView registerURLSchemeAsLocal:@"cydia"];
- Font12_ = [[UIFont systemFontOfSize:12] retain];
- Font12Bold_ = [[UIFont boldSystemFontOfSize:12] retain];
- Font14_ = [[UIFont systemFontOfSize:14] retain];
- Font18Bold_ = [[UIFont boldSystemFontOfSize:18] retain];
- Font22Bold_ = [[UIFont boldSystemFontOfSize:22] retain];
+ Font12_ = [UIFont systemFontOfSize:12];
+ Font12Bold_ = [UIFont boldSystemFontOfSize:12];
+ Font14_ = [UIFont systemFontOfSize:14];
+ Font18Bold_ = [UIFont boldSystemFontOfSize:18];
+ Font22Bold_ = [UIFont boldSystemFontOfSize:22];
- essential_ = [[NSMutableArray alloc] initWithCapacity:4];
- broken_ = [[NSMutableArray alloc] initWithCapacity:4];
+ essential_ = [NSMutableArray arrayWithCapacity:4];
+ broken_ = [NSMutableArray arrayWithCapacity:4];
// XXX: I really need this thing... like, seriously... I'm sorry
[[[CydiaWebViewController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/appcache/", UI_]]] reloadData];
- window_ = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+ window_ = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
[window_ orderFront:self];
[window_ makeKey:self];
[window_ setHidden:NO];
[window_ setUserInteractionEnabled:NO];
[self setupViewControllers];
- emulated_ = [[CYEmulatedLoadingController alloc] initWithDatabase:database_];
+ emulated_ = [[[CydiaLoadingViewController alloc] init] autorelease];
[window_ addSubview:[emulated_ view]];
[self performSelector:@selector(loadData) withObject:nil afterDelay:0];
// (Try to) show the startup URL.
if (starturl_ != nil) {
[self openCydiaURL:starturl_ forExternal:NO];
- [starturl_ release];
starturl_ = nil;
}
}
NSMutableURLRequest *copy([request mutableCopy]);
NSURL *url([copy URL]);
+
+ NSString *href([url absoluteString]);
NSString *host([url host]);
NSString *scheme([[url scheme] lowercaseString]);
if ([copy respondsToSelector:@selector(setHTTPShouldUsePipelining:)])
if ([PipelinedHosts_ containsObject:host] || [PipelinedHosts_ containsObject:compound])
[copy setHTTPShouldUsePipelining:YES];
+
+ if (NSString *control = [copy valueForHTTPHeaderField:@"Cache-Control"])
+ if ([control isEqualToString:@"max-age=0"])
+ if ([CachedURLs_ containsObject:href]) {
+#if !ForRelease
+ NSLog(@"~~~: %@", href);
+#endif
+
+ [copy setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
+
+ [copy setValue:nil forHTTPHeaderField:@"Cache-Control"];
+ [copy setValue:nil forHTTPHeaderField:@"If-Modified-Since"];
+ [copy setValue:nil forHTTPHeaderField:@"If-None-Match"];
+ }
}
if ((self = _NSURLConnection$init$(self, _cmd, copy, delegate, usesCache, maxContentLength, startImmediately, connectionProperties)) != nil) {
} return self;
}
-int main(int argc, char *argv[]) { _pooled
+int main(int argc, char *argv[]) {
+ NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+
_trace();
UpdateExternalStatus(0);
NSLog(@"unknown UIUserInterfaceIdiom!");
}
- SessionData_ = [[NSMutableDictionary alloc] initWithCapacity:4];
+ SessionData_ = [NSMutableDictionary dictionaryWithCapacity:4];
- HostConfig_ = [[NSObject alloc] init];
+ HostConfig_ = [[[NSObject alloc] init] autorelease];
@synchronized (HostConfig_) {
BridgedHosts_ = [NSMutableSet setWithCapacity:4];
+ TokenHosts_ = [NSMutableSet setWithCapacity:4];
+ InsecureHosts_ = [NSMutableSet setWithCapacity:4];
PipelinedHosts_ = [NSMutableSet setWithCapacity:4];
+ CachedURLs_ = [NSMutableSet setWithCapacity:32];
}
UI_ = CydiaURL([NSString stringWithFormat:@"ui/ios~%@", Idiom_]);
else
Machine_ = machine;
- SerialNumber_ = CYIOGetValue("IOService:/", @"IOPlatformSerialNumber");
- ChipID_ = CYHex(CYIOGetValue("IODeviceTree:/chosen", @"unique-chip-id"), true, true);
- BBSNum_ = CYHex(CYIOGetValue("IOService:/AppleARMPE/baseband", @"snum"), false, false);
+ SerialNumber_ = (NSString *) CYIOGetValue("IOService:/", @"IOPlatformSerialNumber");
+ ChipID_ = [CYHex((NSData *) CYIOGetValue("IODeviceTree:/chosen", @"unique-chip-id"), true) uppercaseString];
+ BBSNum_ = CYHex((NSData *) CYIOGetValue("IOService:/AppleARMPE/baseband", @"snum"), false);
UniqueID_ = [[UIDevice currentDevice] uniqueIdentifier];
CGColorSpaceRelease(space_);
CFRelease(Locale_);
+ [pool release];
return value;
}
projects / cydia.git / blobdiff