X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/81628115a7ac1ddd54abee383786a8bf9a0d6585..7d7000357dfc9fbba18cb60b3c4021d8db8351b1:/MobileCydia.mm diff --git a/MobileCydia.mm b/MobileCydia.mm index 8a9590d3..18737029 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -26,6 +26,9 @@ #include "CyteKit/UCPlatform.h" #include "CyteKit/Localize.h" +#include +#include + #include #include @@ -38,7 +41,6 @@ #include #endif -#include #include #include @@ -55,6 +57,7 @@ #include #include +#include #include #include @@ -112,6 +115,7 @@ extern "C" { #include "CyteKit/IndirectDelegate.h" #include "CyteKit/PerlCompatibleRegEx.hpp" #include "CyteKit/TableViewCell.h" +#include "CyteKit/TabBarController.h" #include "CyteKit/WebScriptObject-Cyte.h" #include "CyteKit/WebViewController.h" #include "CyteKit/WebViewTableViewCell.h" @@ -158,7 +162,7 @@ class ProfileTime { void Print() { if (total_ != 0) - std::cerr << std::setw(5) << count_ << ", " << std::setw(7) << total_ << " : " << name_ << std::endl; + std::cerr << std::setw(7) << count_ << ", " << std::setw(8) << total_ << " : " << name_ << std::endl; total_ = 0; count_ = 0; } @@ -204,7 +208,7 @@ extern NSString *Cydia_; #define ForRelease 1 #define TraceLogging (1 && !ForRelease) -#define HistogramInsertionSort (!ForRelease ? 0 : 0) +#define HistogramInsertionSort (0 && !ForRelease) #define ProfileTimes (0 && !ForRelease) #define ForSaurik (0 && !ForRelease) #define LogBrowser (0 && !ForRelease) @@ -212,7 +216,6 @@ extern NSString *Cydia_; #define ManualRefresh (1 && !ForRelease) #define ShowInternals (0 && !ForRelease) #define AlwaysReload (0 && !ForRelease) -#define TryIndexedCollation (0 && !ForRelease) #if !TraceLogging #undef _trace @@ -236,8 +239,6 @@ union SplitHash { }; // }}} -static bool ShowPromoted_; - static NSString *Colon_; NSString *Elision_; static NSString *Error_; @@ -245,8 +246,6 @@ static NSString *Warning_; static NSString *Cache_; -static bool AprilFools_; - static void (*$SBSSetInterceptsMenuButtonForever)(bool); static CFStringRef (*$MGCopyAnswer)(CFStringRef); @@ -317,7 +316,7 @@ static CGFloat CYStatusBarHeight() { /* 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; +static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareNumerically | kCFCompareWidthInsensitive | kCFCompareForcedOrdering; /* Insertion Sort {{{ */ @@ -708,6 +707,7 @@ static BOOL Ignored_; static _H Font12_; static _H Font12Bold_; static _H Font14_; +static _H Font18_; static _H Font18Bold_; static _H Font22Bold_; @@ -722,6 +722,56 @@ static _H UserAgent_; static _H Product_; static _H Safari_; +static _H CollationLocale_; +static _H CollationThumbs_; +static std::vector CollationOffset_; +static _H CollationTitles_; +static _H CollationStarts_; +static UTransliterator *CollationTransl_; +//static Function CollationModify_; + +typedef std::basic_string ustring; +static ustring CollationString_; + +#define CUC const ustring &str(*reinterpret_cast(rep)) +#define UC ustring &str(*reinterpret_cast(rep)) +static struct UReplaceableCallbacks CollationUCalls_ = { + .length = [](const UReplaceable *rep) -> int32_t { CUC; + return str.size(); + }, + + .charAt = [](const UReplaceable *rep, int32_t offset) -> UChar { CUC; + //fprintf(stderr, "charAt(%d) : %d\n", offset, str.size()); + if (offset >= str.size()) + return 0xffff; + return str[offset]; + }, + + .char32At = [](const UReplaceable *rep, int32_t offset) -> UChar32 { CUC; + //fprintf(stderr, "char32At(%d) : %d\n", offset, str.size()); + if (offset >= str.size()) + return 0xffff; + UChar32 c; + U16_GET(str.data(), 0, offset, str.size(), c); + return c; + }, + + .replace = [](UReplaceable *rep, int32_t start, int32_t limit, const UChar *text, int32_t length) -> void { UC; + //fprintf(stderr, "replace(%d, %d, %d) : %d\n", start, limit, length, str.size()); + str.replace(start, limit - start, text, length); + }, + + .extract = [](UReplaceable *rep, int32_t start, int32_t limit, UChar *dst) -> void { UC; + //fprintf(stderr, "extract(%d, %d) : %d\n", start, limit, str.size()); + str.copy(dst, limit - start, start); + }, + + .copy = [](UReplaceable *rep, int32_t start, int32_t limit, int32_t dest) -> void { UC; + //fprintf(stderr, "copy(%d, %d, %d) : %d\n", start, limit, dest, str.size()); + str.replace(dest, 0, str, start, limit - start); + }, +}; + static CFLocaleRef Locale_; static NSArray *Languages_; static CGColorSpaceRef space_; @@ -729,7 +779,6 @@ static CGColorSpaceRef space_; static NSDictionary *SectionMap_; static NSMutableDictionary *Metadata_; static _transient NSMutableDictionary *Settings_; -static _transient NSString *Role_; static _transient NSMutableDictionary *Packages_; static _transient NSMutableDictionary *Values_; static _transient NSMutableDictionary *Sections_; @@ -785,7 +834,7 @@ NSString *LocalizeSection(NSString *section) { NSString *Simplify(NSString *title) { const char *data = [title UTF8String]; - size_t size = [title length]; + size_t size = [title lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; static Pcre square_r("^\\[(.*)\\]$"); if (square_r(data, size)) @@ -866,6 +915,16 @@ static NSString *CYHex(NSData *data, bool reverse = false) { @class CYPackageController; +@protocol SourceDelegate +- (void) setFetch:(NSNumber *)fetch; +@end + +@protocol FetchDelegate +- (bool) isSourceCancelled; +- (void) startSourceFetch:(NSString *)uri; +- (void) stopSourceFetch:(NSString *)uri; +@end + @protocol CydiaDelegate - (void) returnToCydia; - (void) saveState; @@ -877,6 +936,7 @@ static NSString *CYHex(NSData *data, bool reverse = false) { - (void) removePackage:(Package *)package; - (void) beginUpdate; - (BOOL) updating; +- (bool) requestUpdate; - (void) distUpgrade; - (void) loadData; - (void) updateData; @@ -884,7 +944,6 @@ static NSString *CYHex(NSData *data, bool reverse = false) { - (void) syncData; - (void) addSource:(NSDictionary *)source; - (void) addTrivialSource:(NSString *)href; -- (void) showSettings; - (UIProgressHUD *) addProgressHUD; - (void) removeProgressHUD:(UIProgressHUD *)hud; - (void) showActionSheet:(UIActionSheet *)sheet fromItem:(UIBarButtonItem *)item; @@ -892,29 +951,19 @@ static NSString *CYHex(NSData *data, bool reverse = false) { @end /* }}} */ -/* Status Delegation {{{ */ -class Status : +/* CancelStatus {{{ */ +class CancelStatus : public pkgAcquireStatus { private: - _transient NSObject *delegate_; bool cancelled_; public: - Status() : - delegate_(nil), + CancelStatus() : cancelled_(false) { } - void setDelegate(NSObject *delegate) { - delegate_ = delegate; - } - - NSObject *getDelegate() const { - return delegate_; - } - virtual bool MediaChange(std::string media, std::string drive) { return false; } @@ -923,6 +972,39 @@ class Status : Done(item); } + virtual bool Pulse_(pkgAcquire *Owner) = 0; + + virtual bool Pulse(pkgAcquire *Owner) { + if (pkgAcquireStatus::Pulse(Owner) && Pulse_(Owner)) + return true; + else { + cancelled_ = true; + return false; + } + } + + _finline bool WasCancelled() const { + return cancelled_; + } +}; +/* }}} */ +/* DelegateStatus {{{ */ +class CydiaStatus : + public CancelStatus +{ + private: + _transient NSObject *delegate_; + + public: + CydiaStatus() : + delegate_(nil) + { + } + + void setDelegate(NSObject *delegate) { + delegate_ = delegate; + } + virtual void Fetch(pkgAcquire::ItemDesc &item) { NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]); CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithFormat:UCLocalize("DOWNLOADING_"), name] ofType:kCydiaProgressEventTypeStatus forItem:item]); @@ -950,9 +1032,7 @@ class Status : [delegate_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES]; } - virtual bool Pulse(pkgAcquire *Owner) { - bool value = pkgAcquireStatus::Pulse(Owner); - + virtual bool Pulse_(pkgAcquire *Owner) { double percent( double(CurrentBytes + CurrentItems) / double(TotalBytes + TotalItems) @@ -966,16 +1046,7 @@ class Status : [NSNumber numberWithDouble:CurrentCPS], @"Speed", nil] waitUntilDone:YES]; - if (value && ![delegate_ isProgressCancelled]) - return true; - else { - cancelled_ = true; - return false; - } - } - - _finline bool WasCancelled() const { - return cancelled_; + return ![delegate_ isProgressCancelled]; } virtual void Start() { @@ -1016,7 +1087,7 @@ typedef std::map< unsigned long, _H > SourceMap; _transient NSObject *delegate_; _transient NSObject *progress_; - Status status_; + CydiaStatus status_; int cydiafd_; int statusfd_; @@ -1053,7 +1124,7 @@ typedef std::map< unsigned long, _H > SourceMap; - (bool) upgrade; - (void) update; -- (void) updateWithStatus:(Status &)status; +- (void) updateWithStatus:(CancelStatus &)status; - (void) setDelegate:(NSObject *)delegate; @@ -1061,11 +1132,61 @@ typedef std::map< unsigned long, _H > SourceMap; - (NSObject *) progressDelegate; - (Source *) getSource:(pkgCache::PkgFileIterator)file; +- (void) setFetch:(bool)fetch forURI:(const char *)uri; +- (void) resetFetch; - (NSString *) mappedSectionForPointer:(const char *)pointer; @end /* }}} */ +/* SourceStatus {{{ */ +class SourceStatus : + public CancelStatus +{ + private: + _transient NSObject *delegate_; + _transient Database *database_; + + public: + SourceStatus(NSObject *delegate, Database *database) : + delegate_(delegate), + database_(database) + { + } + + void Set(bool fetch, pkgAcquire::ItemDesc &desc) { + desc.Owner->ID = 0; + [database_ setFetch:fetch forURI:desc.Owner->DescURI().c_str()]; + } + + virtual void Fetch(pkgAcquire::ItemDesc &desc) { + Set(true, desc); + } + + virtual void Done(pkgAcquire::ItemDesc &desc) { + Set(false, desc); + } + + virtual void Fail(pkgAcquire::ItemDesc &desc) { + Set(false, desc); + } + + virtual bool Pulse_(pkgAcquire *Owner) { + for (pkgAcquire::ItemCIterator item = Owner->ItemsBegin(); item != Owner->ItemsEnd(); ++item) + if ((*item)->ID != 0); + else if ((*item)->Status == pkgAcquire::Item::StatIdle) { + (*item)->ID = 1; + [database_ setFetch:true forURI:(*item)->DescURI().c_str()]; + } else (*item)->ID = 0; + return ![delegate_ isSourceCancelled]; + } + + virtual void Stop() { + pkgAcquireStatus::Stop(); + [database_ resetFetch]; + } +}; +/* }}} */ /* ProgressEvent Implementation {{{ */ @implementation CydiaProgressEvent @@ -1235,7 +1356,7 @@ static PackageValue *PackageFind(const char *name, size_t length, bool *fail = N PackageValue *metadata; Cytore::Offset *offset(&MetaFile_->packages_[nhash.u16[0]]); - offset: if (offset->IsNull()) { + for (;; offset = &metadata->next_) { if (offset->IsNull()) { *offset = MetaFile_.New(length + 1); metadata = &MetaFile_.Get(*offset); @@ -1247,16 +1368,18 @@ static PackageValue *PackageFind(const char *name, size_t length, bool *fail = N memset(metadata, 0, sizeof(*metadata)); } - memcpy(metadata->name_, name, length + 1); + memcpy(metadata->name_, name, length); + metadata->name_[length] = '\0'; 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; - } - } + if (metadata->nhash_ != nhash.u16[1]) + continue; + if (strncmp(metadata->name_, name, length) != 0) + continue; + if (metadata->name_[length] != '\0') + continue; + } break; } return metadata; } @@ -1330,6 +1453,10 @@ static void PackageImport(const void *key, const void *value, void *context) { _H record_; BOOL trusted_; + + std::set fetches_; + std::set files_; + _transient NSObject *delegate_; } - (Source *) initWithMetaIndex:(metaIndex *)index forDatabase:(Database *)database inPool:(apr_pool_t *)pool; @@ -1359,30 +1486,13 @@ static void PackageImport(const void *key, const void *value, void *context) { - (NSString *) defaultIcon; - (NSURL *) iconURL; +- (void) setFetch:(bool)fetch forURI:(const char *)uri; +- (void) resetFetch; + @end @implementation Source -- (void) _clear { - uri_.clear(); - distribution_.clear(); - type_.clear(); - - base_.clear(); - - description_.clear(); - label_.clear(); - origin_.clear(); - depiction_.clear(); - support_.clear(); - version_.clear(); - defaultIcon_.clear(); - - record_ = nil; - host_ = nil; - authority_ = nil; -} - + (NSString *) webScriptNameForSelector:(SEL)selector { if (false); else if (selector == @selector(addSection:)) @@ -1433,8 +1543,6 @@ static void PackageImport(const void *key, const void *value, void *context) { } - (void) setMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool { - [self _clear]; - trusted_ = index->IsTrusted(); uri_.set(pool, index->GetURI()); @@ -1443,7 +1551,25 @@ static void PackageImport(const void *key, const void *value, void *context) { debReleaseIndex *dindex(dynamic_cast(index)); if (dindex != NULL) { - base_.set(pool, dindex->MetaIndexURI("")); + std::string file(dindex->MetaIndexURI("")); + base_.set(pool, file); + + pkgAcquire acquire; + _profile(Source$setMetaIndex$GetIndexes) + dindex->GetIndexes(&acquire, true); + _end + _profile(Source$setMetaIndex$DescURI) + for (pkgAcquire::ItemIterator item(acquire.ItemsBegin()); item != acquire.ItemsEnd(); item++) { + std::string file((*item)->DescURI()); + files_.insert(file); + if (file.length() < sizeof("Packages.bz2") || file.substr(file.length() - sizeof("Packages.bz2")) != "/Packages.bz2") + continue; + file = file.substr(0, file.length() - 4); + files_.insert(file); + files_.insert(file + ".gz"); + files_.insert(file + "Index"); + } + _end FileFd fd; if (!fd.Open(dindex->MetaIndexFile("Release"), FileFd::ReadOnly)) @@ -1498,7 +1624,9 @@ static void PackageImport(const void *key, const void *value, void *context) { database_ = database; index_ = index; + _profile(Source$initWithMetaIndex$setMetaIndex) [self setMetaIndex:index inPool:pool]; + _end } return self; } @@ -1679,6 +1807,31 @@ static void PackageImport(const void *key, const void *value, void *context) { return defaultIcon_; } +- (void) setDelegate:(NSObject *)delegate { + delegate_ = delegate; +} + +- (bool) fetch { + return !fetches_.empty(); +} + +- (void) setFetch:(bool)fetch forURI:(const char *)uri { + if (!fetch) { + if (fetches_.erase(uri) == 0) + return; + } else if (files_.find(uri) == files_.end()) + return; + else if (!fetches_.insert(uri).second) + return; + + [delegate_ performSelectorOnMainThread:@selector(setFetch:) withObject:[NSNumber numberWithBool:[self fetch]] waitUntilDone:NO]; +} + +- (void) resetFetch { + fetches_.clear(); + [delegate_ performSelectorOnMainThread:@selector(setFetch:) withObject:[NSNumber numberWithBool:NO] waitUntilDone:NO]; +} + @end /* }}} */ /* CydiaOperation Class {{{ */ @@ -1854,7 +2007,7 @@ struct ParsedPackage { @interface Package : NSObject { uint32_t era_ : 25; - uint32_t role_ : 3; + @public uint32_t role_ : 3; uint32_t essential_ : 1; uint32_t obsolete_ : 1; uint32_t ignored_ : 1; @@ -1872,9 +2025,11 @@ struct ParsedPackage { CYString id_; CYString name_; + CYString transform_; CYString latest_; CYString installed_; + time_t updated_; const char *section_; _transient NSString *section$_; @@ -1950,7 +2105,6 @@ struct ParsedPackage { - (uint32_t) rank; - (BOOL) matches:(NSArray *)query; -- (bool) hasSupportingRole; - (BOOL) hasTag:(NSString *)tag; - (NSString *) primaryPurpose; - (NSArray *) purposes; @@ -1965,12 +2119,6 @@ struct ParsedPackage { - (void) install; - (void) remove; -- (bool) isUnfilteredAndSearchedForBy:(NSArray *)query; -- (bool) isUnfilteredAndSelectedForBy:(NSString *)search; -- (bool) isInstalledAndUnfiltered:(NSNumber *)number; -- (bool) isVisibleInSection:(NSString *)section; -- (bool) isVisibleInSource:(Source *)source; - @end uint32_t PackageChangesRadix(Package *self, void *) { @@ -2000,9 +2148,11 @@ uint32_t PackageChangesRadix(Package *self, void *) { return _not(uint32_t) - value.key; } +CYString &(*PackageName)(Package *self, SEL sel); + uint32_t PackagePrefixRadix(Package *self, void *context) { size_t offset(reinterpret_cast(context)); - CYString &name([self cyname]); + CYString &name(PackageName(self, @selector(cyname))); size_t size(name.size()); if (size == 0) @@ -2055,46 +2205,50 @@ uint32_t PackagePrefixRadix(Package *self, void *context) { return OSSwapInt32(*reinterpret_cast(data)); } -CYString &(*PackageName)(Package *self, SEL sel); - -CFComparisonResult PackageNameCompare(Package *lhs, Package *rhs, void *arg) { +CFComparisonResult StringNameCompare(CFStringRef lhn, CFStringRef rhn, size_t length) { _profile(PackageNameCompare) - CYString &lhi(PackageName(lhs, @selector(cyname))); - CYString &rhi(PackageName(rhs, @selector(cyname))); - CFStringRef lhn(lhi), rhn(rhi); - if (lhn == NULL) - return rhn == NULL ? NSOrderedSame : NSOrderedAscending; + return rhn == NULL ? kCFCompareEqualTo : kCFCompareLessThan; else if (rhn == NULL) - return NSOrderedDescending; + return kCFCompareGreaterThan; + + CFIndex length(CFStringGetLength(lhn)); _profile(PackageNameCompare$NumbersLast) - if (!lhi.empty() && !rhi.empty()) { + if (length != 0 && CFStringGetLength(rhn) != 0) { UniChar lhc(CFStringGetCharacterAtIndex(lhn, 0)); UniChar rhc(CFStringGetCharacterAtIndex(rhn, 0)); bool lha(CFUniCharIsMemberOf(lhc, kCFUniCharLetterCharacterSet)); if (lha != CFUniCharIsMemberOf(rhc, kCFUniCharLetterCharacterSet)) - return lha ? NSOrderedAscending : NSOrderedDescending; + return lha ? kCFCompareLessThan : kCFCompareGreaterThan; } _end - CFIndex length = CFStringGetLength(lhn); - _profile(PackageNameCompare$Compare) - return CFStringCompareWithOptionsAndLocale(lhn, rhn, CFRangeMake(0, length), LaxCompareFlags_, Locale_); + return CFStringCompareWithOptionsAndLocale(lhn, rhn, CFRangeMake(0, length), LaxCompareFlags_, (CFLocaleRef) (id) CollationLocale_); _end _end } -CFComparisonResult PackageNameCompare_(Package **lhs, Package **rhs, void *context) { - return PackageNameCompare(*lhs, *rhs, context); +_finline CFComparisonResult StringNameCompare(NSString *lhn, NSString*rhn, size_t length) { + return StringNameCompare((CFStringRef) lhn, (CFStringRef) rhn, length); +} + +CFComparisonResult PackageNameCompare(Package *lhs, Package *rhs, void *arg) { + CYString &lhn(PackageName(lhs, @selector(cyname))); + NSString *rhn(PackageName(rhs, @selector(cyname))); + return StringNameCompare(lhn, rhn, lhn.size()); +} + +CFComparisonResult PackageNameCompare_(Package **lhs, Package **rhs, void *arg) { + return PackageNameCompare(*lhs, *rhs, arg); } struct PackageNameOrdering : std::binary_function { _finline bool operator ()(Package *lhs, Package *rhs) const { - return PackageNameCompare(lhs, rhs, NULL) == NSOrderedAscending; + return PackageNameCompare(lhs, rhs, NULL) == kCFCompareLessThan; } }; @@ -2325,6 +2479,60 @@ struct PackageNameOrdering : installed_.set(NULL, StripVersion_(current.VerStr())); _end + _profile(Package$initWithVersion$Transliterate) do { + if (CollationTransl_ == NULL) + break; + if (name_.empty()) + break; + + _profile(Package$initWithVersion$Transliterate$utf8) + const uint8_t *data(reinterpret_cast(name_.data())); + for (size_t i(0), e(name_.size()); i != e; ++i) + if (data[i] >= 0x80) + goto extended; + break; extended:; + _end + + UErrorCode code(U_ZERO_ERROR); + int32_t length; + + _profile(Package$initWithVersion$Transliterate$u_strFromUTF8WithSub) + CollationString_.resize(name_.size()); + u_strFromUTF8WithSub(&CollationString_[0], CollationString_.size(), &length, name_.data(), name_.size(), 0xfffd, NULL, &code); + if (!U_SUCCESS(code)) + break; + CollationString_.resize(length); + _end + + _profile(Package$initWithVersion$Transliterate$utrans_trans) + length = CollationString_.size(); + utrans_trans(CollationTransl_, reinterpret_cast(&CollationString_), &CollationUCalls_, 0, &length, &code); + if (!U_SUCCESS(code)) + break; + _assert(CollationString_.size() == length); + _end + + _profile(Package$initWithVersion$Transliterate$u_strToUTF8WithSub$preflight) + u_strToUTF8WithSub(NULL, 0, &length, CollationString_.data(), CollationString_.size(), 0xfffd, NULL, &code); + if (code == U_BUFFER_OVERFLOW_ERROR) + code = U_ZERO_ERROR; + else if (!U_SUCCESS(code)) + break; + _end + + char *transform; + _profile(Package$initWithVersion$Transliterate$apr_palloc) + transform = static_cast(apr_palloc(pool_, length)); + _end + _profile(Package$initWithVersion$Transliterate$u_strToUTF8WithSub$transform) + u_strToUTF8WithSub(transform, length, NULL, CollationString_.data(), CollationString_.size(), 0xfffd, NULL, &code); + if (!U_SUCCESS(code)) + break; + _end + + transform_.set(NULL, transform, length); + } while (false); _end + _profile(Package$initWithVersion$Tags) pkgCache::TagIterator tag(iterator.TagList()); if (!tag.end()) { @@ -2364,13 +2572,21 @@ struct PackageNameOrdering : _profile(Package$initWithVersion$Metadata) const char *mixed(iterator.Name()); size_t size(strlen(mixed)); - char lower[size + 1]; + static const size_t prefix(sizeof("/var/lib/dpkg/info/") - 1); + char lower[prefix + size + 5 + 1]; for (size_t i(0); i != size; ++i) - lower[i] = mixed[i] | 0x20; - lower[size] = '\0'; + lower[prefix + i] = mixed[i] | 0x20; + + if (!installed_.empty()) { + memcpy(lower, "/var/lib/dpkg/info/", prefix); + memcpy(lower + prefix + size, ".list", 6); + struct stat info; + if (stat(lower, &info) != -1) + updated_ = info.st_birthtime; + } - PackageValue *metadata(PackageFind(lower, size)); + PackageValue *metadata(PackageFind(lower + prefix, size)); metadata_ = metadata; id_.set(NULL, metadata->name_, size); @@ -2626,8 +2842,8 @@ struct PackageNameOrdering : return false; _end - _profile(Package$unfiltered$hasSupportingRole) - if (_unlikely(![self hasSupportingRole])) + _profile(Package$unfiltered$role) + if (_unlikely(role_ > 3)) return false; _end @@ -2668,7 +2884,7 @@ struct PackageNameOrdering : - (BOOL) hasMode { @synchronized (database_) { if ([database_ era] != era_ || iterator_.end()) - return nil; + return NO; pkgDepCache::StateCache &state([database_ cache][iterator_]); return state.Mode != pkgDepCache::ModeKeep; @@ -2916,6 +3132,10 @@ struct PackageNameOrdering : return source_ == (Source *) [NSNull null] ? nil : source_; } +- (uint32_t) updated { + return std::numeric_limits::max() - updated_; +} + - (uint32_t) rank { return rank_; } @@ -2963,24 +3183,6 @@ struct PackageNameOrdering : return rank_ != 0; } -- (bool) hasSupportingRole { - if (role_ == 0) - return true; - if (role_ == 1) - return true; - if ([Role_ isEqualToString:@"User"]) - return false; - if (role_ == 2) - return true; - if ([Role_ isEqualToString:@"Hacker"]) - return false; - if (role_ == 3) - return true; - if ([Role_ isEqualToString:@"Developer"]) - return false; - _assert(false); -} - - (NSArray *) tags { return tags_; } @@ -3014,7 +3216,7 @@ struct PackageNameOrdering : } - (CYString &) cyname { - return name_.empty() ? id_ : name_; + return !transform_.empty() ? transform_ : !name_.empty() ? name_ : id_; } - (uint32_t) compareBySection:(NSArray *)sections { @@ -3064,65 +3266,11 @@ struct PackageNameOrdering : cache->MarkDelete(iterator_, true); } } -- (bool) isUnfilteredAndSearchedForBy:(NSArray *)query { - _profile(Package$isUnfilteredAndSearchedForBy) - bool value(true); - - _profile(Package$isUnfilteredAndSearchedForBy$Unfiltered) - value &= [self unfiltered]; - _end - - _profile(Package$isUnfilteredAndSearchedForBy$Match) - value &= [self matches:query]; - _end - - return value; - _end -} - -- (bool) isUnfilteredAndSelectedForBy:(NSString *)search { - if ([search length] == 0) - return false; - - _profile(Package$isUnfilteredAndSelectedForBy) - bool value(true); - - _profile(Package$isUnfilteredAndSelectedForBy$Unfiltered) - value &= [self unfiltered]; - _end - - _profile(Package$isUnfilteredAndSelectedForBy$Match) - value &= [[self name] compare:search options:MatchCompareOptions_ range:NSMakeRange(0, [search length])] == NSOrderedSame; - _end - - return value; - _end -} - -- (bool) isInstalledAndUnfiltered:(NSNumber *)number { - return ![self uninstalled] && (![number boolValue] && role_ != 7 || [self unfiltered]); -} - -- (bool) isVisibleInSection:(NSString *)name { - NSString *section([self section]); - - return ( - name == nil || - section == nil && [name length] == 0 || - [name isEqualToString:section] - ) && [self visible]; -} - -- (bool) isVisibleInSource:(Source *)source { - return [self source] == source && [self visible]; -} - @end /* }}} */ /* Section Class {{{ */ @interface Section : NSObject { _H name_; - unichar index_; size_t row_; size_t count_; _H localized_; @@ -3132,9 +3280,9 @@ struct PackageNameOrdering : - (Section *) initWithName:(NSString *)name localized:(NSString *)localized; - (Section *) initWithName:(NSString *)name localize:(BOOL)localize; - (Section *) initWithName:(NSString *)name row:(size_t)row localize:(BOOL)localize; -- (Section *) initWithIndex:(unichar)index row:(size_t)row; + - (NSString *) name; -- (unichar) index; +- (void) setName:(NSString *)name; - (size_t) row; - (size_t) count; @@ -3180,28 +3328,18 @@ struct PackageNameOrdering : - (Section *) initWithName:(NSString *)name row:(size_t)row localize:(BOOL)localize { if ((self = [super init]) != nil) { name_ = name; - index_ = '\0'; row_ = row; if (localize) 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]; - index_ = index; - row_ = row; - } return self; -} - - (NSString *) name { return name_; } -- (unichar) index { - return index_; +- (void) setName:(NSString *)name { + name_ = name; } - (size_t) row { @@ -3559,18 +3697,26 @@ class CydiaLogCleaner : NSString *title(UCLocalize("DATABASE")); list_ = new pkgSourceList(); + _profile(reloadDataWithInvocation$ReadMainList) if ([self popErrorWithTitle:title forOperation:list_->ReadMainList()]) return; + _end + _profile(reloadDataWithInvocation$Source$initWithMetaIndex) for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) { Source *object([[[Source alloc] initWithMetaIndex:*source forDatabase:self inPool:pool_] autorelease]); [sourceList_ addObject:object]; } + _end _trace(); OpProgress progress; + bool opened; open: - if (!cache_.Open(progress, true)) { + _profile(reloadDataWithInvocation$pkgCacheFile) + opened = cache_.Open(progress, true); + _end + if (!opened) { // XXX: what if there are errors, but Open() == true? this should be merged with popError: while (!_error->empty()) { std::string error; @@ -3617,20 +3763,26 @@ class CydiaLogCleaner : return; } + _profile(reloadDataWithInvocation$pkgApplyStatus) if ([self popErrorWithTitle:title forOperation:pkgApplyStatus(cache_)]) return; + _end if (cache_->BrokenCount() != 0) { + _profile(pkgApplyStatus$pkgFixBroken) if ([self popErrorWithTitle:title forOperation:pkgFixBroken(cache_)]) return; + _end if (cache_->BrokenCount() != 0) { [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:UCLocalize("STILL_BROKEN_EX") ofType:kCydiaProgressEventTypeError] forTask:title]; return; } + _profile(pkgApplyStatus$pkgMinimizeUpgrade) if ([self popErrorWithTitle:title forOperation:pkgMinimizeUpgrade(cache_)]) return; + _end } for (Source *object in (id) sourceList_) { @@ -3650,14 +3802,13 @@ class CydiaLogCleaner : packages.reserve(std::max(10000U, [packages_ count] + 1000)); packages_ = nil;*/ - _trace(); - + _profile(reloadDataWithInvocation$packageWithIterator) 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_, CFRetain(package)); + _end - _trace(); /*if (packages.empty()) packages_ = [[NSArray alloc] init]; @@ -3665,35 +3816,43 @@ class CydiaLogCleaner : packages_ = [[NSArray alloc] initWithObjects:&packages.front() count:packages.size()]; _trace();*/ - [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(16)]; + _profile(reloadDataWithInvocation$radix$8) + [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(8)]; + _end + + _profile(reloadDataWithInvocation$radix$4) [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(4)]; - [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(0)]; + _end - /*_trace(); - PrintTimes(); - _trace();*/ + _profile(reloadDataWithInvocation$radix$0) + [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(0)]; + _end - _trace(); + _profile(reloadDataWithInvocation$insertion) + CFArrayInsertionSortValues(packages_, CFRangeMake(0, CFArrayGetCount(packages_)), reinterpret_cast(&PackageNameCompare), NULL); + _end - /*if (!packages.empty()) - CFQSortArray(&packages.front(), packages.size(), sizeof(packages.front()), reinterpret_cast(&PackageNameCompare_), NULL);*/ - //std::sort(packages.begin(), packages.end(), PackageNameOrdering()); + /*_profile(reloadDataWithInvocation$CFQSortArray) + CFQSortArray(&packages.front(), packages.size(), sizeof(packages.front()), reinterpret_cast(&PackageNameCompare_), NULL); + _end*/ - //CFArraySortValues((CFMutableArrayRef) packages_, CFRangeMake(0, [packages_ count]), reinterpret_cast(&PackageNameCompare), NULL); + /*_profile(reloadDataWithInvocation$stdsort) + std::sort(packages.begin(), packages.end(), PackageNameOrdering()); + _end*/ - CFArrayInsertionSortValues(packages_, CFRangeMake(0, CFArrayGetCount(packages_)), reinterpret_cast(&PackageNameCompare), NULL); + /*_profile(reloadDataWithInvocation$CFArraySortValues) + CFArraySortValues((CFMutableArrayRef) packages_, CFRangeMake(0, [packages_ count]), reinterpret_cast(&PackageNameCompare), NULL); + _end*/ - //[packages_ sortUsingFunction:reinterpret_cast(&PackageNameCompare) context:NULL]; + /*_profile(reloadDataWithInvocation$sortUsingFunction) + [packages_ sortUsingFunction:reinterpret_cast(&PackageNameCompare) context:NULL]; + _end*/ - _trace(); size_t count(CFArrayGetCount(packages_)); MetaFile_->active_ = count; - for (size_t index(0); index != count; ++index) [(Package *) CFArrayGetValueAtIndex(packages_, index) setIndex:index]; - - _trace(); } } } @@ -3851,7 +4010,7 @@ class CydiaLogCleaner : [self updateWithStatus:status_]; } -- (void) updateWithStatus:(Status &)status { +- (void) updateWithStatus:(CancelStatus &)status { NSString *title(UCLocalize("REFRESHING_DATA")); pkgSourceList list; @@ -3895,6 +4054,16 @@ class CydiaLogCleaner : return i == sourceMap_.end() ? nil : i->second; } +- (void) setFetch:(bool)fetch forURI:(const char *)uri { + for (Source *source in (id) sourceList_) + [source setFetch:fetch forURI:uri]; +} + +- (void) resetFetch { + for (Source *source in (id) sourceList_) + [source resetFetch]; +} + - (NSString *) mappedSectionForPointer:(const char *)section { _H *mapped; @@ -4106,7 +4275,7 @@ static _H Diversions_; } - (NSString *) role { - return (id) Role_ ?: [NSNull null]; + return (id) [NSNull null]; } - (NSString *) model { @@ -4183,8 +4352,6 @@ static _H Diversions_; return @"setMetadataValue"; else if (selector == @selector(setSessionValue::)) return @"setSessionValue"; - else if (selector == @selector(setShowPromoted:)) - return @"setShowPromoted"; else if (selector == @selector(substitutePackageNames:)) return @"substitutePackageNames"; else if (selector == @selector(scrollToBottom:)) @@ -4315,15 +4482,6 @@ static _H Diversions_; [indirect_ registerFrame:frame]; } -- (void) _setShowPromoted:(NSNumber *)value { - [Metadata_ setObject:value forKey:@"ShowPromoted"]; - Changed_ = true; -} - -- (void) setShowPromoted:(NSNumber *)value { - [self performSelectorOnMainThread:@selector(_setShowPromoted:) withObject:value waitUntilDone:NO]; -} - - (id) getMetadataValue:(NSString *)key { @synchronized (Values_) { return [Values_ objectForKey:key]; @@ -4465,27 +4623,25 @@ static _H Diversions_; /* XXX: this should probably not use du */ execl("/usr/libexec/cydia/du", "du", "-s", [path UTF8String], NULL); exit(1); - _assert(false); - } - - _assert(close(fds[1]) != -1); + } else { + _assert(close(fds[1]) != -1); - if (FILE *du = fdopen(fds[0], "r")) { - char line[1024]; - while (fgets(line, sizeof(line), du) != NULL) { - size_t length(strlen(line)); - while (length != 0 && line[length - 1] == '\n') - line[--length] = '\0'; - if (char *tab = strchr(line, '\t')) { - *tab = '\0'; - value = [NSNumber numberWithUnsignedLong:strtoul(line, NULL, 0)]; + if (FILE *du = fdopen(fds[0], "r")) { + char line[1024]; + while (fgets(line, sizeof(line), du) != NULL) { + size_t length(strlen(line)); + while (length != 0 && line[length - 1] == '\n') + line[--length] = '\0'; + if (char *tab = strchr(line, '\t')) { + *tab = '\0'; + value = [NSNumber numberWithUnsignedLong:strtoul(line, NULL, 0)]; + } } - } - fclose(du); - } else _assert(close(fds[0])); - - ReapZombie(pid); + fclose(du); + } else + _assert(close(fds[0]) != -1); + } ReapZombie(pid); return value; } @@ -4951,7 +5107,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { reason = @"virtual"; } - NSDictionary *version(start.TargetVer() == 0 ? [NSNull null] : [NSDictionary dictionaryWithObjectsAndKeys: + NSDictionary *version(start.TargetVer() == 0 ? (NSDictionary *) [NSNull null] : [NSDictionary dictionaryWithObjectsAndKeys: [NSString stringWithUTF8String:start.CompType()], @"operator", [NSString stringWithUTF8String:start.TargetVer()], @"value", nil]); @@ -5316,13 +5472,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (pid == 0) { execl("/usr/bin/sbreload", "sbreload", NULL); perror("sbreload"); + exit(0); - } + } ReapZombie(pid); exit(0); - } - - ReapZombie(pid); + } ReapZombie(pid); sleep(15); system("/usr/bin/killall backboardd SpringBoard sbreload"); @@ -5687,7 +5842,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (!highlighted) UISetColor(commercial_ ? Purple_ : Black_); - [name_ drawAtPoint:CGPointMake(36, 8) forWidth:(width - (placard_ == nil ? 68 : 94)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation]; + [name_ drawAtPoint:CGPointMake(36, 8) forWidth:(width - (placard_ == nil ? 68 : 94)) withFont:Font18Bold_ lineBreakMode:NSLineBreakByTruncatingTail]; if (placard_ != nil) [placard_ drawAtPoint:CGPointMake(width - 52, 11)]; @@ -5730,12 +5885,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (!highlighted) UISetColor(commercial_ ? Purple_ : Black_); - [name_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - (placard_ == nil ? 80 : 106)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation]; - [source_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation]; + [name_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - (placard_ == nil ? 80 : 106)) withFont:Font18Bold_ lineBreakMode:NSLineBreakByTruncatingTail]; + [source_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:NSLineBreakByTruncatingTail]; if (!highlighted) UISetColor(commercial_ ? Purplish_ : Gray_); - [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation]; + [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ lineBreakMode:NSLineBreakByTruncatingTail]; if (placard_ != nil) [placard_ drawAtPoint:CGPointMake(width - 52, 9)]; @@ -5821,7 +5976,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { section_ = [section localized]; name_ = section_ == nil || [section_ length] == 0 ? UCLocalize("NO_SECTION") : (NSString *) section_; - count_ = [NSString stringWithFormat:@"%d", [section count]]; + count_ = [NSString stringWithFormat:@"%zd", [section count]]; if (editing_) [switch_ setOn:(isSectionVisible(basic_) ? 1 : 0) animated:NO]; @@ -5858,7 +6013,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (!highlighted) UISetColor(Black_); - [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(width - 70) withFont:Font22Bold_ lineBreakMode:UILineBreakModeTailTruncation]; + [name_ drawAtPoint:CGPointMake(48, 12) forWidth:(width - 58) withFont:Font18_ lineBreakMode:NSLineBreakByTruncatingTail]; CGSize size = [count_ sizeWithFont:Font14_]; @@ -6155,10 +6310,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { _transient Database *database_; unsigned era_; _H packages_; - _H sections_; + _H sections_; _H list_; - _H index_; - _H indices_; + + _H thumbs_; + std::vector offset_; + _H title_; unsigned reloading_; } @@ -6168,6 +6325,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) resetCursor; - (void) clearData; +- (NSArray *) sectionsForPackages:(NSMutableArray *)packages; + @end @implementation PackageListController @@ -6279,12 +6438,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [[self navigationController] pushViewController:view animated:YES]; } -#if TryIndexedCollation -+ (BOOL) hasIndexedCollation { - return NO; // XXX: objc_getClass("UILocalizedIndexedCollation") != nil; -} -#endif - - (NSInteger) numberOfSectionsInTableView:(UITableView *)list { NSInteger count([sections_ count]); return count == 0 ? 1 : count; @@ -6330,20 +6483,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSArray *) sectionIndexTitlesForTableView:(UITableView *)tableView { - if (![self showsSections]) - return nil; - - return index_; + return thumbs_; } - (NSInteger) tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index { -#if TryIndexedCollation - if ([[self class] hasIndexedCollation]) { - return [[objc_getClass("UILocalizedIndexedCollation") currentCollation] sectionForSectionIndexTitleAtIndex:index]; - } -#endif - - return index; + return offset_[index]; } - (void) updateHeight { @@ -6381,8 +6525,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { packages_ = nil; sections_ = nil; - index_ = nil; - indices_ = nil; + + thumbs_ = nil; + offset_.clear(); [super releaseSubviews]; } @@ -6413,7 +6558,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return; } - NSArray *packages; + NSMutableArray *packages; reload: if ([self shouldYield]) { @@ -6442,92 +6587,82 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { goto reload; reloading_ = 0; - packages_ = packages; - - indices_ = [NSMutableDictionary dictionaryWithCapacity:32]; - sections_ = [NSMutableArray arrayWithCapacity:16]; - - Section *section = nil; + thumbs_ = nil; + offset_.clear(); -#if TryIndexedCollation - if ([[self class] hasIndexedCollation]) { - index_ = [[objc_getClass("UILocalizedIndexedCollation") currentCollation] sectionIndexTitles]; + packages_ = packages; - id collation = [objc_getClass("UILocalizedIndexedCollation") currentCollation]; - NSArray *titles = [collation sectionIndexTitles]; - int secidx = -1; + if ([self showsSections]) + sections_ = [self sectionsForPackages:packages]; + else { + Section *section([[[Section alloc] initWithName:nil row:0 localize:NO] autorelease]); + [section setCount:[packages_ count]]; + sections_ = [NSArray arrayWithObject:section]; + } - _profile(PackageTable$reloadData$Section) - for (size_t offset(0), end([packages_ count]); offset != end; ++offset) { - Package *package; - int index; + [self updateHeight]; - _profile(PackageTable$reloadData$Section$Package) - package = [packages_ objectAtIndex:offset]; - index = [collation sectionForObject:package collationStringSelector:@selector(name)]; - _end + _profile(PackageTable$reloadData$List) + [(UITableView *) list_ setDataSource:self]; + [list_ reloadData]; + _end +} - while (secidx < index) { - secidx += 1; + PrintTimes(); +} - _profile(PackageTable$reloadData$Section$Allocate) - section = [[[Section alloc] initWithName:[titles objectAtIndex:secidx] row:offset localize:NO] autorelease]; - _end +- (NSArray *) sectionsForPackages:(NSMutableArray *)packages { + Section *prefix([[[Section alloc] initWithName:nil row:0 localize:NO] autorelease]); + size_t end([packages count]); - _profile(PackageTable$reloadData$Section$Add) - [sections_ addObject:section]; - _end - } + NSMutableArray *sections([NSMutableArray arrayWithCapacity:16]); + Section *section(prefix); - [section addToCount]; - } - _end - } else -#endif - { - index_ = [NSMutableArray arrayWithCapacity:32]; + thumbs_ = CollationThumbs_; + offset_ = CollationOffset_; - bool sectioned([self showsSections]); - if (!sectioned) { - section = [[[Section alloc] initWithName:nil localize:false] autorelease]; - [sections_ addObject:section]; - } + size_t offset(0); + size_t offsets([CollationStarts_ count]); - _profile(PackageTable$reloadData$Section) - for (size_t offset(0), end([packages_ count]); offset != end; ++offset) { - Package *package; - unichar index; + NSString *start([CollationStarts_ objectAtIndex:offset]); + size_t length([start length]); - _profile(PackageTable$reloadData$Section$Package) - package = [packages_ objectAtIndex:offset]; - index = [package index]; - _end + for (size_t index(0); index != end; ++index) { + if (start != nil) { + Package *package([packages objectAtIndex:index]); + NSString *name(PackageName(package, @selector(cyname))); - if (sectioned && (section == nil || [section index] != index)) { - _profile(PackageTable$reloadData$Section$Allocate) - section = [[[Section alloc] initWithIndex:index row:offset] autorelease]; - _end + //while ([start compare:name options:NSNumericSearch range:NSMakeRange(0, length) locale:CollationLocale_] != NSOrderedDescending) { + while (StringNameCompare(start, name, length) != kCFCompareGreaterThan) { + NSString *title([CollationTitles_ objectAtIndex:offset]); + section = [[[Section alloc] initWithName:title row:index localize:NO] autorelease]; + [sections addObject:section]; - [index_ addObject:[section name]]; - //[indices_ setObject:[NSNumber numberForInt:[sections_ count]] forKey:index]; + start = ++offset == offsets ? nil : [CollationStarts_ objectAtIndex:offset]; + if (start == nil) + break; + length = [start length]; + } + } - _profile(PackageTable$reloadData$Section$Add) - [sections_ addObject:section]; - _end - } + [section addToCount]; + } - [section addToCount]; - } - _end + for (; offset != offsets; ++offset) { + NSString *title([CollationTitles_ objectAtIndex:offset]); + Section *section([[[Section alloc] initWithName:title row:end localize:NO] autorelease]); + [sections addObject:section]; } - [self updateHeight]; + if ([prefix count] != 0) { + Section *suffix([sections lastObject]); + [prefix setName:[suffix name]]; + [suffix setName:nil]; + [sections insertObject:prefix atIndex:(offsets - 1)]; + } - _profile(PackageTable$reloadData$List) - [(UITableView *) list_ setDataSource:self]; - [list_ reloadData]; - _end -} } + return sections; +} - (void) reloadData { [super reloadData]; @@ -6554,80 +6689,61 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @end /* }}} */ /* Filtered Package List Controller {{{ */ +typedef Function PackageFilter; +typedef Function PackageSorter; @interface FilteredPackageListController : PackageListController { - SEL filter_; - IMP imp_; - _H object_; + PackageFilter filter_; + PackageSorter sorter_; } -- (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:(PackageFilter)filter; -- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object; +- (void) setFilter:(PackageFilter)filter; +- (void) setSorter:(PackageSorter)sorter; @end @implementation FilteredPackageListController -- (SEL) filter { - return filter_; -} - -- (void) setFilter:(SEL)filter { +- (void) setFilter:(PackageFilter)filter { @synchronized (self) { filter_ = filter; - - /* XXX: this is an unsafe optimization of doomy hell */ - Method method(class_getInstanceMethod([Package class], filter)); - _assert(method != NULL); - imp_ = method_getImplementation(method); - _assert(imp_ != NULL); } } -- (void) setObject:(id)object { +- (void) setSorter:(PackageSorter)sorter { @synchronized (self) { - object_ = object; -} } - -- (void) setObject:(id)object forFilter:(SEL)filter { -@synchronized (self) { - [self setFilter:filter]; - [self setObject:object]; + sorter_ = sorter; } } - (NSMutableArray *) _reloadPackages { @synchronized (database_) { era_ = [database_ era]; - NSArray *packages([database_ packages]); + NSArray *packages([database_ packages]); NSMutableArray *filtered([NSMutableArray arrayWithCapacity:[packages count]]); - IMP imp; - SEL filter; - _H object; + PackageFilter filter; + PackageSorter sorter; @synchronized (self) { - imp = imp_; filter = filter_; - object = object_; + sorter = sorter_; } _profile(PackageTable$reloadData$Filter) for (Package *package in packages) - if ([package valid] && (*reinterpret_cast(imp))(package, filter, object)) + if ([package valid] && filter(package)) [filtered addObject:package]; _end + if (sorter) + sorter(filtered); return filtered; } } -- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object { +- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(PackageFilter)filter { if ((self = [super initWithDatabase:database title:title]) != nil) { [self setFilter:filter]; - [self setObject:object]; } return self; } @@ -6703,156 +6819,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi ] autorelease]; } -@end -/* }}} */ -/* Manage Controller {{{ */ -@interface ManageController : CydiaWebViewController { -} - -- (void) queueStatusDidChange; - -@end - -@implementation ManageController - -- (id) init { - if ((self = [super init]) != nil) { - [self setURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]]]; - } return self; -} - -- (NSURL *) navigationURL { - return [NSURL URLWithString:@"cydia://manage"]; -} - -- (UIBarButtonItem *) leftButton { - return [[[UIBarButtonItem alloc] - initWithTitle:UCLocalize("SETTINGS") - style:UIBarButtonItemStylePlain - target:self - action:@selector(settingsButtonClicked) - ] autorelease]; -} - -- (void) settingsButtonClicked { - [delegate_ showSettings]; -} - -- (void) queueButtonClicked { - [delegate_ queue]; -} - -- (UIBarButtonItem *) rightButton { - return Queuing_ ? [[[UIBarButtonItem alloc] - initWithTitle:UCLocalize("QUEUE") - style:UIBarButtonItemStyleDone - target:self - action:@selector(queueButtonClicked) - ] autorelease] : nil; -} - -- (void) queueStatusDidChange { - [self applyRightButton]; -} - -- (bool) isLoading { - return !Queuing_ && [super isLoading]; -} - -@end -/* }}} */ - -/* Refresh Bar {{{ */ -@interface RefreshBar : UINavigationBar { - _H indicator_; - _H prompt_; - _H cancel_; -} - -@end - -@implementation RefreshBar - -- (void) positionViews { - CGRect frame = [cancel_ frame]; - frame.size = [cancel_ sizeThatFits:frame.size]; - frame.origin.x = [self frame].size.width - frame.size.width - 5; - frame.origin.y = ([self frame].size.height - frame.size.height) / 2; - [cancel_ setFrame:frame]; - - CGSize indsize([UIProgressIndicator defaultSizeForStyle:[indicator_ activityIndicatorViewStyle]]); - unsigned indoffset = ([self frame].size.height - indsize.height) / 2; - CGRect indrect = {{indoffset, indoffset}, indsize}; - [indicator_ setFrame:indrect]; - - CGSize prmsize = {215, indsize.height + 4}; - CGRect prmrect = {{ - indoffset * 2 + indsize.width, - unsigned([self frame].size.height - prmsize.height) / 2 - 1 - }, prmsize}; - [prompt_ setFrame:prmrect]; -} - -- (void) setFrame:(CGRect)frame { - [super setFrame:frame]; - [self positionViews]; -} - -- (id) initWithFrame:(CGRect)frame delegate:(id)delegate { - if ((self = [super initWithFrame:frame]) != nil) { - [self setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; - - [self setBarStyle:UIBarStyleBlack]; - - UIBarStyle barstyle([self _barStyle:NO]); - bool ugly(barstyle == UIBarStyleDefault); - - UIProgressIndicatorStyle style = ugly ? - UIProgressIndicatorStyleMediumBrown : - UIProgressIndicatorStyleMediumWhite; - - indicator_ = [[[UIProgressIndicator alloc] initWithFrame:CGRectZero] autorelease]; - [(UIProgressIndicator *) indicator_ setStyle:style]; - [indicator_ startAnimation]; - [self addSubview:indicator_]; - - 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_]; - - cancel_ = [[[UINavigationButton alloc] initWithTitle:UCLocalize("CANCEL") style:UINavigationButtonStyleHighlighted] autorelease]; - [cancel_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; - [cancel_ addTarget:delegate action:@selector(cancelPressed) forControlEvents:UIControlEventTouchUpInside]; - [cancel_ setBarStyle:barstyle]; - - [self positionViews]; - } return self; -} - -- (void) setCancellable:(bool)cancellable { - if (cancellable) - [self addSubview:cancel_]; - else - [cancel_ removeFromSuperview]; -} - -- (void) start { - [prompt_ setText:UCLocalize("UPDATING_DATABASE")]; -} - -- (void) stop { - [self setCancellable:NO]; -} - -- (void) setPrompt:(NSString *)prompt { - [prompt_ setText:prompt]; -} - -- (void) setProgress:(float)progress { -} - @end /* }}} */ @@ -6866,95 +6832,26 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi /* }}} */ /* Cydia Tab Bar Controller {{{ */ -@interface CYTabBarController : UITabBarController < +@interface CydiaTabBarController : CyteTabBarController < UITabBarControllerDelegate, - ProgressDelegate + FetchDelegate > { _transient Database *database_; - _H refreshbar_; - bool dropped_; + _H indicator_; + bool updating_; // XXX: ok, "updatedelegate_"?... _transient NSObject *updatedelegate_; - - _H remembered_; - _transient UIViewController *transient_; } - (NSArray *) navigationURLCollection; -- (void) dropBar:(BOOL)animated; - (void) beginUpdate; -- (void) raiseBar:(BOOL)animated; - (BOOL) updating; -- (void) unloadData; @end -@implementation CYTabBarController - -- (void) didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - - // presenting a UINavigationController on 2.x does not update its transitionView - // it thereby will not allow its topViewController to be unloaded by memory pressure - if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) { - UIViewController *selected([self selectedViewController]); - for (UINavigationController *controller in [self viewControllers]) - if (controller != selected) - if (UIViewController *top = [controller topViewController]) - [top unloadView]; - } -} - -- (void) setUnselectedViewController:(UIViewController *)transient { - if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) { - if (transient != nil) { - [[[self viewControllers] objectAtIndex:0] pushViewController:transient animated:YES]; - [self setSelectedIndex:0]; - } return; - } - - NSMutableArray *controllers = [[[self viewControllers] mutableCopy] autorelease]; - if (transient != nil) { - UINavigationController *navigation([[[UINavigationController alloc] init] autorelease]); - [navigation setViewControllers:[NSArray arrayWithObject:transient]]; - transient = navigation; - - if (transient_ == nil) - remembered_ = [controllers objectAtIndex:0]; - transient_ = transient; - [transient_ setTabBarItem:[remembered_ tabBarItem]]; - [controllers replaceObjectAtIndex:0 withObject:transient_]; - [self setSelectedIndex:0]; - [self setViewControllers:controllers]; - [self concealTabBarSelection]; - } else if (remembered_ != nil) { - [remembered_ setTabBarItem:[transient_ tabBarItem]]; - transient_ = transient; - [controllers replaceObjectAtIndex:0 withObject:remembered_]; - remembered_ = nil; - [self setViewControllers:controllers]; - [self revealTabBarSelection]; - } -} - -- (UIViewController *) unselectedViewController { - return transient_; -} - -- (void) tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController { - if ([self unselectedViewController]) - [self setUnselectedViewController:nil]; - - // presenting a UINavigationController on 2.x does not update its transitionView - // if this view was unloaded, the tranitionView may currently be presenting nothing - if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) { - UINavigationController *navigation((UINavigationController *) viewController); - [navigation pushViewController:[[[UIViewController alloc] init] autorelease] animated:NO]; - [navigation popViewControllerAnimated:NO]; - } -} +@implementation CydiaTabBarController - (NSArray *) navigationURLCollection { NSMutableArray *items([NSMutableArray array]); @@ -6969,43 +6866,15 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi return items; } -- (void) dismissModalViewControllerAnimated:(BOOL)animated { - if ([self modalViewController] == nil && [self unselectedViewController] != nil) - [self setUnselectedViewController:nil]; - else - [super dismissModalViewControllerAnimated:YES]; -} - -- (void) unloadData { - [super unloadData]; - - for (UINavigationController *controller in [self viewControllers]) - [controller unloadData]; - - if (UIViewController *selected = [self selectedViewController]) - [selected reloadData]; - - if (UIViewController *unselected = [self unselectedViewController]) { - [unselected unloadData]; - [unselected reloadData]; - } -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [super dealloc]; -} - - (id) initWithDatabase:(Database *)database { if ((self = [super init]) != nil) { database_ = database; [self setDelegate:self]; - [[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarFrameChanged:) name:UIApplicationDidChangeStatusBarFrameNotification object:nil]; + indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteTiny] autorelease]; + [indicator_ setOrigin:CGPointMake(kCFCoreFoundationVersionNumber >= 800 ? 2 : 4, 2)]; - refreshbar_ = [[[RefreshBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, [UINavigationBar defaultSize].height) delegate:self] autorelease]; + [[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -7014,8 +6883,17 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } - (void) beginUpdate { - [(RefreshBar *) refreshbar_ start]; - [self dropBar:YES]; + if (updating_) + return; + + UIViewController *controller([[self viewControllers] objectAtIndex:1]); + UITabBarItem *item([controller tabBarItem]); + + [item setBadgeValue:@""]; + UIView *badge(MSHookIvar([item view], "_badge")); + + [indicator_ startAnimating]; + [badge addSubview:indicator_]; [updatedelegate_ retainNetworkActivityIndicator]; updating_ = true; @@ -7030,8 +6908,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi - (void) performUpdate { NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); - Status status; - status.setDelegate(self); + SourceStatus status(self, database_); [database_ updateWithStatus:status]; [self @@ -7047,8 +6924,11 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi updating_ = false; [updatedelegate_ releaseNetworkActivityIndicator]; - [self raiseBar:YES]; - [refreshbar_ stop]; + UIViewController *controller([[self viewControllers] objectAtIndex:1]); + [[controller tabBarItem] setBadgeValue:nil]; + + [indicator_ removeFromSuperview]; + [indicator_ stopAnimating]; [updatedelegate_ performSelector:selector withObject:nil afterDelay:0]; } @@ -7071,25 +6951,14 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi return updating_; } -- (void) addProgressEvent:(CydiaProgressEvent *)event { - [refreshbar_ setPrompt:[event compoundMessage]]; -} - -- (bool) isProgressCancelled { +- (bool) isSourceCancelled { return !updating_; } -- (void) setProgressCancellable:(NSNumber *)cancellable { - [refreshbar_ setCancellable:(updating_ && [cancellable boolValue])]; +- (void) startSourceFetch:(NSString *)uri { } -- (void) setProgressPercent:(NSNumber *)percent { - [refreshbar_ setProgress:[percent floatValue]]; -} - -- (void) setProgressStatus:(NSDictionary *)status { - if (status != nil) - [self setProgressPercent:[status objectForKey:@"Percent"]]; +- (void) stopSourceFetch:(NSString *)uri { } - (void) setUpdateDelegate:(id)delegate { @@ -7105,88 +6974,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi return [[[self _transitionView] superview] superview]; } -- (void) dropBar:(BOOL)animated { - if (dropped_) - return; - dropped_ = true; - - UIView *transition([self transitionView]); - [[self view] addSubview:refreshbar_]; - - CGRect barframe([refreshbar_ frame]); - - if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) // XXX: _UIApplicationLinkedOnOrAfter(4) - barframe.origin.y = 0; - else if (kCFCoreFoundationVersionNumber < 800) - barframe.origin.y = CYStatusBarHeight(); - else - barframe.origin.y = -barframe.size.height + CYStatusBarHeight(); - - [refreshbar_ setFrame:barframe]; - - if (animated) - [UIView beginAnimations:nil context:NULL]; - - CGRect viewframe = [transition frame]; - float adjust(barframe.size.height); - if (kCFCoreFoundationVersionNumber >= 800) - adjust -= CYStatusBarHeight(); - viewframe.origin.y += adjust; - viewframe.size.height -= adjust; - [transition setFrame:viewframe]; - - if (animated) - [UIView commitAnimations]; - - // Ensure bar has the proper width for our view, it might have changed - barframe.size.width = viewframe.size.width; - [refreshbar_ setFrame:barframe]; -} - -- (void) raiseBar:(BOOL)animated { - if (!dropped_) - return; - dropped_ = false; - - UIView *transition([self transitionView]); - [refreshbar_ removeFromSuperview]; - - CGRect barframe([refreshbar_ frame]); - - if (animated) - [UIView beginAnimations:nil context:NULL]; - - CGRect viewframe = [transition frame]; - float adjust(barframe.size.height); - if (kCFCoreFoundationVersionNumber >= 800) - adjust -= CYStatusBarHeight(); - viewframe.origin.y -= adjust; - viewframe.size.height += adjust; - [transition setFrame:viewframe]; - - if (animated) - [UIView commitAnimations]; -} - -- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { - bool dropped(dropped_); - - if (dropped) - [self raiseBar:NO]; - - [super didRotateFromInterfaceOrientation:fromInterfaceOrientation]; - - if (dropped) - [self dropBar:NO]; -} - -- (void) statusBarFrameChanged:(NSNotification *)notification { - if (dropped_) { - [self raiseBar:NO]; - [self dropBar:NO]; - } -} - @end /* }}} */ @@ -7335,146 +7122,65 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi /* Section Controller {{{ */ @interface SectionController : FilteredPackageListController { - _H indirect_; - _H cydia_; + _H key_; _H section_; - std::vector< _H > promoted_; } -- (id) initWithDatabase:(Database *)database section:(NSString *)section; +- (id) initWithDatabase:(Database *)database source:(Source *)source section:(NSString *)section; @end @implementation SectionController - (NSURL *) referrerURL { - NSString *name = section_; - if (name == nil) - name = @"all"; - - return [NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/sections/%@", UI_, [name stringByAddingPercentEscapesIncludingReserved]]]; + NSString *name(section_); + name = name ?: @"*"; + NSString *key(key_); + key = key ?: @"*"; + return [NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/sections/%@/%@", UI_, [key stringByAddingPercentEscapesIncludingReserved], [name stringByAddingPercentEscapesIncludingReserved]]]; } - (NSURL *) navigationURL { - NSString *name = section_; - if (name == nil) - name = @"all"; - - return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sections/%@", [name stringByAddingPercentEscapesIncludingReserved]]]; + NSString *name(section_); + name = name ?: @"*"; + NSString *key(key_); + key = key ?: @"*"; + return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sections/%@/%@", [key stringByAddingPercentEscapesIncludingReserved], [name stringByAddingPercentEscapesIncludingReserved]]]; } -- (id) initWithDatabase:(Database *)database section:(NSString *)name { +- (id) initWithDatabase:(Database *)database source:(Source *)source section:(NSString *)section { NSString *title; - if (name == nil) + if (section == nil) title = UCLocalize("ALL_PACKAGES"); - else if (![name isEqual:@""]) - title = [[NSBundle mainBundle] localizedStringForKey:Simplify(name) value:nil table:@"Sections"]; + else if (![section isEqual:@""]) + title = [[NSBundle mainBundle] localizedStringForKey:Simplify(section) value:nil table:@"Sections"]; else title = UCLocalize("NO_SECTION"); - if ((self = [super initWithDatabase:database title:title filter:@selector(isVisibleInSection:) with:name]) != nil) { - indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease]; - cydia_ = [[[CydiaObject alloc] initWithDelegate:indirect_] autorelease]; - section_ = name; + if ((self = [super initWithDatabase:database title:title]) != nil) { + key_ = [source key]; + section_ = section; } return self; } -- (NSInteger) numberOfSectionsInTableView:(UITableView *)list { - return [super numberOfSectionsInTableView:list] + 1; -} - -- (NSString *) tableView:(UITableView *)list titleForHeaderInSection:(NSInteger)section { - return section == 0 ? nil : [super tableView:list titleForHeaderInSection:(section - 1)]; -} - -- (NSInteger) tableView:(UITableView *)list numberOfRowsInSection:(NSInteger)section { - return section == 0 ? promoted_.size() : [super tableView:list numberOfRowsInSection:(section - 1)]; -} - -+ (NSIndexPath *) adjustedIndexPath:(NSIndexPath *)path { - return [NSIndexPath indexPathForRow:[path row] inSection:([path section] - 1)]; -} - -- (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path { - if ([path section] != 0) - return [super tableView:table cellForRowAtIndexPath:[SectionController adjustedIndexPath:path]]; - - return promoted_[[path row]]; -} - -- (void) tableView:(UITableView *)table didSelectRowAtIndexPath:(NSIndexPath *)path { - if ([path section] != 0) - return [super tableView:table didSelectRowAtIndexPath:[SectionController adjustedIndexPath:path]]; -} - -- (NSInteger) tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index { - NSInteger section([super tableView:tableView sectionForSectionIndexTitle:title atIndex:index]); - return section == 0 ? 0 : section + 1; -} - -- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id)listener { - NSURL *url([request URL]); - if (url == nil) - return; - - if ([frame isEqualToString:@"_open"]) - [delegate_ openURL:url]; - else { - WebFrame *frame(nil); - if (NSDictionary *WebActionElement = [action objectForKey:@"WebActionElementKey"]) - frame = [WebActionElement objectForKey:@"WebElementFrame"]; - if (frame == nil) - frame = [view mainFrame]; - - WebDataSource *source([frame provisionalDataSource] ?: [frame dataSource]); - - CyteViewController *controller([delegate_ pageForURL:url forExternal:NO withReferrer:([request valueForHTTPHeaderField:@"Referer"] ?: [[[source request] URL] absoluteString])] ?: [[[CydiaWebViewController alloc] initWithRequest:request] autorelease]); - [controller setDelegate:delegate_]; - [[self navigationController] pushViewController:controller animated:YES]; - } - - [listener ignore]; -} - -- (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source { - return [CydiaWebViewController requestWithHeaders:request]; -} - -- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { - [CydiaWebViewController didClearWindowObject:window forFrame:frame withCydia:cydia_]; -} - -- (void) loadView { - [super loadView]; - - // XXX: this code is horrible. I mean, wtf Jay? - if (ShowPromoted_ && [[Metadata_ objectForKey:@"ShowPromoted"] boolValue]) { - promoted_.resize(1); - - for (unsigned i(0); i != promoted_.size(); ++i) { - CyteWebViewTableViewCell *promoted([CyteWebViewTableViewCell cellWithRequest:[NSURLRequest - requestWithURL:[Diversion divertURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/sectionhead/%u/%@", - UI_, i, section_ == nil ? @"" : [section_ stringByAddingPercentEscapesIncludingReserved]] - ]] - - cachePolicy:NSURLRequestUseProtocolCachePolicy - timeoutInterval:120 - ]]); - - [promoted setDelegate:self]; - promoted_[i] = promoted; - } - } -} - -- (void) setDelegate:(id)delegate { - [super setDelegate:delegate]; - [cydia_ setDelegate:delegate]; -} +- (void) reloadData { + Source *source([database_ sourceWithKey:key_]); + _H name(section_); + + [self setFilter:[=](Package *package) { + NSString *section([package section]); + + return ( + name == nil || + section == nil && [name length] == 0 || + [name isEqualToString:section] + ) && ( + source == nil || + [package source] == source + ) && [package visible]; + }]; -- (void) releaseSubviews { - promoted_.clear(); - [super releaseSubviews]; + [super reloadData]; } @end @@ -7485,12 +7191,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi UITableViewDelegate > { _transient Database *database_; + _H key_; _H sections_; _H filtered_; _H list_; } -- (id) initWithDatabase:(Database *)database; +- (id) initWithDatabase:(Database *)database source:(Source *)source; - (void) editButtonClicked; @end @@ -7498,7 +7205,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi @implementation SectionsController - (NSURL *) navigationURL { - return [NSURL URLWithString:@"cydia://sections"]; + return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sources/%@", [key_ stringByAddingPercentEscapesIncludingReserved]]]; +} + +- (Source *) source { + if (key_ == nil) + return nil; + return [database_ sourceWithKey:key_]; } - (void) updateNavigationItem { @@ -7579,6 +7292,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi SectionController *controller = [[[SectionController alloc] initWithDatabase:database_ + source:[self source] section:[section name] ] autorelease]; [controller setDelegate:delegate_]; @@ -7610,9 +7324,10 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi [super releaseSubviews]; } -- (id) initWithDatabase:(Database *)database { +- (id) initWithDatabase:(Database *)database source:(Source *)source { if ((self = [super init]) != nil) { database_ = database; + key_ = [source key]; } return self; } @@ -7626,8 +7341,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi NSMutableDictionary *sections([NSMutableDictionary dictionaryWithCapacity:32]); + Source *source([self source]); + _trace(); for (Package *package in packages) { + if (source != nil && [package source] != source) + continue; + NSString *name([package section]); NSString *key(name == nil ? @"" : name); @@ -7660,292 +7380,138 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi for (Section *section in (id) sections_) { size_t count([section row]); - if (count == 0) - continue; - - section = [[[Section alloc] initWithName:[section name] localized:[section localized]] autorelease]; - [section setCount:count]; - [filtered_ addObject:section]; - } - - [self updateNavigationItem]; - [list_ reloadData]; - _trace(); -} - -- (void) editButtonClicked { - [self setEditing:![self isEditing] animated:YES]; -} - -@end -/* }}} */ - -/* Changes Controller {{{ */ -@interface ChangesController : CyteViewController < - CyteWebViewDelegate, - UITableViewDataSource, - UITableViewDelegate -> { - _transient Database *database_; - unsigned era_; - _H packages_; - _H sections_; - _H list_; - _H dickbar_; - unsigned upgrades_; - _H indirect_; - _H cydia_; -} - -- (id) initWithDatabase:(Database *)database; - -@end - -@implementation ChangesController - -- (NSURL *) navigationURL { - return [NSURL URLWithString:@"cydia://changes"]; -} - -- (void) viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - [list_ deselectRowAtIndexPath:[list_ indexPathForSelectedRow] animated:animated]; -} - -- (NSInteger) numberOfSectionsInTableView:(UITableView *)list { - NSInteger count([sections_ count]); - return count == 0 ? 1 : count; -} - -- (NSString *) tableView:(UITableView *)list titleForHeaderInSection:(NSInteger)section { - if ([sections_ count] == 0) - return nil; - return [[sections_ objectAtIndex:section] name]; -} - -- (NSInteger) tableView:(UITableView *)list numberOfRowsInSection:(NSInteger)section { - if ([sections_ count] == 0) - return 0; - return [[sections_ objectAtIndex:section] count]; -} - -- (Package *) packageAtIndexPath:(NSIndexPath *)path { -@synchronized (database_) { - if ([database_ era] != era_) - return nil; - - NSUInteger sectionIndex([path section]); - if (sectionIndex >= [sections_ count]) - return nil; - Section *section([sections_ objectAtIndex:sectionIndex]); - NSInteger row([path row]); - 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]; - - Package *package([database_ packageWithName:[[self packageAtIndexPath:path] id]]); - [cell setPackage:package asSummary:false]; - return cell; -} - -- (NSIndexPath *) tableView:(UITableView *)table willSelectRowAtIndexPath:(NSIndexPath *)path { - Package *package([self packageAtIndexPath:path]); - CYPackageController *view([[[CYPackageController alloc] initWithDatabase:database_ forPackage:[package id] withReferrer:[NSString stringWithFormat:@"%@/#!/changes/", UI_]] autorelease]); - [view setDelegate:delegate_]; - [[self navigationController] pushViewController:view animated:YES]; - return path; -} - -- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button { - NSString *context([alert context]); - - if ([context isEqualToString:@"norefresh"]) - [alert dismissWithClickedButtonIndex:-1 animated:YES]; -} - -- (void) refreshButtonClicked { - if (IsReachable("cydia.saurik.com")) { - [delegate_ beginUpdate]; - [[self navigationItem] setLeftBarButtonItem:nil animated:YES]; - } else { - UIAlertView *alert = [[[UIAlertView alloc] - initWithTitle:[NSString stringWithFormat:Colon_, Error_, UCLocalize("REFRESH")] - message:@"Host Unreachable" // XXX: Localize - delegate:self - cancelButtonTitle:UCLocalize("OK") - otherButtonTitles:nil - ] autorelease]; - - [alert setContext:@"norefresh"]; - [alert show]; - } -} - -- (void) upgradeButtonClicked { - [delegate_ distUpgrade]; - [[self navigationItem] setRightBarButtonItem:nil animated:YES]; -} - -- (void) loadView { - UIView *view([[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]); - [view setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - [self setView:view]; - - list_ = [[[UITableView alloc] initWithFrame:[view bounds] style:UITableViewStylePlain] autorelease]; - [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; - [list_ setRowHeight:73]; - [(UITableView *) list_ setDataSource:self]; - [list_ setDelegate:self]; - [view addSubview:list_]; - - if (AprilFools_ && kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iPhoneOS_3_0) { - CGRect dickframe([view bounds]); - dickframe.size.height = 44; + if (count == 0) + continue; - dickbar_ = [[[CyteWebView alloc] initWithFrame:dickframe] autorelease]; - [dickbar_ setDelegate:self]; - [view addSubview:dickbar_]; + section = [[[Section alloc] initWithName:[section name] localized:[section localized]] autorelease]; + [section setCount:count]; + [filtered_ addObject:section]; + } - [dickbar_ setBackgroundColor:[UIColor clearColor]]; - [dickbar_ setScalesPageToFit:YES]; + [self updateNavigationItem]; + [list_ reloadData]; + _trace(); +} - UIWebDocumentView *document([dickbar_ _documentView]); - [document setBackgroundColor:[UIColor clearColor]]; - [document setDrawsBackground:NO]; +- (void) editButtonClicked { + [self setEditing:![self isEditing] animated:YES]; +} - WebView *webview([document webView]); - [webview setShouldUpdateWhileOffscreen:NO]; +@end +/* }}} */ - UIScrollView *scroller([dickbar_ scrollView]); - [scroller setScrollingEnabled:NO]; - [scroller setFixedBackgroundPattern:YES]; - [scroller setBackgroundColor:[UIColor clearColor]]; +/* Changes Controller {{{ */ +@interface ChangesController : FilteredPackageListController { + unsigned upgrades_; +} - WebPreferences *preferences([webview preferences]); - [preferences setCacheModel:WebCacheModelDocumentBrowser]; - [preferences setJavaScriptCanOpenWindowsAutomatically:YES]; - [preferences setOfflineWebApplicationCacheEnabled:YES]; +- (id) initWithDatabase:(Database *)database; - [dickbar_ loadRequest:[NSURLRequest - requestWithURL:[Diversion divertURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/dickbar/", UI_]]] - cachePolicy:NSURLRequestUseProtocolCachePolicy - timeoutInterval:120 - ]]; +@end - UIEdgeInsets inset = {44, 0, 0, 0}; - [list_ setContentInset:inset]; +@implementation ChangesController - [dickbar_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; - } +- (NSURL *) referrerURL { + return [NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/changes/", UI_]]; } -- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id)listener { - NSURL *url([request URL]); - if (url == nil) - return; +- (NSURL *) navigationURL { + return [NSURL URLWithString:@"cydia://changes"]; +} - if ([frame isEqualToString:@"_open"]) - [delegate_ openURL:url]; - else { - WebFrame *frame(nil); - if (NSDictionary *WebActionElement = [action objectForKey:@"WebActionElementKey"]) - frame = [WebActionElement objectForKey:@"WebElementFrame"]; - if (frame == nil) - frame = [view mainFrame]; +- (Package *) packageAtIndexPath:(NSIndexPath *)path { +@synchronized (database_) { + if ([database_ era] != era_) + return nil; - WebDataSource *source([frame provisionalDataSource] ?: [frame dataSource]); + NSUInteger sectionIndex([path section]); + if (sectionIndex >= [sections_ count]) + return nil; + Section *section([sections_ objectAtIndex:sectionIndex]); + NSInteger row([path row]); + return [[[packages_ objectAtIndex:([section row] + row)] retain] autorelease]; +} } - CyteViewController *controller([delegate_ pageForURL:url forExternal:NO withReferrer:([request valueForHTTPHeaderField:@"Referer"] ?: [[[source request] URL] absoluteString])] ?: [[[CydiaWebViewController alloc] initWithRequest:request] autorelease]); - [controller setDelegate:delegate_]; - [[self navigationController] pushViewController:controller animated:YES]; - } +- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button { + NSString *context([alert context]); - [listener ignore]; + if ([context isEqualToString:@"norefresh"]) + [alert dismissWithClickedButtonIndex:-1 animated:YES]; } -- (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source { - return [CydiaWebViewController requestWithHeaders:request]; +- (void) setLeftBarButtonItem { + if ([delegate_ updating]) + [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("CANCEL") + style:UIBarButtonItemStyleDone + target:self + action:@selector(cancelButtonClicked) + ] autorelease] animated:YES]; + else + [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("REFRESH") + style:UIBarButtonItemStylePlain + target:self + action:@selector(refreshButtonClicked) + ] autorelease] animated:YES]; } -- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { - [CydiaWebViewController didClearWindowObject:window forFrame:frame withCydia:cydia_]; +- (void) refreshButtonClicked { + if ([delegate_ requestUpdate]) + [self setLeftBarButtonItem]; } -- (void) setDelegate:(id)delegate { - [super setDelegate:delegate]; - [cydia_ setDelegate:delegate]; +- (void) cancelButtonClicked { + [delegate_ cancelUpdate]; } -- (void) viewDidLoad { - [super viewDidLoad]; +- (void) upgradeButtonClicked { + [delegate_ distUpgrade]; + [[self navigationItem] setRightBarButtonItem:nil animated:YES]; +} - [[self navigationItem] setTitle:(AprilFools_ ? @"Timeline" : UCLocalize("CHANGES"))]; +- (bool) shouldYield { + return true; } -- (void) releaseSubviews { - list_ = nil; +- (bool) shouldBlock { + return true; +} - packages_ = nil; - sections_ = nil; - dickbar_ = nil; +- (void) useFilter { +@synchronized (self) { + [self setFilter:[](Package *package) { + return [package upgradableAndEssential:YES] || [package visible]; + }]; - [super releaseSubviews]; -} + [self setSorter:[](NSMutableArray *packages) { + [packages radixSortUsingFunction:reinterpret_cast(&PackageChangesRadix) withContext:NULL]; + }]; +} } - (id) initWithDatabase:(Database *)database { - if ((self = [super init]) != nil) { - indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease]; - cydia_ = [[[CydiaObject alloc] initWithDelegate:indirect_] autorelease]; - database_ = database; + if ((self = [super initWithDatabase:database title:UCLocalize("CHANGES")]) != nil) { + [self useFilter]; } return self; } -- (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((CFMutableArrayRef) filtered, package); - _end - _trace(); - _profile(ChangesController$_reloadPackages$radixSort) - [filtered radixSortUsingFunction:reinterpret_cast(&PackageChangesRadix) withContext:NULL]; - _end - _trace(); - - return filtered; -} } - -- (void) _reloadData { - NSMutableArray *packages; +- (void) viewDidLoad { + [super viewDidLoad]; + [self setLeftBarButtonItem]; +} - 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]; - } +- (void) viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + [self setLeftBarButtonItem]; +} -@synchronized (database_) { - if (era_ != [database_ era]) - goto reload; +- (void) reloadData { + [self setLeftBarButtonItem]; + [super reloadData]; +} - packages_ = packages; - sections_ = [NSMutableArray arrayWithCapacity:16]; +- (NSArray *) sectionsForPackages:(NSMutableArray *)packages { + NSMutableArray *sections([NSMutableArray arrayWithCapacity:16]); Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease]; Section *ignored = nil; @@ -7957,8 +7523,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi CFDateFormatterRef formatter(CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle)); - for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) { - Package *package = [packages_ objectAtIndex:offset]; + for (size_t offset = 0, count = [packages count]; offset != count; ++offset) { + Package *package = [packages objectAtIndex:offset]; BOOL uae = [package upgradableAndEssential:YES]; @@ -7976,7 +7542,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi _profile(ChangesController$reloadData$Allocate) name = [NSString stringWithFormat:UCLocalize("NEW_AT"), name]; section = [[[Section alloc] initWithName:name row:offset localize:NO] autorelease]; - [sections_ addObject:section]; + [sections addObject:section]; _end } @@ -7996,16 +7562,16 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi CFRelease(formatter); if (unseens) { - Section *last = [sections_ lastObject]; + Section *last = [sections lastObject]; size_t count = [last count]; - [packages_ removeObjectsInRange:NSMakeRange([packages_ count] - count, count)]; - [sections_ removeLastObject]; + [packages removeObjectsInRange:NSMakeRange([packages count] - count, count)]; + [sections removeLastObject]; } if ([ignored count] != 0) - [sections_ insertObject:ignored atIndex:0]; + [sections insertObject:ignored atIndex:0]; if (upgrades_ != 0) - [sections_ insertObject:upgradable atIndex:0]; + [sections insertObject:upgradable atIndex:0]; [list_ reloadData]; @@ -8016,19 +7582,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi action:@selector(upgradeButtonClicked) ] autorelease]) animated:YES]; - [[self navigationItem] setLeftBarButtonItem:([delegate_ updating] ? nil : [[[UIBarButtonItem alloc] - initWithTitle:UCLocalize("REFRESH") - style:UIBarButtonItemStylePlain - target:self - action:@selector(refreshButtonClicked) - ] autorelease]) animated:YES]; - - PrintTimes(); -} } - -- (void) reloadData { - [super reloadData]; - [self performSelector:@selector(_reloadData) withObject:nil afterDelay:0]; + return sections; } @end @@ -8039,6 +7593,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi > { _H search_; BOOL searchloaded_; + bool summary_; } - (id) initWithDatabase:(Database *)database query:(NSString *)query; @@ -8069,15 +7624,51 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } - (void) useSearch { - [self setObject:[self termsForQuery:[search_ text]] forFilter:@selector(isUnfilteredAndSearchedForBy:)]; + _H query([self termsForQuery:[search_ text]]); + summary_ = false; + +@synchronized (self) { + [self setFilter:[=](Package *package) { + if (![package unfiltered]) + return false; + if (![package matches:query]) + return false; + return true; + }]; + + [self setSorter:[](NSMutableArray *packages) { + [packages radixSortUsingSelector:@selector(rank)]; + }]; +} + [self clearData]; [self reloadData]; } +- (void) usePrefix:(NSString *)prefix { + _H query(prefix); + summary_ = true; + +@synchronized (self) { + [self setFilter:[=](Package *package) { + if ([query length] == 0) + return false; + if (![package unfiltered]) + return false; + if ([[package name] compare:query options:MatchCompareOptions_ range:NSMakeRange(0, [query length])] != NSOrderedSame) + return false; + return true; + }]; + + [self setSorter:nullptr]; +} + + [self reloadData]; +} + - (void) searchBarTextDidBeginEditing:(UISearchBar *)searchBar { - [self setObject:[search_ text] forFilter:@selector(isUnfilteredAndSelectedForBy:)]; [self clearData]; - [self reloadData]; + [self usePrefix:[search_ text]]; } - (void) searchBarButtonClicked:(UISearchBar *)searchBar { @@ -8095,8 +7686,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } - (void) searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)text { - [self setObject:text forFilter:@selector(isUnfilteredAndSelectedForBy:)]; - [self reloadData]; + [self usePrefix:text]; } - (bool) shouldYield { @@ -8104,31 +7694,36 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } - (bool) shouldBlock { - return [self filter] == @selector(isUnfilteredAndSearchedForBy:); + return !summary_; } - (bool) isSummarized { - return [self filter] == @selector(isUnfilteredAndSelectedForBy:); + return summary_; } - (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:[self termsForQuery:query]])) { + if ((self = [super initWithDatabase:database title:UCLocalize("SEARCH")])) { search_ = [[[UISearchBar alloc] init] autorelease]; + [search_ setPlaceholder:UCLocalize("SEARCH_EX")]; [search_ setDelegate:self]; + UITextField *textField; + if ([search_ respondsToSelector:@selector(searchField)]) + textField = [search_ searchField]; + else + textField = MSHookIvar(search_, "_searchField"); + + [textField setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin]; + [textField setEnablesReturnKeyAutomatically:NO]; + [[self navigationItem] setTitleView:textField]; + if (query != nil) [search_ setText:query]; + [self useSearch]; } return self; } @@ -8139,17 +7734,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi searchloaded_ = YES; [search_ setFrame:CGRectMake(0, 0, [[self view] bounds].size.width, 44.0f)]; [search_ layoutSubviews]; - [search_ setPlaceholder:UCLocalize("SEARCH_EX")]; - - UITextField *textField; - if ([search_ respondsToSelector:@selector(searchField)]) - textField = [search_ searchField]; - else - textField = MSHookIvar(search_, "_searchField"); - - [textField setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin]; - [textField setEnablesReturnKeyAutomatically:NO]; - [[self navigationItem] setTitleView:textField]; } if ([self isSummarized]) @@ -8157,13 +7741,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } - (void) reloadData { - id object([search_ text]); - if ([self filter] == @selector(isUnfilteredAndSearchedForBy:)) - object = [self termsForQuery:object]; - - [self setObject:object]; [self resetCursor]; - [super reloadData]; } @@ -8253,10 +7831,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi pclose(dpkg); exit(0); - _assert(false); - } - - ReapZombie(pid); + } ReapZombie(pid); } - (void) onIgnored:(id)control { @@ -8352,12 +7927,10 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi /* Installed Controller {{{ */ @interface InstalledController : FilteredPackageListController { - BOOL expert_; + bool sectioned_; } - (id) initWithDatabase:(Database *)database; - -- (void) updateRoleButton; - (void) queueStatusDidChange; @end @@ -8372,9 +7945,48 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi return [NSURL URLWithString:@"cydia://installed"]; } +- (bool) showsSections { + return sectioned_; +} + +- (void) useUpdated { + sectioned_ = false; + +@synchronized (self) { + [self setFilter:[](Package *package) { + return ![package uninstalled] && package->role_ < 7; + }]; + + [self setSorter:[](NSMutableArray *packages) { + [packages radixSortUsingSelector:@selector(updated)]; + }]; +} } + +- (void) useFilter:(UISegmentedControl *)segmented { + NSInteger selected([segmented selectedSegmentIndex]); + if (selected == 2) + return [self useUpdated]; + bool simple(selected == 0); + sectioned_ = true; + +@synchronized (self) { + [self setFilter:[=](Package *package) { + return ![package uninstalled] && package->role_ <= (simple ? 1 : 3); + }]; + + [self setSorter:nullptr]; +} } + - (id) initWithDatabase:(Database *)database { - if ((self = [super initWithDatabase:database title:UCLocalize("INSTALLED") filter:@selector(isInstalledAndUnfiltered:) with:[NSNumber numberWithBool:YES]]) != nil) { - [self updateRoleButton]; + if ((self = [super initWithDatabase:database title:UCLocalize("INSTALLED")]) != nil) { + UISegmentedControl *segmented([[[UISegmentedControl alloc] initWithItems:[NSArray arrayWithObjects:UCLocalize("USER"), UCLocalize("EXPERT"), UCLocalize("RECENT"), nil]] autorelease]); + [segmented setSelectedSegmentIndex:0]; + [segmented setSegmentedControlStyle:UISegmentedControlStyleBar]; + [[self navigationItem] setTitleView:segmented]; + + [segmented addTarget:self action:@selector(modeChanged:) forEvents:UIControlEventValueChanged]; + [self useFilter:segmented]; + [self queueStatusDidChange]; } return self; } @@ -8387,37 +7999,22 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi - (void) queueStatusDidChange { #if !AlwaysReload - if (IsWildcat_) { - if (Queuing_) { - [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] - initWithTitle:UCLocalize("QUEUE") - style:UIBarButtonItemStyleDone - target:self - action:@selector(queueButtonClicked) - ] autorelease]]; - } else { - [[self navigationItem] setLeftBarButtonItem:nil]; - } - } -#endif -} - -- (void) updateRoleButton { - if (Role_ != nil && ![Role_ isEqualToString:@"Developer"]) - [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc] - initWithTitle:(expert_ ? UCLocalize("EXPERT") : UCLocalize("SIMPLE")) - style:(expert_ ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain) + if (Queuing_) { + [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("QUEUE") + style:UIBarButtonItemStyleDone target:self - action:@selector(roleButtonClicked) + action:@selector(queueButtonClicked) ] autorelease]]; + } else { + [[self navigationItem] setLeftBarButtonItem:nil]; + } +#endif } -- (void) roleButtonClicked { - [self setObject:[NSNumber numberWithBool:expert_]]; +- (void) modeChanged:(UISegmentedControl *)segmented { + [self useFilter:segmented]; [self reloadData]; - expert_ = !expert_; - - [self updateRoleButton]; } @end @@ -8425,15 +8022,19 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi /* Source Cell {{{ */ @interface SourceCell : CyteTableViewCell < - CyteTableViewCellDelegate + CyteTableViewCellDelegate, + SourceDelegate > { + _H source_; _H url_; _H icon_; _H origin_; _H label_; + _H indicator_; } - (void) setSource:(Source *)source; +- (void) setFetch:(NSNumber *)fetch; @end @@ -8466,6 +8067,11 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } - (void) setSource:(Source *)source { + source_ = source; + [source_ setDelegate:self]; + + [self setFetch:[NSNumber numberWithBool:[source_ fetch]]]; + icon_ = [UIImage applicationImageNamed:@"unknown.png"]; origin_ = [source name]; @@ -8477,6 +8083,16 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi [NSThread detachNewThreadSelector:@selector(_setSource:) toTarget:self withObject:url_]; } +- (void) setAllSource { + source_ = nil; + [indicator_ stopAnimating]; + + icon_ = [UIImage applicationImageNamed:@"folder.png"]; + origin_ = UCLocalize("ALL_SOURCES"); + label_ = UCLocalize("ALL_SOURCES_EX"); + [content_ setNeedsDisplay]; +} + - (SourceCell *) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier { if ((self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) != nil) { UIView *content([self contentView]); @@ -8490,12 +8106,31 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi [content_ setDelegate:self]; [content_ setOpaque:YES]; + indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGraySmall] autorelease]; + [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin];// | UIViewAutoresizingFlexibleBottomMargin]; + [content addSubview:indicator_]; + [[content_ layer] setContentsGravity:kCAGravityTopLeft]; } return self; } +- (void) layoutSubviews { + [super layoutSubviews]; + + UIView *content([self contentView]); + CGRect bounds([content bounds]); + + CGRect frame([indicator_ frame]); + frame.origin.x = bounds.size.width - frame.size.width; + frame.origin.y = (bounds.size.height - frame.size.height) / 2; + + if (kCFCoreFoundationVersionNumber < 800) + frame.origin.x -= 8; + [indicator_ setFrame:frame]; +} + - (NSString *) accessibilityLabel { - return label_; + return origin_; } - (void) drawContentRect:(CGRect)rect { @@ -8514,58 +8149,26 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi rect.origin.x = 26 - rect.size.width / 2; rect.origin.y = 26 - rect.size.height / 2; - [icon_ drawInRect:rect]; - } - - if (highlighted && kCFCoreFoundationVersionNumber < 800) - UISetColor(White_); - - if (!highlighted) - UISetColor(Black_); - [origin_ drawAtPoint:CGPointMake(52, 8) forWidth:(width - 61) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation]; - - if (!highlighted) - UISetColor(Gray_); - [label_ drawAtPoint:CGPointMake(52, 29) forWidth:(width - 61) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation]; -} - -@end -/* }}} */ -/* Source Controller {{{ */ -@interface SourceController : FilteredPackageListController { - _transient Source *source_; - _H key_; -} - -- (id) initWithDatabase:(Database *)database source:(Source *)source; - -@end - -@implementation SourceController - -- (NSURL *) referrerURL { - return [NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/sources/%@", UI_, [key_ stringByAddingPercentEscapesIncludingReserved]]]; -} - -- (NSURL *) navigationURL { - return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sources/%@", [key_ stringByAddingPercentEscapesIncludingReserved]]]; -} + [icon_ drawInRect:rect]; + } -- (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]; - } return self; -} + if (highlighted && kCFCoreFoundationVersionNumber < 800) + UISetColor(White_); -- (void) reloadData { - source_ = [database_ sourceWithKey:key_]; - key_ = [source_ key]; - [self setObject:source_]; + if (!highlighted) + UISetColor(Black_); + [origin_ drawAtPoint:CGPointMake(52, 8) forWidth:(width - 61) withFont:Font18Bold_ lineBreakMode:NSLineBreakByTruncatingTail]; - [[self navigationItem] setTitle:[source_ label]]; + if (!highlighted) + UISetColor(Gray_); + [label_ drawAtPoint:CGPointMake(52, 29) forWidth:(width - 61) withFont:Font12_ lineBreakMode:NSLineBreakByTruncatingTail]; +} - [super reloadData]; +- (void) setFetch:(NSNumber *)fetch { + if ([fetch boolValue]) + [indicator_ startAnimating]; + else + [indicator_ stopAnimating]; } @end @@ -8586,10 +8189,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi _H hud_; _H error_; - //NSURLConnection *installer_; NSURLConnection *trivial_bz2_; NSURLConnection *trivial_gz_; - //NSURLConnection *automatic_; BOOL cydia_; } @@ -8610,10 +8211,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } - (void) dealloc { - //[self _releaseConnection:installer_]; [self _releaseConnection:trivial_gz_]; [self _releaseConnection:trivial_bz2_]; - //[self _releaseConnection:automatic_]; [super dealloc]; } @@ -8628,57 +8227,70 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } - (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { - return 1; + return 2; } - (NSString *) tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section { + if (section == 1) + return UCLocalize("INDIVIDUAL_SOURCES"); return nil; } - (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return [sources_ count]; + switch (section) { + case 0: return 1; + case 1: return [sources_ count]; + default: return 0; + } } - (Source *) sourceAtIndexPath:(NSIndexPath *)indexPath { @synchronized (database_) { if ([database_ era] != era_) return nil; - + if ([indexPath section] != 1) + return nil; NSUInteger index([indexPath row]); - return index < [sources_ count] ? [sources_ objectAtIndex:index] : nil; + if (index >= [sources_ count]) + return nil; + return [sources_ objectAtIndex:index]; } } - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { static NSString *cellIdentifier = @"SourceCell"; SourceCell *cell = (SourceCell *) [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; - if(cell == nil) cell = [[[SourceCell alloc] initWithFrame:CGRectZero reuseIdentifier:cellIdentifier] autorelease]; - [cell setSource:[self sourceAtIndexPath:indexPath]]; + if (cell == nil) cell = [[[SourceCell alloc] initWithFrame:CGRectZero reuseIdentifier:cellIdentifier] autorelease]; [cell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator]; + Source *source([self sourceAtIndexPath:indexPath]); + if (source == nil) + [cell setAllSource]; + else + [cell setSource:source]; + return cell; } - (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - Source *source = [self sourceAtIndexPath:indexPath]; - if (source == nil) return; - - SourceController *controller = [[[SourceController alloc] + SectionsController *controller([[[SectionsController alloc] initWithDatabase:database_ - source:source - ] autorelease]; + source:[self sourceAtIndexPath:indexPath] + ] autorelease]); [controller setDelegate:delegate_]; - [[self navigationController] pushViewController:controller animated:YES]; } - (BOOL) tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { + if ([indexPath section] != 1) + return false; Source *source = [self sourceAtIndexPath:indexPath]; return [source record] != nil; } - (void) tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { + _assert([indexPath section] == 1); if (editingStyle == UITableViewCellEditingStyleDelete) { Source *source = [self sourceAtIndexPath:indexPath]; if (source == nil) return; @@ -8691,6 +8303,10 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } } +- (void) tableView:(UITableView *)tableView didEndEditingRowAtIndexPath:(NSIndexPath *)indexPath { + [self updateButtonsForEditingStatusAnimated:YES]; +} + - (void) complete { [delegate_ addTrivialSource:href_]; href_ = nil; @@ -8843,7 +8459,21 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi case 1: { NSString *href = [[alert textField] text]; - //installer_ = [[self _requestHRef:href method:@"GET"] retain]; + static Pcre href_r("^http(s?)://[^# ]*$"); + if (!href_r(href)) { + UIAlertView *alert = [[[UIAlertView alloc] + initWithTitle:Error_ + message:UCLocalize("INVALID_URL") + delegate:self + cancelButtonTitle:UCLocalize("OK") + otherButtonTitles:nil + ] autorelease]; + + [alert setContext:@"badurl"]; + [alert show]; + + break; + } if (![href hasSuffix:@"/"]) href_ = [href stringByAppendingString:@"/"]; @@ -8852,7 +8482,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.bz2"] method:@"HEAD"] retain]; trivial_gz_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.gz"] method:@"HEAD"] retain]; - //trivial_bz2_ = [[self _requestHRef:[href stringByAppendingString:@"dists/Release"] method:@"HEAD"] retain]; cydia_ = false; @@ -8889,6 +8518,39 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } } +- (void) updateButtonsForEditingStatusAnimated:(BOOL)animated { + BOOL editing([list_ isEditing]); + + if (editing) + [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("ADD") + style:UIBarButtonItemStylePlain + target:self + action:@selector(addButtonClicked) + ] autorelease] animated:animated]; + else if ([delegate_ updating]) + [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("CANCEL") + style:UIBarButtonItemStyleDone + target:self + action:@selector(cancelButtonClicked) + ] autorelease] animated:animated]; + else + [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("REFRESH") + style:UIBarButtonItemStylePlain + target:self + action:@selector(refreshButtonClicked) + ] autorelease] animated:animated]; + + [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:(editing ? UCLocalize("DONE") : UCLocalize("EDIT")) + style:(editing ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain) + target:self + action:@selector(editButtonClicked) + ] autorelease] animated:animated]; +} + - (void) loadView { list_ = [[[UITableView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame] style:UITableViewStylePlain] autorelease]; [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; @@ -8928,6 +8590,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi - (void) reloadData { [super reloadData]; + [self updateButtonsForEditingStatusAnimated:YES]; @synchronized (database_) { era_ = [database_ era]; @@ -8979,34 +8642,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi [self showAddSourcePrompt]; } -- (void) updateButtonsForEditingStatusAnimated:(BOOL)animated { - BOOL editing([list_ isEditing]); - - [[self navigationItem] setLeftBarButtonItem:(editing ? [[[UIBarButtonItem alloc] - initWithTitle:UCLocalize("ADD") - style:UIBarButtonItemStylePlain - target:self - action:@selector(addButtonClicked) - ] autorelease] : [[self navigationItem] backBarButtonItem]) animated:animated]; - - [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc] - initWithTitle:(editing ? UCLocalize("DONE") : UCLocalize("EDIT")) - style:(editing ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain) - target:self - action:@selector(editButtonClicked) - ] autorelease] animated:animated]; - - if (IsWildcat_ && !editing) - [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] - initWithTitle:UCLocalize("SETTINGS") - style:UIBarButtonItemStylePlain - target:self - action:@selector(settingsButtonClicked) - ] autorelease]]; +- (void) refreshButtonClicked { + if ([delegate_ requestUpdate]) + [self updateButtonsForEditingStatusAnimated:YES]; } -- (void) settingsButtonClicked { - [delegate_ showSettings]; +- (void) cancelButtonClicked { + [delegate_ cancelUpdate]; } - (void) editButtonClicked { @@ -9017,200 +8659,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi @end /* }}} */ -/* Settings Controller {{{ */ -@interface SettingsController : CyteViewController < - UITableViewDataSource, - UITableViewDelegate -> { - _transient Database *database_; - // XXX: ok, "roledelegate_"?... - _transient id roledelegate_; - _H table_; - _H segment_; - _H container_; -} - -- (void) showDoneButton; -- (void) resizeSegmentedControl; - -@end - -@implementation SettingsController - -- (void) loadView { - table_ = [[[UITableView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame] style:UITableViewStyleGrouped] autorelease]; - [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; - [table_ setDelegate:self]; - [(UITableView *) table_ setDataSource:self]; - [self setView:table_]; - - NSArray *items = [NSArray arrayWithObjects: - UCLocalize("USER"), - UCLocalize("HACKER"), - UCLocalize("DEVELOPER"), - nil]; - 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) viewDidLoad { - [super viewDidLoad]; - - [[self navigationItem] setTitle:UCLocalize("WHO_ARE_YOU")]; - - int index = -1; - if ([Role_ isEqualToString:@"User"]) index = 0; - if ([Role_ isEqualToString:@"Hacker"]) index = 1; - if ([Role_ isEqualToString:@"Developer"]) index = 2; - if (index != -1) { - [segment_ setSelectedSegmentIndex:index]; - [self showDoneButton]; - } - - [segment_ addTarget:self action:@selector(segmentChanged:) forControlEvents:UIControlEventValueChanged]; - [self resizeSegmentedControl]; -} - -- (void) releaseSubviews { - table_ = nil; - segment_ = nil; - container_ = nil; - - [super releaseSubviews]; -} - -- (id) initWithDatabase:(Database *)database delegate:(id)delegate { - if ((self = [super init]) != nil) { - database_ = database; - roledelegate_ = delegate; - } return self; -} - -- (void) resizeSegmentedControl { - CGFloat width = [[self view] frame].size.width; - [segment_ setFrame:CGRectMake(width / 32.0f, 0, width - (width / 32.0f * 2.0f), 44.0f)]; -} - -- (void) viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self resizeSegmentedControl]; -} - -- (void) viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - [segment_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleLeftMargin)]; - [self resizeSegmentedControl]; -} - -- (void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration { - [self resizeSegmentedControl]; -} - -- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { - [self resizeSegmentedControl]; -} - -- (void) save { - NSString *role(nil); - - switch ([segment_ selectedSegmentIndex]) { - case 0: role = @"User"; break; - case 1: role = @"Hacker"; break; - case 2: role = @"Developer"; break; - - _nodefault - } - - if (![role isEqualToString:Role_]) { - bool rolling(Role_ == nil); - Role_ = role; - - Settings_ = [NSMutableDictionary dictionaryWithObjectsAndKeys: - Role_, @"Role", - nil]; - - [Metadata_ setObject:Settings_ forKey:@"Settings"]; - Changed_ = true; - - if (rolling) - [roledelegate_ loadData]; - else - [roledelegate_ updateData]; - } -} - -- (void) segmentChanged:(UISegmentedControl *)control { - [self showDoneButton]; -} - -- (void) saveAndClose { - [self save]; - - [[self navigationItem] setRightBarButtonItem:nil]; - [[self navigationController] dismissModalViewControllerAnimated:YES]; -} - -- (void) doneButtonClicked { - UIActivityIndicatorView *spinner = [[[UIActivityIndicatorView alloc] initWithFrame:CGRectMake(0, 0, 20.0f, 20.0f)] autorelease]; - [spinner startAnimating]; - UIBarButtonItem *spinItem = [[[UIBarButtonItem alloc] initWithCustomView:spinner] autorelease]; - [[self navigationItem] setRightBarButtonItem:spinItem]; - - [self performSelector:@selector(saveAndClose) withObject:nil afterDelay:0]; -} - -- (void) showDoneButton { - [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc] - initWithTitle:UCLocalize("DONE") - style:UIBarButtonItemStyleDone - target:self - action:@selector(doneButtonClicked) - ] autorelease] animated:([[self navigationItem] rightBarButtonItem] == nil)]; -} - -- (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { - // XXX: For not having a single cell in the table, this sure is a lot of sections. - return 6; -} - -- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return 0; // :( -} - -- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - return nil; // This method is required by the protocol. -} - -- (NSString *) tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section { - if (section == 1) - return UCLocalize("ROLE_EX"); - if (section == 4) - return [NSString stringWithFormat: - @"%@: %@\n%@: %@\n%@: %@", - UCLocalize("USER"), UCLocalize("USER_EX"), - UCLocalize("HACKER"), UCLocalize("HACKER_EX"), - UCLocalize("DEVELOPER"), UCLocalize("DEVELOPER_EX") - ]; - else return nil; -} - -- (CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - return section == 3 ? 44.0f : 0; -} - -- (UIView *) tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - return section == 3 ? container_ : nil; -} - -- (void) reloadData { - [super reloadData]; - - [table_ reloadData]; -} - -@end -/* }}} */ /* Stash Controller {{{ */ @interface StashController : CyteViewController { _H spinner_; @@ -9250,7 +8698,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi [caption_ setTextColor:[UIColor whiteColor]]; [caption_ setBackgroundColor:[UIColor clearColor]]; [caption_ setShadowColor:[UIColor blackColor]]; - [caption_ setTextAlignment:UITextAlignmentCenter]; + [caption_ setTextAlignment:NSTextAlignmentCenter]; [view addSubview:caption_]; CGRect statusrect; @@ -9265,7 +8713,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi [status_ setTextColor:[UIColor whiteColor]]; [status_ setBackgroundColor:[UIColor clearColor]]; [status_ setShadowColor:[UIColor blackColor]]; - [status_ setTextAlignment:UITextAlignmentCenter]; + [status_ setTextAlignment:NSTextAlignmentCenter]; [view addSubview:status_]; } @@ -9335,7 +8783,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi UITabBarControllerDelegate > { _H window_; - _H tabbar_; + _H tabbar_; _H emulated_; _H essential_; @@ -9381,6 +8829,30 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi [tabbar_ beginUpdate]; } +- (void) cancelUpdate { + [tabbar_ cancelUpdate]; +} + +- (bool) requestUpdate { + if (IsReachable("cydia.saurik.com")) { + [self beginUpdate]; + return true; + } else { + UIAlertView *alert = [[[UIAlertView alloc] + initWithTitle:[NSString stringWithFormat:Colon_, Error_, UCLocalize("REFRESH")] + message:@"Host Unreachable" // XXX: Localize + delegate:self + cancelButtonTitle:UCLocalize("OK") + otherButtonTitles:nil + ] autorelease]; + + [alert setContext:@"norefresh"]; + [alert show]; + + return false; + } +} + - (BOOL) updating { return [tabbar_ updating]; } @@ -9510,6 +8982,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } - (void) reloadDataWithInvocation:(NSInvocation *)invocation { +_profile(reloadDataWithInvocation) @synchronized (self) { UIProgressHUD *hud(loaded_ ? [self addProgressHUD] : nil); if (hud != nil) @@ -9522,6 +8995,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi [essential_ removeAllObjects]; [broken_ removeAllObjects]; + _profile(reloadDataWithInvocation$Essential) NSArray *packages([database_ packages]); for (Package *package in packages) { if ([package half]) @@ -9532,6 +9006,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi ++changes; } } + _end UITabBarItem *changesItem = [[[tabbar_ viewControllers] objectAtIndex:2] tabBarItem]; if (changes != 0) { @@ -9551,7 +9026,11 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi if (hud != nil) [self removeProgressHUD:hud]; -} } +} +_end + + PrintTimes(); +} - (void) updateData { [self _updateData]; @@ -9572,10 +9051,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi if (emulated_ == nil) return; - [window_ addSubview:[tabbar_ view]]; if ([window_ respondsToSelector:@selector(setRootViewController:)]) [window_ setRootViewController:tabbar_]; - [[emulated_ view] removeFromSuperview]; + else { + [window_ addSubview:[tabbar_ view]]; + [[emulated_ view] removeFromSuperview]; + } + emulated_ = nil; [window_ setUserInteractionEnabled:YES]; } @@ -9754,10 +9236,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi [self unlockSuspend]; } -- (void) showSettings { - [self presentModalViewController:[[[SettingsController alloc] initWithDatabase:database_ delegate:self] autorelease] force:NO]; -} - - (void) retainNetworkActivityIndicator { if (activity_++ == 0) [self setNetworkActivityIndicatorVisible:YES]; @@ -9866,6 +9344,9 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi return false; } + if ([tabbar_ modalViewController] != nil) + return false; + // Use external process status API internally. // This is probably a really bad idea. // XXX: what is the point of this? does this solve anything at all? @@ -9957,14 +9438,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi NSString *destination = [[url absoluteString] substringFromIndex:([scheme length] + [@"://" length] + [base length] + [@"/" length])]; controller = [[[CydiaWebViewController alloc] initWithURL:[NSURL URLWithString:destination]] autorelease]; } else if (!external && [components count] == 1) { - if ([base isEqualToString:@"manage"]) { - controller = [[[ManageController alloc] init] autorelease]; - } - - if ([base isEqualToString:@"storage"]) { - controller = [[[CydiaWebViewController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/storage/", UI_]]] autorelease]; - } - if ([base isEqualToString:@"sources"]) { controller = [[[SourcesController alloc] initWithDatabase:database_] autorelease]; } @@ -9974,7 +9447,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } if ([base isEqualToString:@"sections"]) { - controller = [[[SectionsController alloc] initWithDatabase:database_] autorelease]; + controller = [[[SectionsController alloc] initWithDatabase:database_ source:nil] autorelease]; } if ([base isEqualToString:@"search"]) { @@ -9989,20 +9462,20 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi controller = [[[InstalledController alloc] initWithDatabase:database_] autorelease]; } } else if ([components count] == 2) { - NSString *argument = [components objectAtIndex:1]; + NSString *argument = [[components objectAtIndex:1] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; if ([base isEqualToString:@"package"]) { controller = [self pageForPackage:argument withReferrer:referrer]; } if (!external && [base isEqualToString:@"search"]) { - controller = [[[SearchController alloc] initWithDatabase:database_ query:[argument stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]] autorelease]; + controller = [[[SearchController alloc] initWithDatabase:database_ query:argument] autorelease]; } if (!external && [base isEqualToString:@"sections"]) { - if ([argument isEqualToString:@"all"]) + if ([argument isEqualToString:@"all"] || [argument isEqualToString:@"*"]) argument = nil; - controller = [[[SectionController alloc] initWithDatabase:database_ section:[argument stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]] autorelease]; + controller = [[[SectionController alloc] initWithDatabase:database_ source:nil section:argument] autorelease]; } if (!external && [base isEqualToString:@"sources"]) { @@ -10010,8 +9483,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi controller = [[[SourcesController alloc] initWithDatabase:database_] autorelease]; [(SourcesController *)controller showAddSourcePrompt]; } else { - Source *source = [database_ sourceWithKey:[argument stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; - controller = [[[SourceController alloc] initWithDatabase:database_ source:source] autorelease]; + Source *source([database_ sourceWithKey:argument]); + controller = [[[SectionsController alloc] initWithDatabase:database_ source:source] autorelease]; } } @@ -10020,8 +9493,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi return nil; } } else if (!external && [components count] == 3) { - NSString *arg1 = [components objectAtIndex:1]; - NSString *arg2 = [components objectAtIndex:2]; + NSString *arg1 = [[components objectAtIndex:1] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + NSString *arg2 = [[components objectAtIndex:2] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; if ([base isEqualToString:@"package"]) { if ([arg2 isEqualToString:@"settings"]) { @@ -10033,6 +9506,12 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } } } + + if ([base isEqualToString:@"sections"]) { + Source *source([arg1 isEqualToString:@"*"] ? nil : [database_ sourceWithKey:arg1]); + NSString *section([arg2 isEqualToString:@"*"] ? nil : arg2); + controller = [[[SectionController alloc] initWithDatabase:database_ source:source section:section] autorelease]; + } } [controller setDelegate:self]; @@ -10130,44 +9609,31 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi if (pid == 0) { execlp("launchctl", "launchctl", "stop", "com.apple.SpringBoard", NULL); perror("launchctl stop"); - exit(0); - } - ReapZombie(pid); + exit(0); + } ReapZombie(pid); } - (void) setupViewControllers { - tabbar_ = [[[CYTabBarController alloc] initWithDatabase:database_] autorelease]; + tabbar_ = [[[CydiaTabBarController alloc] initWithDatabase:database_] autorelease]; NSMutableArray *items; if (kCFCoreFoundationVersionNumber < 800) { items = [NSMutableArray arrayWithObjects: [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home.png"] tag:0] autorelease], - [[[UITabBarItem alloc] initWithTitle:UCLocalize("SECTIONS") image:[UIImage applicationImageNamed:@"install.png"] tag:0] autorelease], - [[[UITabBarItem alloc] initWithTitle:(AprilFools_ ? @"Timeline" : UCLocalize("CHANGES")) image:[UIImage applicationImageNamed:@"changes.png"] tag:0] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage applicationImageNamed:@"install.png"] tag:0] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage applicationImageNamed:@"changes.png"] tag:0] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage applicationImageNamed:@"manage.png"] tag:0] autorelease], [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage applicationImageNamed:@"search.png"] tag:0] autorelease], nil]; - - if (IsWildcat_) { - [items insertObject:[[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage applicationImageNamed:@"source.png"] tag:0] autorelease] atIndex:3]; - [items insertObject:[[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage applicationImageNamed:@"manage.png"] tag:0] autorelease] atIndex:3]; - } else { - [items insertObject:[[[UITabBarItem alloc] initWithTitle:UCLocalize("MANAGE") image:[UIImage applicationImageNamed:@"manage.png"] tag:0] autorelease] atIndex:3]; - } } else { items = [NSMutableArray arrayWithObjects: [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home7.png"] selectedImage:[UIImage applicationImageNamed:@"home7s.png"]] autorelease], - [[[UITabBarItem alloc] initWithTitle:UCLocalize("SECTIONS") image:[UIImage applicationImageNamed:@"install7.png"] selectedImage:[UIImage applicationImageNamed:@"install7s.png"]] autorelease], - [[[UITabBarItem alloc] initWithTitle:(AprilFools_ ? @"Timeline" : UCLocalize("CHANGES")) image:[UIImage applicationImageNamed:@"changes7.png"] selectedImage:[UIImage applicationImageNamed:@"changes7s.png"]] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage applicationImageNamed:@"install7.png"] selectedImage:[UIImage applicationImageNamed:@"install7s.png"]] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage applicationImageNamed:@"changes7.png"] selectedImage:[UIImage applicationImageNamed:@"changes7s.png"]] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage applicationImageNamed:@"manage7.png"] selectedImage:[UIImage applicationImageNamed:@"manage7s.png"]] autorelease], [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage applicationImageNamed:@"search7.png"] selectedImage:[UIImage applicationImageNamed:@"search7s.png"]] autorelease], nil]; - - if (IsWildcat_) { - [items insertObject:[[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage applicationImageNamed:@"source7.png"] selectedImage:[UIImage applicationImageNamed:@"source7s.png"]] autorelease] atIndex:3]; - [items insertObject:[[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage applicationImageNamed:@"manage7.png"] selectedImage:[UIImage applicationImageNamed:@"manage7s.png"]] autorelease] atIndex:3]; - } else { - [items insertObject:[[[UITabBarItem alloc] initWithTitle:UCLocalize("MANAGE") image:[UIImage applicationImageNamed:@"manage7.png"] selectedImage:[UIImage applicationImageNamed:@"manage7s.png"]] autorelease] atIndex:3]; - } } NSMutableArray *controllers([NSMutableArray array]); @@ -10228,6 +9694,7 @@ _trace(); Font12_ = [UIFont systemFontOfSize:12]; Font12Bold_ = [UIFont boldSystemFontOfSize:12]; Font14_ = [UIFont systemFontOfSize:14]; + Font18_ = [UIFont systemFontOfSize:18]; Font18Bold_ = [UIFont boldSystemFontOfSize:18]; Font22Bold_ = [UIFont boldSystemFontOfSize:22]; @@ -10283,9 +9750,10 @@ _trace(); [self setupViewControllers]; emulated_ = [[[CydiaLoadingViewController alloc] init] autorelease]; - [window_ addSubview:[emulated_ view]]; if ([window_ respondsToSelector:@selector(setRootViewController:)]) [window_ setRootViewController:emulated_]; + else + [window_ addSubview:[emulated_ view]]; [self performSelector:@selector(loadData) withObject:nil afterDelay:0]; _trace(); @@ -10294,34 +9762,21 @@ _trace(); - (NSArray *) defaultStartPages { NSMutableArray *standard = [NSMutableArray array]; [standard addObject:[NSArray arrayWithObject:@"cydia://home"]]; - [standard addObject:[NSArray arrayWithObject:@"cydia://sections"]]; + [standard addObject:[NSArray arrayWithObject:@"cydia://sources"]]; [standard addObject:[NSArray arrayWithObject:@"cydia://changes"]]; - if (!IsWildcat_) { - [standard addObject:[NSArray arrayWithObject:@"cydia://manage"]]; - } else { - [standard addObject:[NSArray arrayWithObject:@"cydia://installed"]]; - [standard addObject:[NSArray arrayWithObject:@"cydia://sources"]]; - } + [standard addObject:[NSArray arrayWithObject:@"cydia://installed"]]; [standard addObject:[NSArray arrayWithObject:@"cydia://search"]]; return standard; } - (void) loadData { _trace(); - if (Role_ == nil) { - [window_ setUserInteractionEnabled:YES]; - [self showSettings]; - return; - } else { - if ([emulated_ modalViewController] != nil) - [emulated_ dismissModalViewControllerAnimated:YES]; - [window_ setUserInteractionEnabled:NO]; - } + if ([emulated_ modalViewController] != nil) + [emulated_ dismissModalViewControllerAnimated:YES]; + [window_ setUserInteractionEnabled:NO]; [self reloadDataWithInvocation:nil]; [self refreshIfPossible]; - PrintTimes(); - [self disemulate]; int savedIndex = [[Metadata_ objectForKey:@"InterfaceIndex"] intValue]; @@ -10384,7 +9839,7 @@ _trace(); // (Try to) show the startup URL. if (starturl_ != nil) { - [self openCydiaURL:starturl_ forExternal:NO]; + [self openCydiaURL:starturl_ forExternal:YES]; starturl_ = nil; } } @@ -10448,10 +9903,15 @@ Class $CFXPreferencesPropertyListSource; MSHook(BOOL, CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync, CFXPreferencesPropertyListSource *self, SEL _cmd) { NSURL *&url(MSHookIvar(self, "_url")), *old(url); NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); + url = MobilizeURL(url); - BOOL value(_CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync(self, _cmd)); - //NSLog(@"%@ %s", [url absoluteString], value ? "YES" : "NO"); - url = old; + BOOL value; @try { + value = _CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync(self, _cmd); + //NSLog(@"CFX %@ %s", [url absoluteString], value ? "YES" : "NO"); + } @finally { + url = old; + } + [pool release]; return value; } @@ -10459,10 +9919,15 @@ MSHook(BOOL, CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync, MSHook(void *, CFXPreferencesPropertyListSource$createPlistFromDisk, CFXPreferencesPropertyListSource *self, SEL _cmd) { NSURL *&url(MSHookIvar(self, "_url")), *old(url); NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); + url = MobilizeURL(url); - void *value(_CFXPreferencesPropertyListSource$createPlistFromDisk(self, _cmd)); - //NSLog(@"%@ %@", [url absoluteString], value); - url = old; + void *value; @try { + value = _CFXPreferencesPropertyListSource$createPlistFromDisk(self, _cmd); + //NSLog(@"CFX %@ %@", [url absoluteString], value); + } @finally { + url = old; + } + [pool release]; return value; } @@ -10582,7 +10047,9 @@ int main(int argc, char *argv[]) { if (Method method = class_getInstanceMethod($WAKWindow, @selector(screenSize))) method_setImplementation(method, (IMP) &$WAKWindow$screenSize); - $CFXPreferencesPropertyListSource = objc_getClass("CFXPreferencesPropertyListSource"); + $CFXPreferencesPropertyListSource = objc_getClass("CFXPreferencesPropertyListSourceSynchronizer"); + if ($CFXPreferencesPropertyListSource == Nil) + $CFXPreferencesPropertyListSource = objc_getClass("CFXPreferencesPropertyListSource"); Method CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync(class_getInstanceMethod($CFXPreferencesPropertyListSource, @selector(_backingPlistChangedSinceLastSync))); if (CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync != NULL) { @@ -10638,6 +10105,44 @@ int main(int argc, char *argv[]) { std::setlocale(LC_ALL, lang); } /* }}} */ + /* Index Collation {{{ */ + if (Class $UILocalizedIndexedCollation = objc_getClass("UILocalizedIndexedCollation")) { + NSBundle *bundle([NSBundle bundleForClass:$UILocalizedIndexedCollation]); + NSString *path([bundle pathForResource:@"UITableViewLocalizedSectionIndex" ofType:@"plist"]); + //path = @"/System/Library/Frameworks/UIKit.framework/.lproj/UITableViewLocalizedSectionIndex.plist"; + NSDictionary *dictionary([NSDictionary dictionaryWithContentsOfFile:path]); + _H collation([[[UILocalizedIndexedCollation alloc] initWithDictionary:dictionary] autorelease]); + + CollationLocale_ = MSHookIvar(collation, "_locale"); + + CollationThumbs_ = [collation sectionIndexTitles]; + for (size_t index(0), end([CollationThumbs_ count]); index != end; ++index) + CollationOffset_.push_back([collation sectionForSectionIndexTitleAtIndex:index]); + + CollationTitles_ = [collation sectionTitles]; + CollationStarts_ = MSHookIvar(collation, "_sectionStartStrings"); + + NSString *&transform(MSHookIvar(collation, "_transform")); + if (&transform != NULL && transform != nil) { + /*if ([collation respondsToSelector:@selector(transformedCollationStringForString:)]) + CollationModify_ = [=](NSString *value) { return [collation transformedCollationStringForString:value]; };*/ + const UChar *uid(reinterpret_cast([transform cStringUsingEncoding:NSUnicodeStringEncoding])); + UErrorCode code(U_ZERO_ERROR); + CollationTransl_ = utrans_openU(uid, -1, UTRANS_FORWARD, NULL, 0, NULL, &code); + if (!U_SUCCESS(code)) + NSLog(@"%s", u_errorName(code)); + } + } else { + CollationLocale_ = [[[NSLocale alloc] initWithLocaleIdentifier:@"en@collation=dictionary"] autorelease]; + + CollationThumbs_ = [NSArray arrayWithObjects:@"A",@"B",@"C",@"D",@"E",@"F",@"G",@"H",@"I",@"J",@"K",@"L",@"M",@"N",@"O",@"P",@"Q",@"R",@"S",@"T",@"U",@"V",@"W",@"X",@"Y",@"Z",@"#",nil]; + for (NSInteger offset(0); offset != 28; ++offset) + CollationOffset_.push_back(offset); + + CollationTitles_ = [NSArray arrayWithObjects:@"A",@"B",@"C",@"D",@"E",@"F",@"G",@"H",@"I",@"J",@"K",@"L",@"M",@"N",@"O",@"P",@"Q",@"R",@"S",@"T",@"U",@"V",@"W",@"X",@"Y",@"Z",@"#",nil]; + CollationStarts_ = [NSArray arrayWithObjects:@"a",@"b",@"c",@"d",@"e",@"f",@"g",@"h",@"i",@"j",@"k",@"l",@"m",@"n",@"o",@"p",@"q",@"r",@"s",@"t",@"u",@"v",@"w",@"x",@"y",@"z",@"ʒ",nil]; + } + /* }}} */ apr_app_initialize(&argc, const_cast(&argv), NULL); @@ -10758,9 +10263,6 @@ int main(int argc, char *argv[]) { Version_ = [Metadata_ objectForKey:@"Version"]; } - if (Settings_ != nil) - Role_ = [Settings_ objectForKey:@"Role"]; - if (Values_ == nil) { Values_ = [[[NSMutableDictionary alloc] initWithCapacity:4] autorelease]; [Metadata_ setObject:Values_ forKey:@"Values"]; @@ -10794,6 +10296,16 @@ int main(int argc, char *argv[]) { Changed_ = true; } + + _H broken([NSMutableArray array]); + for (NSString *key in (id) Sources_) + if ([key rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:@"# "]].location != NSNotFound) + [broken addObject:key]; + if ([broken count] != 0) { + for (NSString *key in (id) broken) + [Sources_ removeObjectForKey:key]; + Changed_ = true; + } broken = nil; /* }}} */ CydiaWriteSources(); @@ -10893,7 +10405,6 @@ int main(int argc, char *argv[]) { BOOL (*GSSystemHasCapability)(CFStringRef) = reinterpret_cast(dlsym(RTLD_DEFAULT, symbol)); bool fast = GSSystemHasCapability != NULL && GSSystemHasCapability(CFSTR("armv7")); - ShowPromoted_ = fast; PulseInterval_ = fast ? 50000 : 500000; Colon_ = UCLocalize("COLON_DELIMITED"); @@ -10901,8 +10412,6 @@ int main(int argc, char *argv[]) { Error_ = UCLocalize("ERROR"); Warning_ = UCLocalize("WARNING"); - AprilFools_ = false; - _trace(); int value(UIApplicationMain(argc, argv, @"Cydia", @"Cydia"));