X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/e733869b7e6cd1c961ba58c9ec8137beefc1b3d7..3736ff65d8e3dbe7398a30b8cadf489f7fefde5f:/MobileCydia.mm diff --git a/MobileCydia.mm b/MobileCydia.mm index b849f5ec..d6adebab 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -118,6 +118,8 @@ extern "C" { #include #include +#include + #include "UICaboodle/BrowserView.h" #include "substrate.h" @@ -202,6 +204,15 @@ void PrintTimes() { while (false); \ [_pool release]; +// Hash Functions/Structures {{{ +extern "C" uint32_t hashlittle(const void *key, size_t length, uint32_t initval = 0); + +union SplitHash { + uint32_t u32; + uint16_t u16[2]; +}; +// }}} + static const NSUInteger UIViewAutoresizingFlexibleBoth(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight); void NSLogPoint(const char *fix, const CGPoint &point) { @@ -755,17 +766,24 @@ class CYString { cache_ = reinterpret_cast(CFRetain(rhs.cache_)); } + void copy(apr_pool_t *pool) { + char *temp(reinterpret_cast(apr_palloc(pool, size_ + 1))); + memcpy(temp, data_, size_); + temp[size_] = '\0'; + data_ = temp; + } + void set(apr_pool_t *pool, const char *data, size_t size) { if (size == 0) clear(); else { clear_(); - char *temp(reinterpret_cast(apr_palloc(pool, size + 1))); - memcpy(temp, data, size); - temp[size] = '\0'; - data_ = temp; + data_ = const_cast(data); size_ = size; + + if (pool != NULL) + copy(pool); } } @@ -790,6 +808,10 @@ class CYString { _finline operator id() { return (NSString *) static_cast(*this); } + + _finline operator const char *() { + return reinterpret_cast(data_); + } }; /* }}} */ /* C++ NSString Algorithm Adapters {{{ */ @@ -1050,7 +1072,7 @@ static _transient NSMutableDictionary *Packages_; static _transient NSMutableDictionary *Sections_; static _transient NSMutableDictionary *Sources_; static bool Changed_; -static NSDate *now_; +static time_t now_; static bool IsWildcat_; /* }}} */ @@ -1079,9 +1101,7 @@ NSString *SizeString(double size) { static _finline const char *StripVersion_(const char *version) { const char *colon(strchr(version, ':')); - if (colon != NULL) - version = colon + 1; - return version; + return colon == NULL ? version : colon + 1; } NSString *LocalizeSection(NSString *section) { @@ -1406,6 +1426,101 @@ typedef std::map< unsigned long, _H > SourceMap; @end /* }}} */ +// Cytore Definitions {{{ +struct PackageValue : + Cytore::Block +{ + Cytore::Offset next_; + + uint32_t index_ : 23; + uint32_t subscribed_ : 1; + uint32_t : 8; + + int32_t first_; + int32_t last_; + + uint16_t vhash_; + uint16_t nhash_; + + char version_[8]; + char name_[]; +}; + +struct MetaValue : + Cytore::Block +{ + Cytore::Offset packages_[1 << 16]; +}; + +static Cytore::File MetaFile_; +// }}} +// Cytore Helper Functions {{{ +static PackageValue *PackageFind(const char *name, size_t length) { + SplitHash nhash = { hashlittle(name, length) }; + + PackageValue *metadata; + + Cytore::Offset *offset(&MetaFile_->packages_[nhash.u16[0]]); + offset: if (offset->IsNull()) { + *offset = MetaFile_.New(length + 1); + metadata = &MetaFile_.Get(*offset); + + memcpy(metadata->name_, name, length + 1); + metadata->nhash_ = nhash.u16[1]; + } else { + metadata = &MetaFile_.Get(*offset); + + if (metadata->nhash_ != nhash.u16[1] || strncmp(metadata->name_, name, length + 1) != 0) { + offset = &metadata->next_; + goto offset; + } + } + + return metadata; +} + +static void PackageImport(const void *key, const void *value, void *context) { + char buffer[1024]; + if (!CFStringGetCString((CFStringRef) key, buffer, sizeof(buffer), kCFStringEncodingUTF8)) { + NSLog(@"failed to import package %@", key); + return; + } + + PackageValue *metadata(PackageFind(buffer, strlen(buffer))); + NSDictionary *package((NSDictionary *) value); + + if (NSNumber *subscribed = [package objectForKey:@"IsSubscribed"]) + if ([subscribed boolValue]) + metadata->subscribed_ = true; + + if (NSDate *date = [package objectForKey:@"FirstSeen"]) { + time_t time([date timeIntervalSince1970]); + if (metadata->first_ > time || metadata->first_ == 0) + metadata->first_ = time; + } + + if (NSDate *date = [package objectForKey:@"LastSeen"]) { + time_t time([date timeIntervalSince1970]); + if (metadata->last_ < time || metadata->last_ == 0) { + metadata->last_ = time; + goto last; + } + } else if (metadata->last_ == 0) last: { + NSString *version([package objectForKey:@"LastVersion"]); + if (CFStringGetCString((CFStringRef) version, buffer, sizeof(buffer), kCFStringEncodingUTF8)) { + size_t length(strlen(buffer)); + uint16_t vhash(hashlittle(buffer, length)); + + size_t capped(std::min(8, length)); + char *latest(buffer + length - capped); + + strncpy(metadata->version_, latest, sizeof(metadata->version_)); + metadata->vhash_ = vhash; + } + } +} +// }}} + /* Source Class {{{ */ @interface Source : NSObject { CYString depiction_; @@ -1693,48 +1808,51 @@ typedef std::map< unsigned long, _H > SourceMap; @end /* }}} */ /* Package Class {{{ */ +struct ParsedPackage { + CYString tagline_; + + CYString icon_; + + CYString depiction_; + CYString homepage_; + + CYString sponsor_; + CYString author_; + + CYString bugs_; + CYString support_; +}; + @interface Package : NSObject { - unsigned era_; + uint32_t era_ : 29; + uint32_t essential_ : 1; + uint32_t obsolete_ : 1; + uint32_t ignored_ : 1; + apr_pool_t *pool_; + _transient Database *database_; + pkgCache::VerIterator version_; pkgCache::PkgIterator iterator_; - _transient Database *database_; pkgCache::VerFileIterator file_; - Source *source_; - bool parsed_; - - CYString section_; - _transient NSString *section$_; - bool essential_; - bool obsolete_; + CYString id_; + CYString name_; - NSString *latest_; + CYString latest_; CYString installed_; - CYString id_; - CYString name_; - CYString tagline_; - CYString icon_; - CYString depiction_; - CYString homepage_; + CYString section_; + _transient NSString *section$_; - CYString sponsor_; - Address *sponsor$_; + Source *source_; - CYString author_; - Address *author$_; + PackageValue *metadata_; + ParsedPackage *parsed_; - CYString bugs_; - CYString support_; NSMutableArray *tags_; NSString *role_; - - NSMutableDictionary *metadata_; - _transient NSDate *firstSeen_; - _transient NSDate *lastSeen_; - bool subscribed_; } - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database; @@ -1757,9 +1875,12 @@ typedef std::map< unsigned long, _H > SourceMap; - (NSString *) shortDescription; - (unichar) index; -- (NSMutableDictionary *) metadata; -- (NSDate *) seen; -- (BOOL) subscribed; +- (PackageValue *) metadata; +- (time_t) seen; + +- (bool) subscribed; +- (bool) setSubscribed:(bool)subscribed; + - (BOOL) ignored; - (NSString *) latest; @@ -1803,6 +1924,8 @@ typedef std::map< unsigned long, _H > SourceMap; - (NSArray *) purposes; - (bool) isCommercial; +- (void) setIndex:(size_t)index; + - (CYString &) cyname; - (uint32_t) compareBySection:(NSArray *)sections; @@ -1837,7 +1960,7 @@ uint32_t PackageChangesRadix(Package *self, void *) { value.bits.ignored = [self ignored] ? 0 : 1; value.bits.upgradable = 1; } else { - value.bits.timestamp = static_cast([[self seen] timeIntervalSince1970]) >> 2; + value.bits.timestamp = [self seen] >> 2; value.bits.ignored = 0; value.bits.upgradable = 0; } @@ -1955,24 +2078,17 @@ struct PackageNameOrdering : } - (void) dealloc { + if (parsed_ != NULL) + delete parsed_; + if (source_ != nil) [source_ release]; - if (latest_ != nil) - [latest_ release]; - - if (sponsor$_ != nil) - [sponsor$_ release]; - if (author$_ != nil) - [author$_ release]; if (tags_ != nil) [tags_ release]; if (role_ != nil) [role_ release]; - if (metadata_ != nil) - [metadata_ release]; - [super dealloc]; } @@ -2000,12 +2116,15 @@ struct PackageNameOrdering : } - (void) parse { - if (parsed_) + if (parsed_ != NULL) return; - parsed_ = true; - if (file_.end()) +@synchronized (database_) { + if ([database_ era] != era_ || file_.end()) return; + ParsedPackage *parsed(new ParsedPackage); + parsed_ = parsed; + _profile(Package$parse) pkgRecords::Parser *parser; @@ -2020,14 +2139,14 @@ struct PackageNameOrdering : const char *name_; CYString *value_; } names[] = { - {"icon", &icon_}, - {"depiction", &depiction_}, - {"homepage", &homepage_}, + {"icon", &parsed->icon_}, + {"depiction", &parsed->depiction_}, + {"homepage", &parsed->homepage_}, {"website", &website}, - {"bugs", &bugs_}, - {"support", &support_}, - {"sponsor", &sponsor_}, - {"author", &author_}, + {"bugs", &parsed->bugs_}, + {"support", &parsed->support_}, + {"sponsor", &parsed->sponsor_}, + {"author", &parsed->author_}, }; for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i) { @@ -2050,44 +2169,33 @@ struct PackageNameOrdering : stop = end; while (stop != start && stop[-1] == '\r') --stop; - tagline_.set(pool_, start, stop - start); + parsed->tagline_.set(pool_, start, stop - start); } _end _profile(Package$parse$Retain) - if (homepage_.empty()) - homepage_ = website; - if (homepage_ == depiction_) - homepage_.clear(); + if (parsed->homepage_.empty()) + parsed->homepage_ = website; + if (parsed->homepage_ == parsed->depiction_) + parsed->homepage_.clear(); _end _end -} +} } - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database { if ((self = [super init]) != nil) { _profile(Package$initWithVersion) - era_ = [database era]; pool_ = pool; - version_ = version; - - _profile(Package$initWithVersion$ParentPkg) - iterator_ = version.ParentPkg(); - _end - database_ = database; + era_ = [database era]; - _profile(Package$initWithVersion$Latest) - const char *latest(StripVersion_(version_.VerStr())); - latest_ = (NSString *) CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast(latest), strlen(latest), kCFStringEncodingASCII, NO); - _end + version_ = version; - pkgCache::VerIterator current; - _profile(Package$initWithVersion$Versions) - current = iterator_.CurrentVer(); - if (!current.end()) - installed_.set(pool_, StripVersion_(current.VerStr())); + pkgCache::PkgIterator iterator(version.ParentPkg()); + iterator_ = iterator; + _profile(Package$initWithVersion$Version) if (!version_.end()) file_ = version_.FileList(); else { @@ -2096,87 +2204,83 @@ struct PackageNameOrdering : } _end - _profile(Package$initWithVersion$Name) - id_.set(pool_, iterator_.Name()); - name_.set(pool, iterator_.Display()); + _profile(Package$initWithVersion$Cache) + id_.set(NULL, iterator.Name()); + name_.set(NULL, iterator.Display()); + + latest_.set(NULL, StripVersion_(version_.VerStr())); + + pkgCache::VerIterator current(iterator.CurrentVer()); + if (!current.end()) + installed_.set(NULL, StripVersion_(current.VerStr())); _end - _profile(Package$initWithVersion$lowercaseString) + _profile(Package$initWithVersion$Lower) + // XXX: do not use tolower() as this is not locale-specific? :( char *data(id_.data()); for (size_t i(0), e(id_.size()); i != e; ++i) - // XXX: do not use tolower() as this is not locale-specific? :( - data[i] |= 0x20; + if ((data[i] & 0x20) == 0) { + id_.copy(pool); + data = id_.data(); + for (; i != e; ++i) + data[i] |= 0x20; + break; + } _end _profile(Package$initWithVersion$Tags) - pkgCache::TagIterator tag(iterator_.TagList()); + pkgCache::TagIterator tag(iterator.TagList()); if (!tag.end()) { tags_ = [[NSMutableArray alloc] initWithCapacity:8]; do { const char *name(tag.Name()); [tags_ addObject:[(NSString *)CYStringCreate(name) autorelease]]; + if (role_ == nil && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/) role_ = (NSString *) CYStringCreate(name + 6); + + if (strncmp(name, "cydia::", 7) == 0) { + if (strcmp(name + 7, "essential") == 0) + essential_ = true; + else if (strcmp(name + 7, "obsolete") == 0) + obsolete_ = true; + } + ++tag; } while (!tag.end()); } _end - bool changed(false); - _profile(Package$initWithVersion$Metadata) - metadata_ = [Packages_ objectForKey:id_]; - - if (metadata_ == nil) { - firstSeen_ = now_; - - metadata_ = [[NSMutableDictionary dictionaryWithObjectsAndKeys: - firstSeen_, @"FirstSeen", - latest_, @"LastVersion", - nil] mutableCopy]; + PackageValue *metadata(PackageFind(id_.data(), id_.size())); + metadata_ = metadata; - changed = true; - } else { - firstSeen_ = [metadata_ objectForKey:@"FirstSeen"]; - lastSeen_ = [metadata_ objectForKey:@"LastSeen"]; + const char *latest(version_.VerStr()); + size_t length(strlen(latest)); - if (NSNumber *subscribed = [metadata_ objectForKey:@"IsSubscribed"]) - subscribed_ = [subscribed boolValue]; - - NSString *version([metadata_ objectForKey:@"LastVersion"]); - - if (firstSeen_ == nil) { - firstSeen_ = lastSeen_ == nil ? now_ : lastSeen_; - [metadata_ setObject:firstSeen_ forKey:@"FirstSeen"]; - changed = true; - } + uint16_t vhash(hashlittle(latest, length)); - if (version == nil) { - [metadata_ setObject:latest_ forKey:@"LastVersion"]; - changed = true; - } else if (![version isEqualToString:latest_]) { - [metadata_ setObject:latest_ forKey:@"LastVersion"]; - lastSeen_ = now_; - [metadata_ setObject:lastSeen_ forKey:@"LastSeen"]; - changed = true; - } - } + size_t capped(std::min(8, length)); + latest = latest + length - capped; - metadata_ = [metadata_ retain]; + if (metadata->first_ == 0) + metadata->first_ = now_; - if (changed) { - [Packages_ setObject:metadata_ forKey:id_]; - Changed_ = true; - } + if (metadata->vhash_ != vhash || strncmp(metadata->version_, latest, sizeof(metadata->version_)) != 0) { + metadata->last_ = now_; + strncpy(metadata->version_, latest, sizeof(metadata->version_)); + metadata->vhash_ = vhash; + } else if (metadata->last_ == 0) + metadata->last_ = metadata->first_; _end _profile(Package$initWithVersion$Section) - section_.set(pool_, iterator_.Section()); + section_.set(NULL, iterator.Section()); _end - _profile(Package$initWithVersion$hasTag) - obsolete_ = [self hasTag:@"cydia::obsolete"]; - essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"]; + _profile(Package$initWithVersion$Flags) + essential_ |= ((iterator->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES); + ignored_ = iterator->SelectedState == pkgCache::State::Hold; _end _end } return self; } @@ -2191,12 +2295,26 @@ struct PackageNameOrdering : if (version.end()) return nil; - return [[[Package alloc] - initWithVersion:version - withZone:zone - inPool:pool - database:database - ] autorelease]; + Package *package; + + _profile(Package$packageWithIterator$Allocate) + package = [Package allocWithZone:zone]; + _end + + _profile(Package$packageWithIterator$Initialize) + package = [package + initWithVersion:version + withZone:zone + inPool:pool + database:database + ]; + _end + + _profile(Package$packageWithIterator$Autorelease) + package = [package autorelease]; + _end + + return package; } - (pkgCache::PkgIterator) iterator { @@ -2285,7 +2403,7 @@ struct PackageNameOrdering : } } - (NSString *) shortDescription { - return tagline_; + return parsed_ == NULL ? nil : static_cast(parsed_->tagline_); } - (unichar) index { @@ -2300,26 +2418,29 @@ struct PackageNameOrdering : _end } -- (NSMutableDictionary *) metadata { +- (PackageValue *) metadata { return metadata_; } -- (NSDate *) seen { - if (subscribed_ && lastSeen_ != nil) - return lastSeen_; - return firstSeen_; +- (time_t) seen { + PackageValue *metadata([self metadata]); + return metadata->subscribed_ ? metadata->last_ : metadata->first_; } -- (BOOL) subscribed { - return subscribed_; +- (bool) subscribed { + return [self metadata]->subscribed_; } -- (BOOL) ignored { - NSDictionary *metadata([self metadata]); - if (NSNumber *ignored = [metadata objectForKey:@"IsIgnored"]) - return [ignored boolValue]; - else +- (bool) setSubscribed:(bool)subscribed { + PackageValue *metadata([self metadata]); + if (metadata->subscribed_ == subscribed) return false; + metadata->subscribed_ = subscribed; + return true; +} + +- (BOOL) ignored { + return ignored_; } - (NSString *) latest { @@ -2448,10 +2569,11 @@ struct PackageNameOrdering : NSString *section = [self simpleSection]; UIImage *icon(nil); - if (!icon_.empty()) - if ([static_cast(icon_) hasPrefix:@"file:///"]) - // XXX: correct escaping - icon = [UIImage imageAtPath:[static_cast(icon_) substringFromIndex:7]]; + if (parsed_ != NULL) + if (NSString *href = parsed_->icon_) + if ([href hasPrefix:@"file:///"]) + // XXX: correct escaping + icon = [UIImage imageAtPath:[href substringFromIndex:7]]; if (icon == nil) if (section != nil) icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]]; if (icon == nil) if (Source *source = [self source]) if (NSString *dicon = [source defaultIcon]) @@ -2464,31 +2586,23 @@ struct PackageNameOrdering : } - (NSString *) homepage { - return homepage_; + return parsed_ == NULL ? nil : static_cast(parsed_->homepage_); } - (NSString *) depiction { - return !depiction_.empty() ? depiction_ : [[self source] depictionForPackage:id_]; + return parsed_ != NULL && !parsed_->depiction_.empty() ? parsed_->depiction_ : [[self source] depictionForPackage:id_]; } - (Address *) sponsor { - if (sponsor$_ == nil) { - if (sponsor_.empty()) - return nil; - sponsor$_ = [[Address addressWithString:sponsor_] retain]; - } return sponsor$_; + return parsed_ == NULL || parsed_->sponsor_.empty() ? nil : [Address addressWithString:parsed_->sponsor_]; } - (Address *) author { - if (author$_ == nil) { - if (author_.empty()) - return nil; - author$_ = [[Address addressWithString:author_] retain]; - } return author$_; + return parsed_ == NULL || parsed_->author_.empty() ? nil : [Address addressWithString:parsed_->author_]; } - (NSString *) support { - return !bugs_.empty() ? bugs_ : [[self source] supportForPackage:id_]; + return parsed_ != NULL && !parsed_->bugs_.empty() ? parsed_->bugs_ : [[self source] supportForPackage:id_]; } - (NSArray *) files { @@ -2670,6 +2784,11 @@ struct PackageNameOrdering : return [self hasTag:@"cydia::commercial"]; } +- (void) setIndex:(size_t)index { + if (metadata_->index_ != index) + metadata_->index_ = index; +} + - (CYString &) cyname { return name_.empty() ? id_ : name_; } @@ -3231,11 +3350,6 @@ static NSString *Warning_; delete policy_; policy_ = NULL; - if (now_ != nil) { - [now_ release]; - now_ = nil; - } - cache_.Close(); apr_pool_clear(pool_); @@ -3272,7 +3386,7 @@ static NSString *Warning_; unlink("/tmp/cydia.chk"); - now_ = [[NSDate date] retain]; + now_ = [[NSDate date] timeIntervalSince1970]; policy_ = new pkgDepCache::Policy(); records_ = new pkgRecords(cache_); @@ -3358,6 +3472,12 @@ static NSString *Warning_; //[packages_ sortUsingFunction:reinterpret_cast(&PackageNameCompare) context:NULL]; _trace(); + + size_t count(CFArrayGetCount(packages_)); + for (size_t index(0); index != count; ++index) + [(Package *) CFArrayGetValueAtIndex(packages_, index) setIndex:index]; + + _trace(); } } } CYPoolEnd() _trace(); } @@ -3678,7 +3798,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (NSArray *) getInstalledPackages { NSArray *packages([[Database sharedInstance] packages]); - NSMutableArray *installed([NSMutableArray arrayWithCapacity:[packages count]]); + NSMutableArray *installed([NSMutableArray arrayWithCapacity:1024]); for (Package *package in packages) if ([package installed] != nil) [installed addObject:package]; @@ -4879,14 +4999,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) onSwitch:(id)sender { - NSMutableDictionary *metadata = [Sections_ objectForKey:basic_]; + NSMutableDictionary *metadata([Sections_ objectForKey:basic_]); if (metadata == nil) { metadata = [NSMutableDictionary dictionaryWithCapacity:2]; [Sections_ setObject:metadata forKey:basic_]; } - Changed_ = true; [metadata setObject:[NSNumber numberWithBool:([switch_ isOn] == NO)] forKey:@"Hidden"]; + Changed_ = true; } - (void) setSection:(Section *)section editing:(BOOL)editing { @@ -7020,9 +7140,9 @@ freeing the view controllers on tab change */ #endif Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease]; - Section *ignored = [[[Section alloc] initWithName:UCLocalize("IGNORED_UPGRADES") localize:NO] autorelease]; + Section *ignored = nil; Section *section = nil; - NSDate *last = nil; + time_t last = 0; upgrades_ = 0; bool unseens = false; @@ -7036,22 +7156,14 @@ freeing the view controllers on tab change */ if (!uae) { unseens = true; - NSDate *seen; - - _profile(ChangesController$reloadData$Remember) - seen = [package seen]; - _end + time_t seen([package seen]); - if (section == nil || last != seen && (seen == nil || [seen compare:last] != NSOrderedSame)) { + if (section == nil || last != seen) { last = seen; NSString *name; - if (seen == nil) - name = UCLocalize("UNKNOWN"); - else { - name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen); - [name autorelease]; - } + name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) [NSDate dateWithTimeIntervalSince1970:seen]); + [name autorelease]; _profile(ChangesController$reloadData$Allocate) name = [NSString stringWithFormat:UCLocalize("NEW_AT"), name]; @@ -7061,9 +7173,12 @@ freeing the view controllers on tab change */ } [section addToCount]; - } else if ([package ignored]) + } else if ([package ignored]) { + if (ignored == nil) { + ignored = [[[Section alloc] initWithName:UCLocalize("IGNORED_UPGRADES") row:offset localize:NO] autorelease]; + } [ignored addToCount]; - else { + } else { ++upgrades_; [upgradable addToCount]; } @@ -7218,38 +7333,23 @@ freeing the view controllers on tab change */ if (package_ == nil) return 0; - return 1; + return 2; } - (NSString *) tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section { return UCLocalize("SHOW_ALL_CHANGES_EX"); } -- (void) onSomething:(BOOL)value withKey:(NSString *)key { +- (void) onSubscribed:(id)control { + bool value([control isOn]); if (package_ == nil) return; - - NSMutableDictionary *metadata([package_ metadata]); - - BOOL before; - if (NSNumber *number = [metadata objectForKey:key]) - before = [number boolValue]; - else - before = NO; - - if (value != before) { - [metadata setObject:[NSNumber numberWithBool:value] forKey:key]; - Changed_ = true; + if ([package_ setSubscribed:value]) [delegate_ updateData]; - } -} - -- (void) onSubscribed:(id)control { - [self onSomething:(int) [control isOn] withKey:@"IsSubscribed"]; } - (void) onIgnored:(id)control { - [self onSomething:(int) [control isOn] withKey:@"IsIgnored"]; + // TODO: set Held state - possibly call out to dpkg, etc. } - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { @@ -7458,7 +7558,6 @@ freeing the view controllers on tab change */ nil]; [Metadata_ setObject:Settings_ forKey:@"Settings"]; - Changed_ = true; if (rolling) @@ -7890,9 +7989,8 @@ typedef enum { Database *database_; int tag_; - - UIKeyboard *keyboard_; - int huds_; + int hudcount_; + NSURL *starturl_; SectionsController *sections_; ChangesController *changes_; @@ -7962,21 +8060,24 @@ static _finline void _setHomePage(Cydia *self) { } - (void) _saveConfig { + _trace(); + MetaFile_.Sync(); + _trace(); + if (Changed_) { - _trace(); NSString *error(nil); + if (NSData *data = [NSPropertyListSerialization dataFromPropertyList:Metadata_ format:NSPropertyListBinaryFormat_v1_0 errorDescription:&error]) { _trace(); NSError *error(nil); if (![data writeToFile:@"/var/lib/cydia/metadata.plist" options:NSAtomicWrite error:&error]) NSLog(@"failure to save metadata data: %@", error); _trace(); + + Changed_ = false; } else { NSLog(@"failure to serialize metadata: %@", error); - return; } - - Changed_ = false; } } @@ -8452,7 +8553,7 @@ static _finline void _setHomePage(Cydia *self) { } - (BOOL) hudIsShowing { - return (huds_ > 0); + return (hudcount_ > 0); } - (void) applicationSuspend:(__GSEvent *)event { @@ -8490,7 +8591,7 @@ static _finline void _setHomePage(Cydia *self) { while ([target modalViewController] != nil) target = [target modalViewController]; [[target view] addSubview:hud]; - huds_++; + hudcount_++; return hud; } @@ -8498,7 +8599,7 @@ static _finline void _setHomePage(Cydia *self) { [hud show:NO]; [hud removeFromSuperview]; [window_ setUserInteractionEnabled:YES]; - huds_--; + hudcount_--; } - (CYViewController *) pageForPackage:(NSString *)name { @@ -8562,14 +8663,26 @@ static _finline void _setHomePage(Cydia *self) { return nil; } -- (void) applicationOpenURL:(NSURL *)url { - [super applicationOpenURL:url]; - int tag; - if (CYViewController *page = [self pageForURL:url hasTag:&tag]) { +- (BOOL) openCydiaURL:(NSURL *)url { + CYViewController *page = nil; + int tag = 0; + + NSLog(@"open url: %@", url); + + if ((page = [self pageForURL:url hasTag:&tag])) { [self setPage:page]; tag_ = tag; [tabbar_ setSelectedViewController:(tag_ == -1 ? nil : [[tabbar_ viewControllers] objectAtIndex:tag_])]; } + + return !!page; +} + +- (void) applicationOpenURL:(NSURL *)url { + [super applicationOpenURL:url]; + NSLog(@"first: %@", url); + if (!loaded_) starturl_ = [url retain]; + else [self openCydiaURL:url]; } - (void) applicationWillResignActive:(UIApplication *)application { @@ -8641,6 +8754,7 @@ static _finline void _setHomePage(Cydia *self) { } - (void) applicationDidFinishLaunching:(id)unused { +_trace(); [CYBrowserController _initialize]; [NSURLProtocol registerClass:[CydiaURLProtocol class]]; @@ -8750,9 +8864,15 @@ _trace(); [self reloadData]; PrintTimes(); - // Show the home page - [tabbar_ setSelectedIndex:0]; - _setHomePage(self); + // Show the initial page + if (starturl_ == nil || ![self openCydiaURL:starturl_]) { + [tabbar_ setSelectedIndex:0]; + _setHomePage(self); + } + + [starturl_ release]; + starturl_ = nil; + [window_ setUserInteractionEnabled:YES]; // XXX: does this actually slow anything down? @@ -8997,11 +9117,6 @@ int main(int argc, char *argv[]) { _pooled if (Settings_ != nil) Role_ = [Settings_ objectForKey:@"Role"]; - if (Packages_ == nil) { - Packages_ = [[[NSMutableDictionary alloc] initWithCapacity:128] autorelease]; - [Metadata_ setObject:Packages_ forKey:@"Packages"]; - } - if (Sections_ == nil) { Sections_ = [[[NSMutableDictionary alloc] initWithCapacity:32] autorelease]; [Metadata_ setObject:Sections_ forKey:@"Sections"]; @@ -9013,6 +9128,18 @@ int main(int argc, char *argv[]) { _pooled } /* }}} */ + _trace(); + MetaFile_.Open("/var/lib/cydia/metadata.cb0"); + _trace(); + + if (Packages_ != nil) { + CFDictionaryApplyFunction((CFDictionaryRef) Packages_, &PackageImport, NULL); + _trace(); + [Metadata_ removeObjectForKey:@"Packages"]; + Packages_ = nil; + Changed_ = true; + } + Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil]; if (substrate && access("/Library/MobileSubstrate/DynamicLibraries/SimulatedKeyEvents.dylib", F_OK) == 0)