X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/677b84159eed7faf5ae2b7683e987f856d3cc252..185f1f6fb02a64bbadb68cfe47c23a063a644f9b:/Cydia.mm?ds=sidebyside diff --git a/Cydia.mm b/Cydia.mm index 084d6c5f..bac29757 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -1,5 +1,5 @@ /* Cydia - iPhone UIKit Front-End for Debian APT - * Copyright (C) 2008 Jay Freeman (saurik) + * Copyright (C) 2008-2009 Jay Freeman (saurik) */ /* @@ -39,7 +39,8 @@ #define USE_SYSTEM_MALLOC 1 /* #include Directives {{{ */ -#import "UICaboodle.h" +#import "UICaboodle/UCPlatform.h" +#import "UICaboodle/UCLocalize.h" #include #include @@ -49,10 +50,15 @@ #include #include +#if 0 +#define DEPLOYMENT_TARGET_MACOSX 1 +#define CF_BUILDING_CF 1 +#include +#endif + #include #include -#import #import #include @@ -81,6 +87,7 @@ #include #include #include +#include #include @@ -106,8 +113,8 @@ extern "C" { #include -#import "BrowserView.h" -#import "ResetView.h" +#import "UICaboodle/BrowserView.h" +#import "UICaboodle/ResetView.h" #import "substrate.h" /* }}} */ @@ -209,6 +216,11 @@ class _H { } public: + _finline _H(const This_ &rhs) : + value_(rhs.value_ == nil ? nil : [rhs.value_ retain]) + { + } + _finline _H(Type_ *value = NULL, bool mended = false) : value_(value) { @@ -220,12 +232,18 @@ class _H { Clear_(); } + _finline operator Type_ *() const { + return value_; + } + _finline This_ &operator =(Type_ *value) { if (value_ != value) { - Clear_(); + Type_ *old(value_); value_ = value; Retain_(); - } return this; + if (old != nil) + [old release]; + } return *this; } }; /* }}} */ @@ -326,8 +344,6 @@ static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | #endif /* }}} */ -extern NSString * const kCAFilterNearest; - /* Information Dictionaries {{{ */ @interface NSMutableArray (Cydia) - (void) addInfoDictionary:(NSDictionary *)info; @@ -390,9 +406,12 @@ extern NSString * const kCAFilterNearest; #define lprintf(args...) fprintf(stderr, args) -#define ForRelease 0 +#define ForRelease 1 +#define TraceLogging (1 && !ForRelease) +#define HistogramInsertionSort (0 && !ForRelease) +#define ProfileTimes (0 && !ForRelease) #define ForSaurik (0 && !ForRelease) -#define LogBrowser (0 && !ForRelease) +#define LogBrowser (1 && !ForRelease) #define TrackResize (0 && !ForRelease) #define ManualRefresh (1 && !ForRelease) #define ShowInternals (0 && !ForRelease) @@ -400,9 +419,12 @@ extern NSString * const kCAFilterNearest; #define RecycleWebViews 0 #define AlwaysReload (1 && !ForRelease) -#if ForRelease +#if !TraceLogging #undef _trace #define _trace(args...) +#endif + +#if !ProfileTimes #undef _profile #define _profile(name) { #undef _end @@ -411,9 +433,11 @@ extern NSString * const kCAFilterNearest; #endif /* Radix Sort {{{ */ +typedef uint32_t (*SKRadixFunction)(id, void *); + @interface NSMutableArray (Radix) - (void) radixSortUsingSelector:(SEL)selector withObject:(id)object; -- (void) radixSortUsingFunction:(uint32_t (*)(id, void *))function withArgument:(void *)argument; +- (void) radixSortUsingFunction:(SKRadixFunction)function withContext:(void *)argument; @end struct RadixItem_ { @@ -473,11 +497,22 @@ static void RadixSort_(NSMutableArray *self, size_t count, struct RadixItem_ *sw @implementation NSMutableArray (Radix) - (void) radixSortUsingSelector:(SEL)selector withObject:(id)object { + size_t count([self count]); + if (count == 0) + return; + +#if 0 NSInvocation *invocation([NSInvocation invocationWithMethodSignature:[NSMethodSignature signatureWithObjCTypes:"L12@0:4@8"]]); [invocation setSelector:selector]; [invocation setArgument:&object atIndex:2]; +#else + /* XXX: this is an unsafe optimization of doomy hell */ + Method method(class_getInstanceMethod([[self objectAtIndex:0] class], selector)); + _assert(method != NULL); + uint32_t (*imp)(id, SEL, id) = reinterpret_cast(method_getImplementation(method)); + _assert(imp != NULL); +#endif - size_t count([self count]); struct RadixItem_ *swap(new RadixItem_[count * 2]); for (size_t i(0); i != count; ++i) { @@ -485,16 +520,20 @@ static void RadixSort_(NSMutableArray *self, size_t count, struct RadixItem_ *sw item.index = i; id object([self objectAtIndex:i]); - [invocation setTarget:object]; +#if 0 + [invocation setTarget:object]; [invocation invoke]; [invocation getReturnValue:&item.key]; +#else + item.key = imp(object, selector, object); +#endif } RadixSort_(self, count, swap); } -- (void) radixSortUsingFunction:(uint32_t (*)(id, void *))function withArgument:(void *)argument { +- (void) radixSortUsingFunction:(SKRadixFunction)function withContext:(void *)argument { size_t count([self count]); struct RadixItem_ *swap(new RadixItem_[count * 2]); @@ -510,6 +549,77 @@ static void RadixSort_(NSMutableArray *self, size_t count, struct RadixItem_ *sw } @end +/* }}} */ +/* Insertion Sort {{{ */ + +CFIndex SKBSearch_(const void *element, CFIndex elementSize, const void *list, CFIndex count, CFComparatorFunction comparator, void *context) { + const char *ptr = (const char *)list; + while (0 < count) { + CFIndex half = count / 2; + const char *probe = ptr + elementSize * half; + CFComparisonResult cr = comparator(element, probe, context); + if (0 == cr) return (probe - (const char *)list) / elementSize; + ptr = (cr < 0) ? ptr : probe + elementSize; + count = (cr < 0) ? half : (half + (count & 1) - 1); + } + return (ptr - (const char *)list) / elementSize; +} + +CFIndex CFBSearch_(const void *element, CFIndex elementSize, const void *list, CFIndex count, CFComparatorFunction comparator, void *context) { + const char *ptr = (const char *)list; + while (0 < count) { + CFIndex half = count / 2; + const char *probe = ptr + elementSize * half; + CFComparisonResult cr = comparator(element, probe, context); + if (0 == cr) return (probe - (const char *)list) / elementSize; + ptr = (cr < 0) ? ptr : probe + elementSize; + count = (cr < 0) ? half : (half + (count & 1) - 1); + } + return (ptr - (const char *)list) / elementSize; +} + +void CFArrayInsertionSortValues(CFMutableArrayRef array, CFRange range, CFComparatorFunction comparator, void *context) { + if (range.length == 0) + return; + const void **values(new const void *[range.length]); + CFArrayGetValues(array, range, values); + +#if HistogramInsertionSort + uint32_t total(0), *offsets(new uint32_t[range.length]); +#endif + + for (CFIndex index(1); index != range.length; ++index) { + const void *value(values[index]); + //CFIndex correct(SKBSearch_(&value, sizeof(const void *), values, index, comparator, context)); + CFIndex correct(index); + while (comparator(value, values[correct - 1], context) == kCFCompareLessThan) + if (--correct == 0) + break; + if (correct != index) { + size_t offset(index - correct); +#if HistogramInsertionSort + total += offset; + ++offsets[offset]; + if (offset > 10) + NSLog(@"Heavy Insertion Displacement: %u = %@", offset, value); +#endif + memmove(values + correct + 1, values + correct, sizeof(const void *) * offset); + values[correct] = value; + } + } + + CFArrayReplaceValues(array, range, values, range.length); + delete [] values; + +#if HistogramInsertionSort + for (CFIndex index(0); index != range.length; ++index) + if (offsets[index] != 0) + NSLog(@"Insertion Displacement [%u]: %u", index, offsets[index]); + NSLog(@"Average Insertion Displacement: %f", double(total) / range.length); + delete [] offsets; +#endif +} + /* }}} */ /* Apple Bug Fixes {{{ */ @@ -644,12 +754,6 @@ NSUInteger DOMNodeList$countByEnumeratingWithState$objects$count$(DOMNodeList *s @end -static inline NSString *CYLocalizeEx(NSString *key, NSString *value = nil) { - return [[NSBundle mainBundle] localizedStringForKey:key value:value table:nil]; -} - -#define CYLocalize(key) CYLocalizeEx(@ key) - class CYString { private: char *data_; @@ -657,8 +761,10 @@ class CYString { CFStringRef cache_; _finline void clear_() { - if (cache_ != nil) + if (cache_ != NULL) { CFRelease(cache_); + cache_ = NULL; + } } public: @@ -682,7 +788,7 @@ class CYString { _finline CYString() : data_(0), size_(0), - cache_(nil) + cache_(NULL) { } @@ -706,8 +812,9 @@ class CYString { else { clear_(); - char *temp(reinterpret_cast(apr_palloc(pool, size))); + char *temp(reinterpret_cast(apr_palloc(pool, size + 1))); memcpy(temp, data, size); + temp[size] = '\0'; data_ = temp; size_ = size; } @@ -725,12 +832,16 @@ class CYString { return size_ == rhs.size_ && memcmp(data_, rhs.data_, size_) == 0; } - operator id() { + operator CFStringRef() { if (cache_ == NULL) { if (size_ == 0) return nil; cache_ = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(data_), size_, kCFStringEncodingUTF8, NO, kCFAllocatorNull); - } return (id) cache_; + } return cache_; + } + + _finline operator id() { + return (NSString *) static_cast(*this); } }; @@ -932,7 +1043,6 @@ static const int ButtonBarHeight_ = 48; static const float KeyboardTime_ = 0.3f; #define SpringBoard_ "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist" -#define SandboxTemplate_ "/usr/share/sandbox/SandboxTemplate.sb" #define NotifyConfig_ "/etc/notify.conf" static bool Queuing_; @@ -995,7 +1105,7 @@ NSString *GetLastUpdate() { NSDate *update = [Metadata_ objectForKey:@"LastUpdate"]; if (update == nil) - return CYLocalize("NEVER_OR_UNKNOWN"); + return UCLocalize("NEVER_OR_UNKNOWN"); CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle); CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update); @@ -1027,27 +1137,37 @@ NSString *SizeString(double size) { return [NSString stringWithFormat:@"%s%.1f %s", (negative ? "-" : ""), size, powers_[power]]; } -NSString *StripVersion(const char *version) { +static _finline CFStringRef CFCString(const char *value) { + return CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(value), strlen(value), kCFStringEncodingUTF8, NO, kCFAllocatorNull); +} + +const char *StripVersion_(const char *version) { const char *colon(strchr(version, ':')); if (colon != NULL) version = colon + 1; - return [NSString stringWithUTF8String:version]; + return version; } -NSString *StripVersion(NSString *version) { - NSRange colon = [version rangeOfString:@":"]; - if (colon.location != NSNotFound) - version = [version substringFromIndex:(colon.location + 1)]; - return version; +CFStringRef StripVersion(const char *version) { + const char *colon(strchr(version, ':')); + if (colon != NULL) + version = colon + 1; + return CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast(version), strlen(version), kCFStringEncodingUTF8, NO); + // XXX: performance + return CFCString(version); } NSString *LocalizeSection(NSString *section) { static Pcre title_r("^(.*?) \\((.*)\\)$"); - if (title_r(section)) - return [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), - LocalizeSection(title_r[1]), - LocalizeSection(title_r[2]) + if (title_r(section)) { + NSString *parent(title_r[1]); + NSString *child(title_r[2]); + + return [NSString stringWithFormat:UCLocalize("PARENTHETICAL"), + LocalizeSection(parent), + LocalizeSection(child) ]; + } return [[NSBundle mainBundle] localizedStringForKey:section value:nil table:@"Sections"]; } @@ -1124,10 +1244,7 @@ bool isSectionVisible(NSString *section) { - (void) askForSettings; - (UIProgressHUD *) addProgressHUD; - (void) removeProgressHUD:(UIProgressHUD *)hud; -- (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag; - (RVPage *) pageForPackage:(NSString *)name; -- (void) openMailToURL:(NSURL *)url; -- (void) clearFirstResponder; - (PackageView *) packageView; @end /* }}} */ @@ -1238,6 +1355,8 @@ class Progress : /* }}} */ /* Database Interface {{{ */ +typedef std::map< unsigned long, _H > SourceMap; + @interface Database : NSObject { NSZone *zone_; apr_pool_t *pool_; @@ -1253,8 +1372,8 @@ class Progress : SPtr manager_; pkgSourceList *list_; - NSMutableDictionary *sources_; - NSArray *packages_; + SourceMap sources_; + NSMutableArray *packages_; _transient NSObject *delegate_; Status status_; @@ -1292,7 +1411,7 @@ class Progress : - (void) upgrade; - (void) update; -- (void) updateWithStatus:(Status &)status; +- (NSString *) updateWithStatus:(Status &)status; - (void) setDelegate:(id)delegate; - (Source *) getSource:(pkgCache::PkgFileIterator)file; @@ -1301,26 +1420,30 @@ class Progress : /* Source Class {{{ */ @interface Source : NSObject { - NSString *description_; - NSString *label_; - NSString *origin_; - NSString *support_; + CYString depiction_; + CYString description_; + CYString label_; + CYString origin_; + CYString support_; - NSString *uri_; - NSString *distribution_; - NSString *type_; - NSString *version_; + CYString uri_; + CYString distribution_; + CYString type_; + CYString version_; + + NSString *host_; - NSString *defaultIcon_; + CYString defaultIcon_; NSDictionary *record_; BOOL trusted_; } -- (Source *) initWithMetaIndex:(metaIndex *)index; +- (Source *) initWithMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool; - (NSComparisonResult) compareByNameAndType:(Source *)source; +- (NSString *) depictionForPackage:(NSString *)package; - (NSString *) supportForPackage:(NSString *)package; - (NSDictionary *) record; @@ -1344,23 +1467,28 @@ class Progress : @implementation Source -#define _clear(field) \ - if (field != nil) \ - [field release]; \ - field = nil; - - (void) _clear { - _clear(uri_) - _clear(distribution_) - _clear(type_) + uri_.clear(); + distribution_.clear(); + type_.clear(); - _clear(description_) - _clear(label_) - _clear(origin_) - _clear(support_) - _clear(version_) - _clear(defaultIcon_) - _clear(record_) + description_.clear(); + label_.clear(); + origin_.clear(); + depiction_.clear(); + support_.clear(); + version_.clear(); + defaultIcon_.clear(); + + if (record_ != nil) { + [record_ release]; + record_ = nil; + } + + if (host_ != nil) { + [host_ release]; + host_ = nil; + } } - (void) dealloc { @@ -1380,52 +1508,60 @@ class Progress : return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name]; } -- (void) setMetaIndex:(metaIndex *)index { +- (void) setMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool { [self _clear]; trusted_ = index->IsTrusted(); - uri_ = [[NSString stringWithUTF8String:index->GetURI().c_str()] retain]; - distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain]; - type_ = [[NSString stringWithUTF8String:index->GetType()] retain]; + uri_.set(pool, index->GetURI()); + distribution_.set(pool, index->GetDist()); + type_.set(pool, index->GetType()); debReleaseIndex *dindex(dynamic_cast(index)); if (dindex != NULL) { - std::ifstream release(dindex->MetaIndexFile("Release").c_str()); - std::string line; - while (std::getline(release, line)) { - std::string::size_type colon(line.find(':')); - if (colon == std::string::npos) - continue; - - std::string name(line.substr(0, colon)); - std::string value(line.substr(colon + 1)); - while (!value.empty() && value[0] == ' ') - value = value.substr(1); - - if (name == "Default-Icon") - defaultIcon_ = [[NSString stringWithUTF8String:value.c_str()] retain]; - else if (name == "Description") - description_ = [[NSString stringWithUTF8String:value.c_str()] retain]; - else if (name == "Label") - label_ = [[NSString stringWithUTF8String:value.c_str()] retain]; - else if (name == "Origin") - origin_ = [[NSString stringWithUTF8String:value.c_str()] retain]; - else if (name == "Support") - support_ = [[NSString stringWithUTF8String:value.c_str()] retain]; - else if (name == "Version") - version_ = [[NSString stringWithUTF8String:value.c_str()] retain]; + FileFd fd; + if (!fd.Open(dindex->MetaIndexFile("Release"), FileFd::ReadOnly)) + _error->Discard(); + else { + pkgTagFile tags(&fd); + + pkgTagSection section; + tags.Step(section); + + struct { + const char *name_; + CYString *value_; + } names[] = { + {"default-icon", &defaultIcon_}, + {"depiction", &depiction_}, + {"description", &description_}, + {"label", &label_}, + {"origin", &origin_}, + {"support", &support_}, + {"version", &version_}, + }; + + for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i) { + const char *start, *end; + + if (section.Find(names[i].name_, start, end)) { + CYString &value(*names[i].value_); + value.set(pool, start, end - start); + } + } } } record_ = [Sources_ objectForKey:[self key]]; if (record_ != nil) record_ = [record_ retain]; + + host_ = [[[[NSURL URLWithString:uri_] host] lowercaseString] retain]; } -- (Source *) initWithMetaIndex:(metaIndex *)index { +- (Source *) initWithMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool { if ((self = [super init]) != nil) { - [self setMetaIndex:index]; + [self setMetaIndex:index inPool:pool]; } return self; } @@ -1452,8 +1588,12 @@ class Progress : return [lhs compare:rhs options:LaxCompareOptions_]; } +- (NSString *) depictionForPackage:(NSString *)package { + return depiction_.empty() ? nil : [depiction_ stringByReplacingOccurrencesOfString:@"*" withString:package]; +} + - (NSString *) supportForPackage:(NSString *)package { - return support_ == nil ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package]; + return support_.empty() ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package]; } - (NSDictionary *) record { @@ -1477,15 +1617,15 @@ class Progress : } - (NSString *) key { - return [NSString stringWithFormat:@"%@:%@:%@", type_, uri_, distribution_]; + return [NSString stringWithFormat:@"%@:%@:%@", (NSString *) type_, (NSString *) uri_, (NSString *) distribution_]; } - (NSString *) host { - return [[[NSURL URLWithString:[self uri]] host] lowercaseString]; + return host_; } - (NSString *) name { - return origin_ == nil ? [self host] : origin_; + return origin_.empty() ? host_ : origin_; } - (NSString *) description { @@ -1493,7 +1633,7 @@ class Progress : } - (NSString *) label { - return label_ == nil ? [self host] : label_; + return label_.empty() ? host_ : label_; } - (NSString *) origin { @@ -1548,6 +1688,7 @@ class Progress : /* Package Class {{{ */ @interface Package : NSObject { unsigned era_; + apr_pool_t *pool_; pkgCache::VerIterator version_; pkgCache::PkgIterator iterator_; @@ -1556,6 +1697,7 @@ class Progress : Source *source_; bool cached_; + bool parsed_; CYString section_; NSString *section$_; @@ -1563,9 +1705,9 @@ class Progress : bool visible_; NSString *latest_; - NSString *installed_; + CYString installed_; - NSString *id_; + CYString id_; CYString name_; CYString tagline_; CYString icon_; @@ -1579,7 +1721,7 @@ class Progress : Address *author$_; CYString support_; - NSArray *tags_; + NSMutableArray *tags_; NSString *role_; NSArray *relationships_; @@ -1594,6 +1736,7 @@ class Progress : + (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database; - (pkgCache::PkgIterator) iterator; +- (void) parse; - (NSString *) section; - (NSString *) simpleSection; @@ -1605,7 +1748,8 @@ class Progress : - (Address *) maintainer; - (size_t) size; -- (NSString *) description; +- (NSString *) longDescription; +- (NSString *) shortDescription; - (unichar) index; - (NSMutableDictionary *) metadata; @@ -1615,6 +1759,7 @@ class Progress : - (NSString *) latest; - (NSString *) installed; +- (BOOL) uninstalled; - (BOOL) valid; - (BOOL) upgradableAndEssential:(BOOL)essential; @@ -1631,7 +1776,6 @@ class Progress : - (NSString *) id; - (NSString *) name; -- (NSString *) tagline; - (UIImage *) icon; - (NSString *) homepage; - (NSString *) depiction; @@ -1655,7 +1799,8 @@ class Progress : - (NSArray *) purposes; - (bool) isCommercial; -- (uint32_t) compareByPrefix; +- (CYString &) cyname; + - (uint32_t) compareBySection:(NSArray *)sections; - (uint32_t) compareForChanges; @@ -1697,27 +1842,73 @@ uint32_t PackageChangesRadix(Package *self, void *) { return _not(uint32_t) - value.key; } -CFStringRef (*PackageName)(Package *self, SEL sel); +_finline static void Stifle(uint8_t &value) { +} -CFComparisonResult PackageNameCompare(Package *lhs, Package *rhs, void *arg) { - _profile(PackageNameCompare) - CFStringRef lhn, rhn; - CFIndex length; +uint32_t PackagePrefixRadix(Package *self, void *context) { + size_t offset(reinterpret_cast(context)); + CYString &name([self cyname]); - _profile(PackageNameCompare$Setup) - lhn = PackageName(lhs, @selector(name)); - rhn = PackageName(rhs, @selector(name)); - _end + size_t size(name.size()); + if (size == 0) + return 0; + char *text(name.data()); - _profile(PackageNameCompare$Nothing) - _end + size_t zeros; + if (!isdigit(text[0])) + zeros = 0; + else { + size_t digits(1); + while (size != digits && isdigit(text[digits])) + if (++digits == 4) + break; + zeros = 4 - digits; + } - _profile(PackageNameCompare$Length) - length = CFStringGetLength(lhn); - _end + uint8_t data[4]; + + // 0.607997 + + if (offset == 0 && zeros != 0) { + memset(data, '0', zeros); + memcpy(data + zeros, text, 4 - zeros); + } else { + /* XXX: there's some danger here if you request a non-zero offset < 4 and it gets zero padded */ + if (size <= offset - zeros) + return 0; + + text += offset - zeros; + size -= offset - zeros; + + if (size >= 4) + memcpy(data, text, 4); + else { + memcpy(data, text, size); + memset(data + size, 0, 4 - size); + } + + for (size_t i(0); i != 4; ++i) + if (isalpha(data[i])) + data[i] &= 0xdf; + } + + if (offset == 0) + data[0] = (data[0] & 0x3f) | "\x80\x00\xc0\x40"[data[0] >> 6]; + + /* XXX: ntohl may be more honest */ + return OSSwapInt32(*reinterpret_cast(data)); +} + +CYString &(*PackageName)(Package *self, SEL sel); + +CFComparisonResult PackageNameCompare(Package *lhs, Package *rhs, void *arg) { + _profile(PackageNameCompare) + CYString &lhi(PackageName(lhs, @selector(cyname))); + CYString &rhi(PackageName(rhs, @selector(cyname))); + CFStringRef lhn(lhi), rhn(rhi); _profile(PackageNameCompare$NumbersLast) - if (length != 0 && CFStringGetLength(rhn) != 0) { + if (!lhi.empty() && !rhi.empty()) { UniChar lhc(CFStringGetCharacterAtIndex(lhn, 0)); UniChar rhc(CFStringGetCharacterAtIndex(rhn, 0)); bool lha(CFUniCharIsMemberOf(lhc, kCFUniCharLetterCharacterSet)); @@ -1726,14 +1917,16 @@ CFComparisonResult PackageNameCompare(Package *lhs, Package *rhs, void *arg) { } _end + CFIndex length = CFStringGetLength(lhn); + _profile(PackageNameCompare$Compare) return CFStringCompareWithOptionsAndLocale(lhn, rhn, CFRangeMake(0, length), LaxCompareFlags_, Locale_); _end _end } -CFComparisonResult PackageNameCompare_(Package **lhs, Package **rhs, void *arg) { - return PackageNameCompare(*lhs, *rhs, arg); +CFComparisonResult PackageNameCompare_(Package **lhs, Package **rhs, void *context) { + return PackageNameCompare(*lhs, *rhs, context); } struct PackageNameOrdering : @@ -1746,6 +1939,10 @@ struct PackageNameOrdering : @implementation Package +- (NSString *) description { + return [NSString stringWithFormat:@"", static_cast(name_)]; +} + - (void) dealloc { if (source_ != nil) [source_ release]; @@ -1754,11 +1951,7 @@ struct PackageNameOrdering : if (latest_ != nil) [latest_ release]; - if (installed_ != nil) - [installed_ release]; - if (id_ != nil) - [id_ release]; if (sponsor$_ != nil) [sponsor$_ release]; if (author$_ != nil) @@ -1788,7 +1981,7 @@ struct PackageNameOrdering : } + (NSArray *) _attributeKeys { - return [NSArray arrayWithObjects:@"applications", @"author", @"depiction", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"longSection", @"maintainer", @"mode", @"name", @"purposes", @"section", @"shortSection", @"simpleSection", @"size", @"source", @"sponsor", @"support", @"tagline", @"warnings", nil]; + return [NSArray arrayWithObjects:@"applications", @"author", @"depiction", @"longDescription", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"longSection", @"maintainer", @"mode", @"name", @"purposes", @"section", @"shortDescription", @"shortSection", @"simpleSection", @"size", @"source", @"sponsor", @"support", @"warnings", nil]; } - (NSArray *) attributeKeys { @@ -1799,100 +1992,130 @@ struct PackageNameOrdering : return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name]; } +- (void) parse { + if (parsed_) + return; + parsed_ = true; + if (file_.end()) + return; + + _profile(Package$parse) + pkgRecords::Parser *parser; + + _profile(Package$parse$Lookup) + parser = &[database_ records]->Lookup(file_); + _end + + CYString website; + + _profile(Package$parse$Find) + struct { + const char *name_; + CYString *value_; + } names[] = { + {"icon", &icon_}, + {"depiction", &depiction_}, + {"homepage", &homepage_}, + {"website", &website}, + {"support", &support_}, + {"sponsor", &sponsor_}, + {"author", &author_}, + }; + + for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i) { + const char *start, *end; + + if (parser->Find(names[i].name_, start, end)) { + CYString &value(*names[i].value_); + _profile(Package$parse$Value) + value.set(pool_, start, end - start); + _end + } + } + _end + + _profile(Package$parse$Tagline) + const char *start, *end; + if (parser->ShortDesc(start, end)) { + const char *stop(reinterpret_cast(memchr(start, '\n', end - start))); + if (stop == NULL) + stop = end; + while (stop != start && stop[-1] == '\r') + --stop; + tagline_.set(pool_, start, stop - start); + } + _end + + _profile(Package$parse$Retain) + if (!homepage_.empty()) + homepage_ = website; + if (homepage_ == depiction_) + homepage_.clear(); + _end + _end +} + - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database { if ((self = [super init]) != nil) { _profile(Package$initWithVersion) @synchronized (database) { era_ = [database era]; + pool_ = pool; version_ = version; iterator_ = version.ParentPkg(); database_ = database; _profile(Package$initWithVersion$Latest) - latest_ = [StripVersion(version_.VerStr()) retain]; + latest_ = (NSString *) StripVersion(version_.VerStr()); _end - pkgCache::VerIterator current(iterator_.CurrentVer()); - if (!current.end()) - installed_ = [StripVersion(current.VerStr()) retain]; + pkgCache::VerIterator current; + _profile(Package$initWithVersion$Versions) + current = iterator_.CurrentVer(); + if (!current.end()) + installed_.set(pool_, StripVersion_(current.VerStr())); - if (!version_.end()) - file_ = version_.FileList(); - else { - pkgCache &cache([database_ cache]); - file_ = pkgCache::VerFileIterator(cache, cache.VerFileP); - } + if (!version_.end()) + file_ = version_.FileList(); + else { + pkgCache &cache([database_ cache]); + file_ = pkgCache::VerFileIterator(cache, cache.VerFileP); + } + _end _profile(Package$initWithVersion$Name) - id_ = [[NSString stringWithUTF8String:iterator_.Name()] retain]; + id_.set(pool_, iterator_.Name()); + name_.set(pool, iterator_.Display()); _end - if (!file_.end()) - source_ = [database_ getSource:file_.File()]; - if (source_ != nil) - [source_ retain]; - cached_ = true; - - _profile(Package$initWithVersion$Parse) - pkgRecords::Parser *parser; - - _profile(Package$initWithVersion$Parse$Lookup) - parser = &[database_ records]->Lookup(file_); - _end - - CYString website; - CYString tag; - - _profile(Package$initWithVersion$Parse$Find) - struct { - const char *name_; - CYString *value_; - } names[] = { - {"name", &name_}, - {"icon", &icon_}, - {"depiction", &depiction_}, - {"homepage", &homepage_}, - {"website", &website}, - {"support", &support_}, - {"sponsor", &sponsor_}, - {"author", &author_}, - {"tag", &tag}, - }; - - for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i) { - const char *start, *end; - - if (parser->Find(names[i].name_, start, end)) { - CYString &value(*names[i].value_); - _profile(Package$initWithVersion$Parse$Value) - value.set(pool, start, end - start); - _end - } - } - _end - - _profile(Package$initWithVersion$Parse$Tagline) - tagline_.set(pool, parser->ShortDesc()); - _end - - _profile(Package$initWithVersion$Parse$Retain) - if (!homepage_.empty()) - homepage_ = website; - if (homepage_ == depiction_) - homepage_.clear(); - if (!tag.empty()) - tags_ = [[tag componentsSeparatedByString:@", "] retain]; - _end + if (!file_.end()) { + _profile(Package$initWithVersion$Source) + source_ = [database_ getSource:file_.File()]; + if (source_ != nil) + [source_ retain]; + cached_ = true; _end + } + + visible_ = true; _profile(Package$initWithVersion$Tags) - if (tags_ != nil) - for (NSString *tag in tags_) - if ([tag hasPrefix:@"role::"]) { - role_ = [[tag substringFromIndex:6] retain]; - break; - } + pkgCache::TagIterator tag(iterator_.TagList()); + if (!tag.end()) { + tags_ = [[NSMutableArray alloc] initWithCapacity:8]; + do { + const char *name(tag.Name()); + [tags_ addObject:(NSString *)CFCString(name)]; + if (role_ == nil && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/) + role_ = (NSString *) CFCString(name + 6); + if (visible_ && strncmp(name, "require::", 9) == 0 && ( + true + )) + visible_ = false; + ++tag; + } while (!tag.end()); + } _end bool changed(false); @@ -1902,7 +2125,7 @@ struct PackageNameOrdering : metadata_ = [Packages_ objectForKey:key]; if (metadata_ == nil) { - firstSeen_ = [now_ retain]; + firstSeen_ = now_; metadata_ = [[NSMutableDictionary dictionaryWithObjectsAndKeys: firstSeen_, @"FirstSeen", @@ -1928,12 +2151,13 @@ struct PackageNameOrdering : if (version == nil) { [metadata_ setObject:latest_ forKey:@"LastVersion"]; changed = true; - } else if (![version isEqualToString:latest_]) { + } else { + if (![version isEqualToString:latest_]) { [metadata_ setObject:latest_ forKey:@"LastVersion"]; lastSeen_ = now_; [metadata_ setObject:lastSeen_ forKey:@"LastSeen"]; changed = true; - } + } } } metadata_ = [metadata_ retain]; @@ -1945,15 +2169,16 @@ struct PackageNameOrdering : _end _profile(Package$initWithVersion$Section) - section_.set(pool, iterator_.Section()); + section_.set(pool_, iterator_.Section()); _end essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"]; - visible_ = [self hasSupportingRole] && [self unfiltered]; + visible_ = visible_ && [self hasSupportingRole] && [self unfiltered]; } _end } return self; } + (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database { +@synchronized ([Database class]) { pkgCache::VerIterator version; _profile(Package$packageWithIterator$GetCandidateVer) @@ -1969,7 +2194,7 @@ struct PackageNameOrdering : inPool:pool database:database ] autorelease]; -} +} } - (pkgCache::PkgIterator) iterator { return iterator_; @@ -2002,7 +2227,7 @@ struct PackageNameOrdering : } - (NSString *) longSection { - return LocalizeSection(section_); + return LocalizeSection([self section]); } - (NSString *) shortSection { @@ -2034,7 +2259,7 @@ struct PackageNameOrdering : return version_.end() ? 0 : version_->InstalledSize; } -- (NSString *) description { +- (NSString *) longDescription { if (file_.end()) return nil; pkgRecords::Parser *parser = &[database_ records]->Lookup(file_); @@ -2054,6 +2279,10 @@ struct PackageNameOrdering : return [trimmed componentsJoinedByString:@"\n"]; } +- (NSString *) shortDescription { + return tagline_; +} + - (unichar) index { _profile(Package$index) CFStringRef name((CFStringRef) [self name]); @@ -2096,6 +2325,10 @@ struct PackageNameOrdering : return installed_; } +- (BOOL) uninstalled { + return installed_.empty(); +} + - (BOOL) valid { return !version_.end(); } @@ -2186,18 +2419,14 @@ struct PackageNameOrdering : } - (NSString *) name { - return name_ == nil ? id_ : name_; -} - -- (NSString *) tagline { - return tagline_; + return name_.empty() ? id_ : name_; } - (UIImage *) icon { NSString *section = [self simpleSection]; UIImage *icon(nil); - if (icon_ != nil) + if (!icon_.empty()) if ([icon_ hasPrefix:@"file:///"]) icon = [UIImage imageAtPath:[icon_ substringFromIndex:7]]; if (icon == nil) if (section != nil) @@ -2215,7 +2444,7 @@ struct PackageNameOrdering : } - (NSString *) depiction { - return depiction_; + return !depiction_.empty() ? depiction_ : [[self source] depictionForPackage:id_]; } - (Address *) sponsor { @@ -2235,11 +2464,11 @@ struct PackageNameOrdering : } - (NSString *) support { - return support_ != nil ? support_ : [[self source] supportForPackage:id_]; + return !support_.empty() ? support_ : [[self source] supportForPackage:id_]; } - (NSArray *) files { - NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", id_]; + NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", static_cast(id_)]; NSMutableArray *files = [NSMutableArray arrayWithCapacity:128]; std::ifstream fin; @@ -2264,7 +2493,7 @@ struct PackageNameOrdering : size_t length(strlen(name)); if (length < 2) invalid: - [warnings addObject:CYLocalize("ILLEGAL_PACKAGE_IDENTIFIER")]; + [warnings addObject:UCLocalize("ILLEGAL_PACKAGE_IDENTIFIER")]; else for (size_t i(0); i != length; ++i) if ( /* XXX: technically this is not allowed */ @@ -2292,11 +2521,11 @@ struct PackageNameOrdering : /* XXX: this is not sensitive enough. only some folders are valid. */ if (cydia && !repository) - [warnings addObject:[NSString stringWithFormat:CYLocalize("FILES_INSTALLED_TO"), @"Cydia.app"]]; + [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"Cydia.app"]]; if (_private) - [warnings addObject:[NSString stringWithFormat:CYLocalize("FILES_INSTALLED_TO"), @"/private"]]; + [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/private"]]; if (stash) - [warnings addObject:[NSString stringWithFormat:CYLocalize("FILES_INSTALLED_TO"), @"/var/stash"]]; + [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/var/stash"]]; } return [warnings count] == 0 ? nil : warnings; @@ -2373,7 +2602,7 @@ struct PackageNameOrdering : if (range.location != NSNotFound) return YES; - range = [[self tagline] rangeOfString:text options:MatchCompareOptions_]; + range = [[self shortDescription] rangeOfString:text options:MatchCompareOptions_]; if (range.location != NSNotFound) return YES; @@ -2421,8 +2650,8 @@ struct PackageNameOrdering : return [self hasTag:@"cydia::commercial"]; } -- (uint32_t) compareByPrefix { - return 0; +- (CYString &) cyname { + return name_.empty() ? id_ : name_; } - (uint32_t) compareBySection:(NSArray *)sections { @@ -2504,7 +2733,7 @@ struct PackageNameOrdering : } - (bool) isInstalledAndVisible:(NSNumber *)number { - return (![number boolValue] || [self visible]) && [self installed] != nil; + return (![number boolValue] || [self visible]) && ![self uninstalled]; } - (bool) isVisiblyUninstalledInSection:(NSString *)name { @@ -2512,7 +2741,7 @@ struct PackageNameOrdering : return [self visible] && - [self installed] == nil && ( + [self uninstalled] && ( name == nil || section == nil && [name length] == 0 || [name isEqualToString:section] @@ -2535,8 +2764,9 @@ struct PackageNameOrdering : } - (NSComparisonResult) compareByLocalized:(Section *)section; -- (Section *) initWithName:(NSString *)name; -- (Section *) initWithName:(NSString *)name row:(size_t)row; +- (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; @@ -2562,10 +2792,10 @@ struct PackageNameOrdering : } - (NSComparisonResult) compareByLocalized:(Section *)section { - NSString *lhs = [self localized]; - NSString *rhs = [section localized]; + NSString *lhs(localized_); + NSString *rhs([section localized]); - if ([lhs length] != 0 && [rhs length] != 0) { + /*if ([lhs length] != 0 && [rhs length] != 0) { unichar lhc = [lhs characterAtIndex:0]; unichar rhc = [rhs characterAtIndex:0]; @@ -2573,21 +2803,29 @@ struct PackageNameOrdering : return NSOrderedAscending; else if (!isalpha(lhc) && isalpha(rhc)) return NSOrderedDescending; - } + }*/ return [lhs compare:rhs options:LaxCompareOptions_]; } -- (Section *) initWithName:(NSString *)name { - return [self initWithName:name row:0]; +- (Section *) initWithName:(NSString *)name localized:(NSString *)localized { + if ((self = [self initWithName:name localize:NO]) != nil) { + if (localized != nil) + localized_ = [localized retain]; + } return self; +} + +- (Section *) initWithName:(NSString *)name localize:(BOOL)localize { + return [self initWithName:name row:0 localize:localize]; } -- (Section *) initWithName:(NSString *)name row:(size_t)row { +- (Section *) initWithName:(NSString *)name row:(size_t)row localize:(BOOL)localize { if ((self = [super init]) != nil) { name_ = [name retain]; index_ = '\0'; row_ = row; - localized_ = [LocalizeSection(name_) retain]; + if (localize) + localized_ = [LocalizeSection(name_) retain]; } return self; } @@ -2744,11 +2982,12 @@ static NSArray *Finishes_; } - (Package *) packageWithName:(NSString *)name { +@synchronized ([Database class]) { if (static_cast(cache_) == NULL) return nil; pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String])); return iterator.end() ? nil : [Package packageWithIterator:iterator withZone:NULL inPool:pool_ database:self]; -} +} } - (Database *) init { if ((self = [super init]) != nil) { @@ -2761,8 +3000,7 @@ static NSArray *Finishes_; zone_ = NSCreateZone(1024 * 1024, 256 * 1024, NO); apr_pool_create(&pool_, NULL); - sources_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain]; - packages_ = [[NSArray alloc] init]; + packages_ = [[NSMutableArray alloc] init]; int fds[2]; @@ -2834,7 +3072,10 @@ static NSArray *Finishes_; } - (NSArray *) sources { - return [sources_ allValues]; + NSMutableArray *sources([NSMutableArray arrayWithCapacity:sources_.size()]); + for (SourceMap::const_iterator i(sources_.begin()); i != sources_.end(); ++i) + [sources addObject:i->second]; + return sources; } - (NSArray *) issues { @@ -2902,10 +3143,15 @@ static NSArray *Finishes_; } - (void) reloadData { _pooled +@synchronized ([Database class]) { + @synchronized (self) { ++era_; } + [packages_ removeAllObjects]; + sources_.clear(); + _error->Discard(); delete list_; @@ -2922,6 +3168,11 @@ static NSArray *Finishes_; delete policy_; policy_ = NULL; + if (now_ != nil) { + [now_ release]; + now_ = nil; + } + cache_.Close(); apr_pool_clear(pool_); @@ -2975,56 +3226,64 @@ static NSArray *Finishes_; } _trace(); - { - std::string lists(_config->FindDir("Dir::State::lists")); - - [sources_ removeAllObjects]; - for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) { - std::vector *indices = (*source)->GetIndexFiles(); - for (std::vector::const_iterator index = indices->begin(); index != indices->end(); ++index) - if (debPackagesIndex *packages = dynamic_cast(*index)) - [sources_ - setObject:[[[Source alloc] initWithMetaIndex:*source] autorelease] - forKey:[NSString stringWithFormat:@"%s%s", - lists.c_str(), - URItoFileName(packages->IndexURI("Packages")).c_str() - ] - ]; - } + + for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) { + std::vector *indices = (*source)->GetIndexFiles(); + for (std::vector::const_iterator index = indices->begin(); index != indices->end(); ++index) + // XXX: this could be more intelligent + if (dynamic_cast(*index) != NULL) { + pkgCache::PkgFileIterator cached((*index)->FindInCache(cache_)); + if (!cached.end()) + sources_[cached->ID] = [[[Source alloc] initWithMetaIndex:*source inPool:pool_] autorelease]; + } } + _trace(); { - std::vector packages; + /*std::vector packages; packages.reserve(std::max(10000U, [packages_ count] + 1000)); - [packages_ release]; - packages_ = nil; + packages_ = nil;*/ _trace(); for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator) if (Package *package = [Package packageWithIterator:iterator withZone:zone_ inPool:pool_ database:self]) - packages.push_back(package); + //packages.push_back(package); + [packages_ addObject:package]; _trace(); + /*if (packages.empty()) + packages_ = [[NSArray alloc] init]; + else + packages_ = [[NSArray alloc] initWithObjects:&packages.front() count:packages.size()]; + _trace();*/ + + [packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(16)]; + [packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(4)]; + [packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(0)]; + + /*_trace(); + PrintTimes(); + _trace();*/ + + _trace(); + + /*if (!packages.empty()) + CFQSortArray(&packages.front(), packages.size(), sizeof(packages.front()), reinterpret_cast(&PackageNameCompare_), NULL);*/ //std::sort(packages.begin(), packages.end(), PackageNameOrdering()); - if (!packages.empty()) - CFQSortArray(&packages.front(), packages.size(), sizeof(packages.front()), reinterpret_cast(&PackageNameCompare_), NULL); + //CFArraySortValues((CFMutableArrayRef) packages_, CFRangeMake(0, [packages_ count]), reinterpret_cast(&PackageNameCompare), NULL); - //[packages_ sortUsingFunction:reinterpret_cast(&PackageNameCompare) context:NULL]; - _trace(); + CFArrayInsertionSortValues((CFMutableArrayRef) packages_, CFRangeMake(0, [packages_ count]), reinterpret_cast(&PackageNameCompare), NULL); - if (packages.empty()) - packages_ = [[NSArray alloc] init]; - else - packages_ = [[NSArray alloc] initWithObjects:&packages.front() count:packages.size()]; + //[packages_ sortUsingFunction:reinterpret_cast(&PackageNameCompare) context:NULL]; _trace(); } -} +} } - (void) configure { NSString *dpkg = [NSString stringWithFormat:@"dpkg --configure -a --status-fd %u", statusfd_]; @@ -3091,6 +3350,8 @@ static NSArray *Finishes_; for (pkgAcquire::ItemIterator item = fetcher_->ItemsBegin(); item != fetcher_->ItemsEnd(); item++) { if ((*item)->Status == pkgAcquire::Item::StatDone && (*item)->Complete) continue; + if ((*item)->Status == pkgAcquire::Item::StatIdle) + continue; std::string uri = (*item)->DescURI(); std::string error = (*item)->ErrorText; @@ -3148,13 +3409,20 @@ static NSArray *Finishes_; [self updateWithStatus:status_]; } -- (void) updateWithStatus:(Status &)status { +- (NSString *) updateWithStatus:(Status &)status { pkgSourceList list; _assert(list.ReadMainList()); FileFd lock; lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); - _assert(!_error->PendingError()); + + if (_error->PendingError()) { + std::string error; + if (!_error->PopMessage(error)) + _assert(false); + _error->Discard(); + return [NSString stringWithUTF8String:error.c_str()]; + } pkgAcquire fetcher(&status); _assert(list.GetIndexes(&fetcher)); @@ -3175,6 +3443,8 @@ static NSArray *Finishes_; [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"]; Changed_ = true; } + + return nil; } - (void) setDelegate:(id)delegate { @@ -3184,10 +3454,8 @@ static NSArray *Finishes_; } - (Source *) getSource:(pkgCache::PkgFileIterator)file { - if (const char *name = file.FileName()) - if (Source *source = [sources_ objectForKey:[NSString stringWithUTF8String:name]]) - return source; - return nil; + SourceMap::const_iterator i(sources_.find(file->ID)); + return i == sources_.end() ? nil : i->second; } @end @@ -3200,137 +3468,336 @@ static NSArray *Finishes_; UIView *overlay_; } -- (void) cancel; -- (id) initWithView:(UIView *)view delegate:(id)delegate; +- (void) cancel; +- (id) initWithView:(UIView *)view delegate:(id)delegate; + +@end + +@implementation PopUpView + +- (void) dealloc { + [transition_ setDelegate:nil]; + [transition_ release]; + [overlay_ release]; + [super dealloc]; +} + +- (void) cancel { + [transition_ transition:UITransitionPushFromTop toView:nil]; +} + +- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to { + if (from != nil && to == nil) + [self removeFromSuperview]; +} + +- (id) initWithView:(UIView *)view delegate:(id)delegate { + if ((self = [super initWithFrame:[view bounds]]) != nil) { + delegate_ = delegate; + + transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]]; + [self addSubview:transition_]; + + overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]]; + + [view addSubview:self]; + + [transition_ setDelegate:self]; + + UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease]; + [transition_ transition:UITransitionNone toView:blank]; + [transition_ transition:UITransitionPushFromBottom toView:overlay_]; + } return self; +} + +@end +/* }}} */ + +/* Confirmation View {{{ */ +bool DepSubstrate(const pkgCache::VerIterator &iterator) { + if (!iterator.end()) + for (pkgCache::DepIterator dep(iterator.DependsList()); !dep.end(); ++dep) { + if (dep->Type != pkgCache::Dep::Depends && dep->Type != pkgCache::Dep::PreDepends) + continue; + pkgCache::PkgIterator package(dep.TargetPkg()); + if (package.end()) + continue; + if (strcmp(package.Name(), "mobilesubstrate") == 0) + return true; + } + + return false; +} + +/* Web Scripting {{{ */ +@interface CydiaObject : NSObject { + id indirect_; +} + +- (id) initWithDelegate:(IndirectDelegate *)indirect; +@end + +@implementation CydiaObject + +- (void) dealloc { + [indirect_ release]; + [super dealloc]; +} + +- (id) initWithDelegate:(IndirectDelegate *)indirect { + if ((self = [super init]) != nil) { + indirect_ = [indirect retain]; + } return self; +} + ++ (NSArray *) _attributeKeys { + return [NSArray arrayWithObjects:@"device", @"firewire", @"imei", @"mac", @"serial", nil]; +} + +- (NSArray *) attributeKeys { + return [[self class] _attributeKeys]; +} + ++ (BOOL) isKeyExcludedFromWebScript:(const char *)name { + return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name]; +} + +- (NSString *) device { + return [[UIDevice currentDevice] uniqueIdentifier]; +} + +#if 0 // XXX: implement! +- (NSString *) mac { + if (![indirect_ promptForSensitive:@"Mac Address"]) + return nil; +} + +- (NSString *) serial { + if (![indirect_ promptForSensitive:@"Serial #"]) + return nil; +} + +- (NSString *) firewire { + if (![indirect_ promptForSensitive:@"Firewire GUID"]) + return nil; +} + +- (NSString *) imei { + if (![indirect_ promptForSensitive:@"IMEI"]) + return nil; +} +#endif + ++ (NSString *) webScriptNameForSelector:(SEL)selector { + if (selector == @selector(close)) + return @"close"; + else if (selector == @selector(getPackageById:)) + return @"getPackageById"; + else if (selector == @selector(setAutoPopup:)) + return @"setAutoPopup"; + else if (selector == @selector(setButtonImage:withStyle:toFunction:)) + return @"setButtonImage"; + else if (selector == @selector(setButtonTitle:withStyle:toFunction:)) + return @"setButtonTitle"; + else if (selector == @selector(setFinishHook:)) + return @"setFinishHook"; + else if (selector == @selector(setPopupHook:)) + return @"setPopupHook"; + else if (selector == @selector(setSpecial:)) + return @"setSpecial"; + else if (selector == @selector(setViewportWidth:)) + return @"setViewportWidth"; + else if (selector == @selector(supports:)) + return @"supports"; + else if (selector == @selector(stringWithFormat:arguments:)) + return @"format"; + else if (selector == @selector(localizedStringForKey:value:table:)) + return @"localize"; + else if (selector == @selector(du:)) + return @"du"; + else if (selector == @selector(statfs:)) + return @"statfs"; + else + return nil; +} + ++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector { + return [self webScriptNameForSelector:selector] == nil; +} + +- (BOOL) supports:(NSString *)feature { + return [feature isEqualToString:@"window.open"]; +} + +- (Package *) getPackageById:(NSString *)id { + return [[Database sharedInstance] packageWithName:id]; +} + +- (NSArray *) statfs:(NSString *)path { + struct statfs stat; + + if (path == nil || statfs([path UTF8String], &stat) == -1) + return nil; + + return [NSArray arrayWithObjects: + [NSNumber numberWithUnsignedLong:stat.f_bsize], + [NSNumber numberWithUnsignedLong:stat.f_blocks], + [NSNumber numberWithUnsignedLong:stat.f_bfree], + nil]; +} + +- (NSNumber *) du:(NSString *)path { + NSNumber *value(nil); + + int fds[2]; + _assert(pipe(fds) != -1); + + pid_t pid(ExecFork()); + if (pid == 0) { + _assert(dup2(fds[1], 1) != -1); + _assert(close(fds[0]) != -1); + _assert(close(fds[1]) != -1); + /* 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); + + 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])); -@end + int status; + wait: + if (waitpid(pid, &status, 0) == -1) + if (errno == EINTR) + goto wait; + else _assert(false); -@implementation PopUpView + return value; +} -- (void) dealloc { - [transition_ setDelegate:nil]; - [transition_ release]; - [overlay_ release]; - [super dealloc]; +- (void) close { + [indirect_ close]; } -- (void) cancel { - [transition_ transition:UITransitionPushFromTop toView:nil]; +- (void) setAutoPopup:(BOOL)popup { + [indirect_ setAutoPopup:popup]; } -- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to { - if (from != nil && to == nil) - [self removeFromSuperview]; +- (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function { + [indirect_ setButtonImage:button withStyle:style toFunction:function]; } -- (id) initWithView:(UIView *)view delegate:(id)delegate { - if ((self = [super initWithFrame:[view bounds]]) != nil) { - delegate_ = delegate; +- (void) setButtonTitle:(NSString *)button withStyle:(NSString *)style toFunction:(id)function { + [indirect_ setButtonTitle:button withStyle:style toFunction:function]; +} - transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]]; - [self addSubview:transition_]; +- (void) setSpecial:(id)function { + [indirect_ setSpecial:function]; +} - overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]]; +- (void) setFinishHook:(id)function { + [indirect_ setFinishHook:function]; +} - [view addSubview:self]; +- (void) setPopupHook:(id)function { + [indirect_ setPopupHook:function]; +} - [transition_ setDelegate:self]; +- (void) setViewportWidth:(float)width { + [indirect_ setViewportWidth:width]; +} - UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease]; - [transition_ transition:UITransitionNone toView:blank]; - [transition_ transition:UITransitionPushFromBottom toView:overlay_]; - } return self; +- (NSString *) stringWithFormat:(NSString *)format arguments:(WebScriptObject *)arguments { + //NSLog(@"SWF:\"%@\" A:%@", format, [arguments description]); + unsigned count([arguments count]); + id values[count]; + for (unsigned i(0); i != count; ++i) + values[i] = [arguments objectAtIndex:i]; + return [[[NSString alloc] initWithFormat:format arguments:reinterpret_cast(values)] autorelease]; +} + +- (NSString *) localizedStringForKey:(NSString *)key value:(NSString *)value table:(NSString *)table { + if (reinterpret_cast(value) == [WebUndefined undefined]) + value = nil; + if (reinterpret_cast(table) == [WebUndefined undefined]) + table = nil; + return [[NSBundle mainBundle] localizedStringForKey:key value:value table:table]; } @end /* }}} */ -#if 0 -/* Mail Composition {{{ */ -@interface MailToView : PopUpView { - MailComposeController *controller_; +@interface CydiaBrowserView : BrowserView { + CydiaObject *cydia_; } -- (id) initWithView:(UIView *)view delegate:(id)delegate url:(NSURL *)url; - @end -@implementation MailToView +@implementation CydiaBrowserView - (void) dealloc { - [controller_ release]; + [cydia_ release]; [super dealloc]; } -- (void) mailComposeControllerWillAttemptToSend:(MailComposeController *)controller { - NSLog(@"will"); +- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { + [super webView:sender didClearWindowObject:window forFrame:frame]; + [window setValue:cydia_ forKey:@"cydia"]; } -- (void) mailComposeControllerDidAttemptToSend:(MailComposeController *)controller mailDelivery:(id)delivery { - NSLog(@"did:%@", delivery); -// [UIApp setStatusBarShowsProgress:NO]; -if ([controller error]){ -NSArray *buttons = [NSArray arrayWithObjects:CYLocalize("OK"), nil]; -UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:CYLocalize("ERROR") buttons:buttons defaultButtonIndex:0 delegate:self context:self]; -[mailAlertSheet setBodyText:[controller error]]; -[mailAlertSheet popupAlertAnimated:YES]; -} -} +- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)source { + NSMutableURLRequest *copy = [request mutableCopy]; -- (void) showError { - NSLog(@"%@", [controller_ error]); - NSArray *buttons = [NSArray arrayWithObjects:CYLocalize("OK"), nil]; - UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:CYLocalize("ERROR") buttons:buttons defaultButtonIndex:0 delegate:self context:self]; - [mailAlertSheet setBodyText:[controller_ error]]; - [mailAlertSheet popupAlertAnimated:YES]; -} + if (Machine_ != NULL) + [copy setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"]; + if (UniqueID_ != nil) + [copy setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"]; -- (void) deliverMessage { _pooled - setuid(501); - setgid(501); + if (Role_ != nil) + [copy setValue:Role_ forHTTPHeaderField:@"X-Role"]; - if (![controller_ deliverMessage]) - [self performSelectorOnMainThread:@selector(showError) withObject:nil waitUntilDone:NO]; + return copy; } -- (void) mailComposeControllerCompositionFinished:(MailComposeController *)controller { - if ([controller_ needsDelivery]) - [NSThread detachNewThreadSelector:@selector(deliverMessage) toTarget:self withObject:nil]; - else - [self cancel]; -} +- (id) initWithBook:(RVBook *)book forWidth:(float)width { + if ((self = [super initWithBook:book forWidth:width ofClass:[CydiaBrowserView class]]) != nil) { + cydia_ = [[CydiaObject alloc] initWithDelegate:indirect_]; + + WebView *webview([webview_ webView]); -- (id) initWithView:(UIView *)view delegate:(id)delegate url:(NSURL *)url { - if ((self = [super initWithView:view delegate:delegate]) != nil) { - controller_ = [[MailComposeController alloc] initForContentSize:[overlay_ bounds].size]; - [controller_ setDelegate:self]; - [controller_ initializeUI]; - [controller_ setupForURL:url]; + Package *package([[Database sharedInstance] packageWithName:@"cydia"]); + NSString *application = package == nil ? @"Cydia" : [NSString + stringWithFormat:@"Cydia/%@", + [package installed] + ]; + + if (Product_ != nil) + application = [NSString stringWithFormat:@"%@ Version/%@", application, Product_]; + if (Build_ != nil) + application = [NSString stringWithFormat:@"%@ Mobile/%@", application, Build_]; + if (Safari_ != nil) + application = [NSString stringWithFormat:@"%@ Safari/%@", application, Safari_]; - UIView *view([controller_ view]); - [overlay_ addSubview:view]; + [webview setApplicationNameForUserAgent:application]; } return self; } @end -/* }}} */ -#endif - -/* Confirmation View {{{ */ -bool DepSubstrate(const pkgCache::VerIterator &iterator) { - if (!iterator.end()) - for (pkgCache::DepIterator dep(iterator.DependsList()); !dep.end(); ++dep) { - if (dep->Type != pkgCache::Dep::Depends && dep->Type != pkgCache::Dep::PreDepends) - continue; - pkgCache::PkgIterator package(dep.TargetPkg()); - if (package.end()) - continue; - if (strcmp(package.Name(), "mobilesubstrate") == 0) - return true; - } - - return false; -} @protocol ConfirmationViewDelegate - (void) cancel; @@ -3338,7 +3805,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) queue; @end -@interface ConfirmationView : BrowserView { +@interface ConfirmationView : CydiaBrowserView { _transient Database *database_; UIActionSheet *essential_; NSArray *changes_; @@ -3443,13 +3910,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (!remove) essential_ = nil; else if (Advanced_ || true) { - NSString *parenthetical(CYLocalize("PARENTHETICAL")); + NSString *parenthetical(UCLocalize("PARENTHETICAL")); essential_ = [[UIActionSheet alloc] - initWithTitle:CYLocalize("REMOVING_ESSENTIALS") + initWithTitle:UCLocalize("REMOVING_ESSENTIALS") buttons:[NSArray arrayWithObjects: - [NSString stringWithFormat:parenthetical, CYLocalize("CANCEL_OPERATION"), CYLocalize("SAFE")], - [NSString stringWithFormat:parenthetical, CYLocalize("FORCE_REMOVAL"), CYLocalize("UNSAFE")], + [NSString stringWithFormat:parenthetical, UCLocalize("CANCEL_OPERATION"), UCLocalize("SAFE")], + [NSString stringWithFormat:parenthetical, UCLocalize("FORCE_REMOVAL"), UCLocalize("UNSAFE")], nil] defaultButtonIndex:0 delegate:self @@ -3459,17 +3926,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { #ifndef __OBJC2__ [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]]; #endif - [essential_ setBodyText:CYLocalize("REMOVING_ESSENTIALS_EX")]; + [essential_ setBodyText:UCLocalize("REMOVING_ESSENTIALS_EX")]; } else { essential_ = [[UIActionSheet alloc] - initWithTitle:CYLocalize("UNABLE_TO_COMPLY") - buttons:[NSArray arrayWithObjects:CYLocalize("OKAY"), nil] + initWithTitle:UCLocalize("UNABLE_TO_COMPLY") + buttons:[NSArray arrayWithObjects:UCLocalize("OKAY"), nil] defaultButtonIndex:0 delegate:self context:@"unable" ]; - [essential_ setBodyText:CYLocalize("UNABLE_TO_COMPLY_EX")]; + [essential_ setBodyText:UCLocalize("UNABLE_TO_COMPLY_EX")]; } changes_ = [[NSArray alloc] initWithObjects: @@ -3495,11 +3962,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) backButtonTitle { - return CYLocalize("CONFIRM"); + return UCLocalize("CONFIRM"); } - (NSString *) leftButtonTitle { - return [NSString stringWithFormat:CYLocalize("SLASH_DELIMITED"), CYLocalize("CANCEL"), CYLocalize("QUEUE")]; + return [NSString stringWithFormat:UCLocalize("SLASH_DELIMITED"), UCLocalize("CANCEL"), UCLocalize("QUEUE")]; } - (id) rightButtonTitle { @@ -3510,7 +3977,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { #if AlwaysReload || IgnoreInstall return [super _rightButtonTitle]; #else - return CYLocalize("CONFIRM"); + return UCLocalize("CONFIRM"); #endif } @@ -3744,100 +4211,60 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [transition_ transition:6 toView:view_]; } -- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { - NSString *context([sheet context]); - - if ([context isEqualToString:@"error"]) - [sheet dismiss]; - else if ([context isEqualToString:@"conffile"]) { - FILE *input = [database_ input]; - - switch (button) { - case 1: - fprintf(input, "N\n"); - fflush(input); - break; - case 2: - fprintf(input, "Y\n"); - fflush(input); - break; - default: - _assert(false); - } - - [sheet dismiss]; - } -} - -- (void) closeButtonPushed { - running_ = NO; - - switch (Finish_) { - case 0: - [self resetView]; - break; - - case 1: - [delegate_ suspendWithAnimation:YES]; - break; +- (void) _checkError { + if (_error->PendingError()) { + std::string error; + if (!_error->PopMessage(error)) + _assert(false); - case 2: - system("launchctl stop com.apple.SpringBoard"); - break; + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:UCLocalize("ERROR") + buttons:[NSArray arrayWithObjects:UCLocalize("OKAY"), nil] + defaultButtonIndex:0 + delegate:self + context:@"_error" + ] autorelease]; - case 3: - system("launchctl unload "SpringBoard_"; launchctl load "SpringBoard_); - break; + [sheet setBodyText:[NSString stringWithUTF8String:error.c_str()]]; + [sheet popupAlertAnimated:YES]; - case 4: - system("reboot"); - break; + return; } -} - -- (void) _retachThread { - UINavigationItem *item = [navbar_ topItem]; - [item setTitle:CYLocalize("COMPLETE")]; - - [overlay_ addSubview:close_]; - [progress_ removeFromSuperview]; - [status_ removeFromSuperview]; [delegate_ progressViewIsComplete:self]; if (Finish_ < 4) { - FileFd file(SandboxTemplate_, FileFd::ReadOnly); - MMap mmap(file, MMap::ReadOnly); - SHA1Summation sha1; - sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); - if (!(sandplate_ == sha1.Result())) - Finish_ = 4; - } - - if (Finish_ < 4) { - FileFd file(NotifyConfig_, FileFd::ReadOnly); - MMap mmap(file, MMap::ReadOnly); - SHA1Summation sha1; - sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); - if (!(notifyconf_ == sha1.Result())) - Finish_ = 4; + FileFd file; + if (!file.Open(NotifyConfig_, FileFd::ReadOnly)) + _error->Discard(); + else { + MMap mmap(file, MMap::ReadOnly); + SHA1Summation sha1; + sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); + if (!(notifyconf_ == sha1.Result())) + Finish_ = 4; + } } if (Finish_ < 3) { - FileFd file(SpringBoard_, FileFd::ReadOnly); - MMap mmap(file, MMap::ReadOnly); - SHA1Summation sha1; - sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); - if (!(springlist_ == sha1.Result())) - Finish_ = 3; + FileFd file; + if (!file.Open(SpringBoard_, FileFd::ReadOnly)) + _error->Discard(); + else { + MMap mmap(file, MMap::ReadOnly); + SHA1Summation sha1; + sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); + if (!(springlist_ == sha1.Result())) + Finish_ = 3; + } } switch (Finish_) { - case 0: [close_ setTitle:CYLocalize("RETURN_TO_CYDIA")]; break; - case 1: [close_ setTitle:CYLocalize("CLOSE_CYDIA")]; break; - case 2: [close_ setTitle:CYLocalize("RESTART_SPRINGBOARD")]; break; - case 3: [close_ setTitle:CYLocalize("RELOAD_SPRINGBOARD")]; break; - case 4: [close_ setTitle:CYLocalize("REBOOT_DEVICE")]; break; + case 0: [close_ setTitle:UCLocalize("RETURN_TO_CYDIA")]; break; + case 1: [close_ setTitle:UCLocalize("CLOSE_CYDIA")]; break; + case 2: [close_ setTitle:UCLocalize("RESTART_SPRINGBOARD")]; break; + case 3: [close_ setTitle:UCLocalize("RELOAD_SPRINGBOARD")]; break; + case 4: [close_ setTitle:UCLocalize("REBOOT_DEVICE")]; break; } #define Cache_ "/User/Library/Caches/com.apple.mobile.installation.plist" @@ -3890,6 +4317,71 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [delegate_ setStatusBarShowsProgress:NO]; } +- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { + NSString *context([sheet context]); + + if ([context isEqualToString:@"error"]) + [sheet dismiss]; + else if ([context isEqualToString:@"_error"]) { + [sheet dismiss]; + [self _checkError]; + } else if ([context isEqualToString:@"conffile"]) { + FILE *input = [database_ input]; + + switch (button) { + case 1: + fprintf(input, "N\n"); + fflush(input); + break; + case 2: + fprintf(input, "Y\n"); + fflush(input); + break; + default: + _assert(false); + } + + [sheet dismiss]; + } +} + +- (void) closeButtonPushed { + running_ = NO; + + switch (Finish_) { + case 0: + [self resetView]; + break; + + case 1: + [delegate_ suspendWithAnimation:YES]; + break; + + case 2: + system("launchctl stop com.apple.SpringBoard"); + break; + + case 3: + system("launchctl unload "SpringBoard_"; launchctl load "SpringBoard_); + break; + + case 4: + system("reboot"); + break; + } +} + +- (void) _retachThread { + UINavigationItem *item = [navbar_ topItem]; + [item setTitle:UCLocalize("COMPLETE")]; + + [overlay_ addSubview:close_]; + [progress_ removeFromSuperview]; + [status_ removeFromSuperview]; + + [self _checkError]; +} + - (void) _detachNewThreadData:(ProgressData *)data { _pooled [[data target] performSelector:[data selector] withObject:[data object]]; [data release]; @@ -3913,27 +4405,27 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { running_ = YES; { - FileFd file(SandboxTemplate_, FileFd::ReadOnly); - MMap mmap(file, MMap::ReadOnly); - SHA1Summation sha1; - sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); - sandplate_ = sha1.Result(); - } - - { - FileFd file(NotifyConfig_, FileFd::ReadOnly); - MMap mmap(file, MMap::ReadOnly); - SHA1Summation sha1; - sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); - notifyconf_ = sha1.Result(); + FileFd file; + if (!file.Open(NotifyConfig_, FileFd::ReadOnly)) + _error->Discard(); + else { + MMap mmap(file, MMap::ReadOnly); + SHA1Summation sha1; + sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); + notifyconf_ = sha1.Result(); + } } { - FileFd file(SpringBoard_, FileFd::ReadOnly); - MMap mmap(file, MMap::ReadOnly); - SHA1Summation sha1; - sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); - springlist_ = sha1.Result(); + FileFd file; + if (!file.Open(SpringBoard_, FileFd::ReadOnly)) + _error->Discard(); + else { + MMap mmap(file, MMap::ReadOnly); + SHA1Summation sha1; + sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); + springlist_ = sha1.Result(); + } } [transition_ transition:6 toView:overlay_]; @@ -3954,7 +4446,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { detachNewThreadSelector:selector toTarget:database_ withObject:nil - title:CYLocalize("REPAIRING") + title:UCLocalize("REPAIRING") ]; } @@ -3971,7 +4463,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { UIActionSheet *sheet = [[[UIActionSheet alloc] initWithTitle:(package == nil ? id : [package name]) - buttons:[NSArray arrayWithObjects:CYLocalize("OKAY"), nil] + buttons:[NSArray arrayWithObjects:UCLocalize("OKAY"), nil] defaultButtonIndex:0 delegate:self context:@"error" @@ -4021,18 +4513,18 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { //NSString *nfile = conffile_r[2]; UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:CYLocalize("CONFIGURATION_UPGRADE") + initWithTitle:UCLocalize("CONFIGURATION_UPGRADE") buttons:[NSArray arrayWithObjects: - CYLocalize("KEEP_OLD_COPY"), - CYLocalize("ACCEPT_NEW_COPY"), - // XXX: CYLocalize("SEE_WHAT_CHANGED"), + UCLocalize("KEEP_OLD_COPY"), + UCLocalize("ACCEPT_NEW_COPY"), + // XXX: UCLocalize("SEE_WHAT_CHANGED"), nil] defaultButtonIndex:0 delegate:self context:@"conffile" ] autorelease]; - [sheet setBodyText:[NSString stringWithFormat:@"%@\n\n%@", CYLocalize("CONFIGURATION_UPGRADE_EX"), ofile]]; + [sheet setBodyText:[NSString stringWithFormat:@"%@\n\n%@", UCLocalize("CONFIGURATION_UPGRADE_EX"), ofile]]; [sheet popupAlertAnimated:YES]; } @@ -4139,12 +4631,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) setPackage:(Package *)package { [self clearPackage]; + [package parse]; Source *source = [package source]; icon_ = [[package icon] retain]; name_ = [[package name] retain]; - description_ = [[package tagline] retain]; + description_ = [[package shortDescription] retain]; commercial_ = [package isCommercial]; package_ = [package retain]; @@ -4156,19 +4649,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { label = [source label]; trusted = [source trusted]; } else if ([[package id] isEqualToString:@"firmware"]) - label = CYLocalize("APPLE"); + label = UCLocalize("APPLE"); else - label = [NSString stringWithFormat:CYLocalize("SLASH_DELIMITED"), CYLocalize("UNKNOWN"), CYLocalize("LOCAL")]; + label = [NSString stringWithFormat:UCLocalize("SLASH_DELIMITED"), UCLocalize("UNKNOWN"), UCLocalize("LOCAL")]; NSString *from(label); NSString *section = [package simpleSection]; if (section != nil && ![section isEqualToString:label]) { section = [[NSBundle mainBundle] localizedStringForKey:section value:nil table:@"Sections"]; - from = [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), from, section]; + from = [NSString stringWithFormat:UCLocalize("PARENTHETICAL"), from, section]; } - from = [NSString stringWithFormat:CYLocalize("FROM"), from]; + from = [NSString stringWithFormat:UCLocalize("FROM"), from]; source_ = [from retain]; if (NSString *purpose = [package primaryPurpose]) @@ -4181,11 +4674,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"] ? @"removing.png" : @"installing.png" ]]; - [status_ setText:[NSString stringWithFormat:CYLocalize("QUEUED_FOR"), CYLocalize(mode)]]; + [status_ setText:[NSString stringWithFormat:UCLocalize("QUEUED_FOR"), UCLocalize(mode)]]; [status_ setColor:[UIColor colorWithCGColor:Blueish_]]; } else if ([package half]) { [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]]; - [status_ setText:CYLocalize("PACKAGE_DAMAGED")]; + [status_ setText:UCLocalize("PACKAGE_DAMAGED")]; [status_ setColor:[UIColor redColor]]; } else { [badge_ setImage:nil]; @@ -4269,14 +4762,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } + (int) heightForPackage:(Package *)package { - NSString *tagline([package tagline]); - int height = tagline == nil || [tagline length] == 0 ? -17 : 0; -#ifdef USE_BADGES - if ([package hasMode] || [package half]) - return height + 96; - else -#endif - return height + 73; + return 73; } @end @@ -4354,13 +4840,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self clearSection]; if (section == nil) { - name_ = [CYLocalize("ALL_PACKAGES") retain]; + name_ = [UCLocalize("ALL_PACKAGES") retain]; count_ = nil; } else { section_ = [section localized]; if (section_ != nil) section_ = [section_ retain]; - name_ = [(section_ == nil ? CYLocalize("NO_SECTION") : section_) retain]; + name_ = [(section_ == nil || [section_ length] == 0 ? UCLocalize("NO_SECTION") : section_) retain]; count_ = [[NSString stringWithFormat:@"%d", [section count]] retain]; if (editing_) @@ -4448,7 +4934,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self addSubview:list_]; UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:CYLocalize("NAME") + initWithTitle:UCLocalize("NAME") identifier:@"name" width:[self frame].size.width ] autorelease]; @@ -4516,17 +5002,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) title { - return CYLocalize("INSTALLED_FILES"); + return UCLocalize("INSTALLED_FILES"); } - (NSString *) backButtonTitle { - return CYLocalize("FILES"); + return UCLocalize("FILES"); } @end /* }}} */ /* Package View {{{ */ -@interface PackageView : BrowserView { +@interface PackageView : CydiaBrowserView { _transient Database *database_; Package *package_; NSString *name_; @@ -4558,15 +5044,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* XXX: this is not safe at all... localization of /fail/ */ - (void) _clickButtonWithName:(NSString *)name { - if ([name isEqualToString:CYLocalize("CLEAR")]) + if ([name isEqualToString:UCLocalize("CLEAR")]) [delegate_ clearPackage:package_]; - else if ([name isEqualToString:CYLocalize("INSTALL")]) + else if ([name isEqualToString:UCLocalize("INSTALL")]) [delegate_ installPackage:package_]; - else if ([name isEqualToString:CYLocalize("REINSTALL")]) + else if ([name isEqualToString:UCLocalize("REINSTALL")]) [delegate_ installPackage:package_]; - else if ([name isEqualToString:CYLocalize("REMOVE")]) + else if ([name isEqualToString:UCLocalize("REMOVE")]) [delegate_ removePackage:package_]; - else if ([name isEqualToString:CYLocalize("UPGRADE")]) + else if ([name isEqualToString:UCLocalize("UPGRADE")]) [delegate_ installPackage:package_]; else _assert(false); } @@ -4610,7 +5096,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { else { NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)]; [buttons addObjectsFromArray:buttons_]; - [buttons addObject:CYLocalize("CANCEL")]; + [buttons addObject:UCLocalize("CANCEL")]; [delegate_ slideUp:[[[UIActionSheet alloc] initWithTitle:nil @@ -4632,7 +5118,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (id) _rightButtonTitle { int count = [buttons_ count]; - return count == 0 ? nil : count != 1 ? CYLocalize("MODIFY") : [buttons_ objectAtIndex:0]; + return count == 0 ? nil : count != 1 ? UCLocalize("MODIFY") : [buttons_ objectAtIndex:0]; } - (NSString *) backButtonTitle { @@ -4661,21 +5147,23 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [buttons_ removeAllObjects]; if (package != nil) { + [package parse]; + package_ = [package retain]; name_ = [[package id] retain]; commercial_ = [package isCommercial]; if ([package_ mode] != nil) - [buttons_ addObject:CYLocalize("CLEAR")]; + [buttons_ addObject:UCLocalize("CLEAR")]; if ([package_ source] == nil); else if ([package_ upgradableAndEssential:NO]) - [buttons_ addObject:CYLocalize("UPGRADE")]; - else if ([package_ installed] == nil) - [buttons_ addObject:CYLocalize("INSTALL")]; + [buttons_ addObject:UCLocalize("UPGRADE")]; + else if ([package_ uninstalled]) + [buttons_ addObject:UCLocalize("INSTALL")]; else - [buttons_ addObject:CYLocalize("REINSTALL")]; - if ([package_ installed] != nil) - [buttons_ addObject:CYLocalize("REMOVE")]; + [buttons_ addObject:UCLocalize("REINSTALL")]; + if (![package_ uninstalled]) + [buttons_ addObject:UCLocalize("REMOVE")]; if (special_ != NULL) { CGRect frame([webview_ frame]); @@ -4802,7 +5290,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [list_ setDataSource:self]; UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:CYLocalize("NAME") + initWithTitle:UCLocalize("NAME") identifier:@"name" width:[self frame].size.width ] autorelease]; @@ -4936,6 +5424,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* 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); @@ -5088,8 +5577,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section { switch (section + (offset_ == 0 ? 1 : 0)) { - case 0: return CYLocalize("ENTERED_BY_USER"); - case 1: return CYLocalize("INSTALLED_BY_PACKAGE"); + case 0: return UCLocalize("ENTERED_BY_USER"); + case 1: return UCLocalize("INSTALLED_BY_PACKAGE"); default: _assert(false); @@ -5217,8 +5706,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { defer = true; UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:CYLocalize("SOURCE_WARNING") - buttons:[NSArray arrayWithObjects:CYLocalize("ADD_ANYWAY"), CYLocalize("CANCEL"), nil] + initWithTitle:UCLocalize("SOURCE_WARNING") + buttons:[NSArray arrayWithObjects:UCLocalize("ADD_ANYWAY"), UCLocalize("CANCEL"), nil] defaultButtonIndex:0 delegate:self context:@"warning" @@ -5232,8 +5721,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self complete]; } else if (error_ != nil) { UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:CYLocalize("VERIFICATION_ERROR") - buttons:[NSArray arrayWithObjects:CYLocalize("OK"), nil] + initWithTitle:UCLocalize("VERIFICATION_ERROR") + buttons:[NSArray arrayWithObjects:UCLocalize("OK"), nil] defaultButtonIndex:0 delegate:self context:@"urlerror" @@ -5243,14 +5732,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [sheet popupAlertAnimated:YES]; } else { UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:CYLocalize("NOT_REPOSITORY") - buttons:[NSArray arrayWithObjects:CYLocalize("OK"), nil] + initWithTitle:UCLocalize("NOT_REPOSITORY") + buttons:[NSArray arrayWithObjects:UCLocalize("OK"), nil] defaultButtonIndex:0 delegate:self context:@"trivial" ] autorelease]; - [sheet setBodyText:CYLocalize("NOT_REPOSITORY_EX")]; + [sheet setBodyText:UCLocalize("NOT_REPOSITORY_EX")]; [sheet popupAlertAnimated:YES]; } @@ -5333,7 +5822,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { trivial_ = false; hud_ = [[delegate_ addProgressHUD] retain]; - [hud_ setText:CYLocalize("VERIFYING_URL")]; + [hud_ setText:UCLocalize("VERIFYING_URL")]; } break; case 2: @@ -5381,7 +5870,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [list_ setDataSource:self]; UITableColumn *column = [[UITableColumn alloc] - initWithTitle:CYLocalize("NAME") + initWithTitle:UCLocalize("NAME") identifier:@"name" width:[self frame].size.width ]; @@ -5429,8 +5918,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { ] autorelease]];*/ UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:CYLocalize("ENTER_APT_URL") - buttons:[NSArray arrayWithObjects:CYLocalize("ADD_SOURCE"), CYLocalize("CANCEL"), nil] + initWithTitle:UCLocalize("ENTER_APT_URL") + buttons:[NSArray arrayWithObjects:UCLocalize("ADD_SOURCE"), UCLocalize("CANCEL"), nil] defaultButtonIndex:0 delegate:self context:@"source" @@ -5458,15 +5947,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) title { - return CYLocalize("SOURCES"); + return UCLocalize("SOURCES"); } - (NSString *) leftButtonTitle { - return [[list_ table] isRowDeletionEnabled] ? CYLocalize("ADD") : nil; + return [[list_ table] isRowDeletionEnabled] ? UCLocalize("ADD") : nil; } - (id) rightButtonTitle { - return [[list_ table] isRowDeletionEnabled] ? CYLocalize("DONE") : CYLocalize("EDIT"); + return [[list_ table] isRowDeletionEnabled] ? UCLocalize("DONE") : UCLocalize("EDIT"); } - (UINavigationButtonStyle) rightButtonStyle { @@ -5529,15 +6018,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) title { - return CYLocalize("INSTALLED"); + return UCLocalize("INSTALLED"); } - (NSString *) backButtonTitle { - return CYLocalize("PACKAGES"); + return UCLocalize("PACKAGES"); } - (id) rightButtonTitle { - return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? CYLocalize("EXPERT") : CYLocalize("SIMPLE"); + return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? UCLocalize("EXPERT") : UCLocalize("SIMPLE"); } - (UINavigationButtonStyle) rightButtonStyle { @@ -5553,7 +6042,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* }}} */ /* Home View {{{ */ -@interface HomeView : BrowserView { +@interface HomeView : CydiaBrowserView { } @end @@ -5571,8 +6060,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) _leftButtonClicked { UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:CYLocalize("ABOUT_CYDIA") - buttons:[NSArray arrayWithObjects:CYLocalize("CLOSE"), nil] + initWithTitle:UCLocalize("ABOUT_CYDIA") + buttons:[NSArray arrayWithObjects:UCLocalize("CLOSE"), nil] defaultButtonIndex:0 delegate:self context:@"about" @@ -5597,13 +6086,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) leftButtonTitle { - return CYLocalize("ABOUT"); + return UCLocalize("ABOUT"); } @end /* }}} */ /* Manage View {{{ */ -@interface ManageView : BrowserView { +@interface ManageView : CydiaBrowserView { } @end @@ -5611,7 +6100,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @implementation ManageView - (NSString *) title { - return CYLocalize("MANAGE"); + return UCLocalize("MANAGE"); } - (void) _leftButtonClicked { @@ -5619,12 +6108,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) leftButtonTitle { - return CYLocalize("SETTINGS"); + return UCLocalize("SETTINGS"); } #if !AlwaysReload - (id) _rightButtonTitle { - return Queuing_ ? CYLocalize("QUEUE") : nil; + return Queuing_ ? UCLocalize("QUEUE") : nil; } - (UINavigationButtonStyle) rightButtonStyle { @@ -5643,8 +6132,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @end /* }}} */ -#include - /* Cydia Book {{{ */ @interface CYBook : RVBook < ProgressDelegate @@ -5703,7 +6190,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [UIView endAnimations]; [indicator_ startAnimation]; - [prompt_ setText:CYLocalize("UPDATING_DATABASE")]; + [prompt_ setText:UCLocalize("UPDATING_DATABASE")]; [progress_ setProgress:0]; updating_ = true; @@ -5716,7 +6203,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { ]; } -- (void) _update_ { +- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { + NSString *context([sheet context]); + + if ([context isEqualToString:@"refresh"]) + [sheet dismiss]; +} + +- (void) _update_:(NSString *)error { updating_ = false; [indicator_ stopAnimation]; @@ -5738,7 +6232,24 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [UIView commitAnimations]; - [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0]; + if (error == nil) + [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0]; + else { + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:[NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), UCLocalize("ERROR"), UCLocalize("REFRESH")] + buttons:[NSArray arrayWithObjects: + UCLocalize("OK"), + nil] + defaultButtonIndex:0 + delegate:self + context:@"refresh" + ] autorelease]; + + [sheet setBodyText:error]; + [sheet popupAlertAnimated:YES]; + + [self reloadButtons]; + } } - (id) initWithFrame:(CGRect)frame database:(Database *)database { @@ -5806,7 +6317,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [progress_ setStyle:0]; [overlay_ addSubview:progress_]; - cancel_ = [[UINavigationButton alloc] initWithTitle:CYLocalize("CANCEL") style:UINavigationButtonStyleHighlighted]; + cancel_ = [[UINavigationButton alloc] initWithTitle:UCLocalize("CANCEL") style:UINavigationButtonStyleHighlighted]; [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside]; CGRect frame = [cancel_ frame]; @@ -5827,17 +6338,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { Status status; status.setDelegate(self); - [database_ updateWithStatus:status]; + NSString *error([database_ updateWithStatus:status]); [self - performSelectorOnMainThread:@selector(_update_) - withObject:nil + performSelectorOnMainThread:@selector(_update_:) + withObject:error waitUntilDone:NO ]; } - (void) setProgressError:(NSString *)error forPackage:(NSString *)id { - [prompt_ setText:[NSString stringWithFormat:CYLocalize("COLON_DELIMITED"), CYLocalize("ERROR"), error]]; + [prompt_ setText:[NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), UCLocalize("ERROR"), error]]; } - (void) setProgressTitle:(NSString *)title { @@ -5871,10 +6382,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return !updating_; } -- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { - [sheet dismiss]; -} - - (void) _setProgressTitle:(NSString *)title { [prompt_ setText:title]; } @@ -6058,16 +6565,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (row == 0) { section = nil; name = nil; - title = CYLocalize("ALL_PACKAGES"); + title = UCLocalize("ALL_PACKAGES"); } else { section = [filtered_ objectAtIndex:(row - 1)]; name = [section name]; - if (name != nil) + if (name != nil) { + name = [NSString stringWithString:name]; title = [[NSBundle mainBundle] localizedStringForKey:Simplify(name) value:nil table:@"Sections"]; - else { + } else { name = @""; - title = CYLocalize("NO_SECTION"); + title = UCLocalize("NO_SECTION"); } } @@ -6098,7 +6606,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [transition_ transition:0 toView:list_]; UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:CYLocalize("NAME") + initWithTitle:UCLocalize("NAME") identifier:@"name" width:[self frame].size.width ] autorelease]; @@ -6142,7 +6650,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { section = §ions[key]; if (*section == nil) { _profile(SectionsView$reloadData$Section$Allocate) - *section = [[[Section alloc] initWithName:name] autorelease]; + *section = [[[Section alloc] initWithName:name localize:YES] autorelease]; _end } _end @@ -6150,7 +6658,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [*section addToCount]; _profile(SectionsView$reloadData$Filter) - if (![package valid] || [package installed] != nil || ![package visible]) + if (![package valid] || ![package uninstalled] || ![package visible]) continue; _end @@ -6162,7 +6670,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { section = [sections objectForKey:key]; if (section == nil) { _profile(SectionsView$reloadData$Section$Allocate) - section = [[[Section alloc] initWithName:name] autorelease]; + section = [[[Section alloc] initWithName:name localize:YES] autorelease]; [sections setObject:section forKey:key]; _end } @@ -6171,7 +6679,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [section addToCount]; _profile(SectionsView$reloadData$Filter) - if (![package valid] || [package installed] != nil || ![package visible]) + if (![package valid] || ![package uninstalled] || ![package visible]) continue; _end @@ -6194,7 +6702,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (count == 0) continue; - section = [[[Section alloc] initWithName:[section name]] autorelease]; + section = [[[Section alloc] initWithName:[section name] localized:[section localized]] autorelease]; [section setCount:count]; [filtered_ addObject:section]; } @@ -6222,15 +6730,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) title { - return editing_ ? CYLocalize("SECTION_VISIBILITY") : CYLocalize("INSTALL_BY_SECTION"); + return editing_ ? UCLocalize("SECTION_VISIBILITY") : UCLocalize("INSTALL_BY_SECTION"); } - (NSString *) backButtonTitle { - return CYLocalize("SECTIONS"); + return UCLocalize("SECTIONS"); } - (id) rightButtonTitle { - return [sections_ count] == 0 ? nil : editing_ ? CYLocalize("DONE") : CYLocalize("EDIT"); + return [sections_ count] == 0 ? nil : editing_ ? UCLocalize("DONE") : UCLocalize("EDIT"); } - (UINavigationButtonStyle) rightButtonStyle { @@ -6335,7 +6843,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { //[list_ setSectionListStyle:1]; UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:CYLocalize("NAME") + initWithTitle:UCLocalize("NAME") identifier:@"name" width:[self frame].size.width ] autorelease]; @@ -6362,17 +6870,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { _trace(); for (Package *package in packages) if ( - [package installed] == nil && [package valid] && [package visible] || + [package uninstalled] && [package valid] && [package visible] || [package upgradableAndEssential:YES] ) [packages_ addObject:package]; _trace(); - [packages_ radixSortUsingFunction:reinterpret_cast(&PackageChangesRadix) withArgument:NULL]; + [packages_ radixSortUsingFunction:reinterpret_cast(&PackageChangesRadix) withContext:NULL]; _trace(); - Section *upgradable = [[[Section alloc] initWithName:CYLocalize("AVAILABLE_UPGRADES")] autorelease]; - Section *ignored = [[[Section alloc] initWithName:CYLocalize("IGNORED_UPGRADES")] autorelease]; + Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease]; + Section *ignored = [[[Section alloc] initWithName:UCLocalize("IGNORED_UPGRADES") localize:NO] autorelease]; Section *section = nil; NSDate *last = nil; @@ -6399,15 +6907,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { NSString *name; if (seen == nil) - name = CYLocalize("UNKNOWN"); + name = UCLocalize("UNKNOWN"); else { name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen); [name autorelease]; } _profile(ChangesView$reloadData$Allocate) - name = [NSString stringWithFormat:CYLocalize("NEW_AT"), name]; - section = [[[Section alloc] initWithName:name row:offset] autorelease]; + name = [NSString stringWithFormat:UCLocalize("NEW_AT"), name]; + section = [[[Section alloc] initWithName:name row:offset localize:NO] autorelease]; [sections_ addObject:section]; _end } @@ -6445,15 +6953,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) leftButtonTitle { - return [(CYBook *)book_ updating] ? nil : CYLocalize("REFRESH"); + return [(CYBook *)book_ updating] ? nil : UCLocalize("REFRESH"); } - (id) rightButtonTitle { - return upgrades_ == 0 ? nil : [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), CYLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]]; + return upgrades_ == 0 ? nil : [NSString stringWithFormat:UCLocalize("PARENTHETICAL"), UCLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]]; } - (NSString *) title { - return CYLocalize("CHANGES"); + return UCLocalize("CHANGES"); } @end @@ -6499,7 +7007,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group { switch (group) { - case 0: return [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), CYLocalize("ADVANCED_SEARCH"), CYLocalize("COMING_SOON")]; + case 0: return [NSString stringWithFormat:UCLocalize("PARENTHETICAL"), UCLocalize("ADVANCED_SEARCH"), UCLocalize("COMING_SOON")]; default: _assert(false); } @@ -6632,7 +7140,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { UIFont *font = [UIFont systemFontOfSize:16]; [field_ setFont:font]; - [field_ setPlaceholder:CYLocalize("SEARCH_EX")]; + [field_ setPlaceholder:UCLocalize("SEARCH_EX")]; [field_ setDelegate:self]; [field_ setPaddingTop:5]; @@ -6708,7 +7216,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) backButtonTitle { - return CYLocalize("SEARCH"); + return UCLocalize("SEARCH"); } - (void) setDelegate:(id)delegate { @@ -6845,7 +7353,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { case 0: { UIPreferencesControlTableCell *cell([[[UIPreferencesControlTableCell alloc] init] autorelease]); [cell setShowSelection:NO]; - [cell setTitle:CYLocalize("SHOW_ALL_CHANGES_EX")]; + [cell setTitle:UCLocalize("SHOW_ALL_CHANGES_EX")]; return cell; } @@ -6874,12 +7382,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { subscribedCell_ = [[UIPreferencesControlTableCell alloc] init]; [subscribedCell_ setShowSelection:NO]; - [subscribedCell_ setTitle:CYLocalize("SHOW_ALL_CHANGES")]; + [subscribedCell_ setTitle:UCLocalize("SHOW_ALL_CHANGES")]; [subscribedCell_ setControl:subscribedSwitch_]; ignoredCell_ = [[UIPreferencesControlTableCell alloc] init]; [ignoredCell_ setShowSelection:NO]; - [ignoredCell_ setTitle:CYLocalize("IGNORE_UPGRADES")]; + [ignoredCell_ setTitle:UCLocalize("IGNORE_UPGRADES")]; [ignoredCell_ setControl:ignoredSwitch_]; [table_ setDataSource:self]; @@ -6905,13 +7413,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) title { - return CYLocalize("SETTINGS"); + return UCLocalize("SETTINGS"); } @end /* Signature View {{{ */ -@interface SignatureView : BrowserView { +@interface SignatureView : CydiaBrowserView { _transient Database *database_; NSString *package_; } @@ -6981,7 +7489,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { ManageView *manage_; SearchView *search_; - PackageView *package_; + NSMutableArray *details_; } @end @@ -6993,34 +7501,34 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { int count = [broken_ count]; UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:(count == 1 ? CYLocalize("HALFINSTALLED_PACKAGE") : [NSString stringWithFormat:CYLocalize("HALFINSTALLED_PACKAGES"), count]) + initWithTitle:(count == 1 ? UCLocalize("HALFINSTALLED_PACKAGE") : [NSString stringWithFormat:UCLocalize("HALFINSTALLED_PACKAGES"), count]) buttons:[NSArray arrayWithObjects: - CYLocalize("FORCIBLY_CLEAR"), - CYLocalize("TEMPORARY_IGNORE"), + UCLocalize("FORCIBLY_CLEAR"), + UCLocalize("TEMPORARY_IGNORE"), nil] defaultButtonIndex:0 delegate:self context:@"fixhalf" ] autorelease]; - [sheet setBodyText:CYLocalize("HALFINSTALLED_PACKAGE_EX")]; + [sheet setBodyText:UCLocalize("HALFINSTALLED_PACKAGE_EX")]; [sheet popupAlertAnimated:YES]; } else if (!Ignored_ && [essential_ count] != 0) { int count = [essential_ count]; UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:(count == 1 ? CYLocalize("ESSENTIAL_UPGRADE") : [NSString stringWithFormat:CYLocalize("ESSENTIAL_UPGRADES"), count]) + initWithTitle:(count == 1 ? UCLocalize("ESSENTIAL_UPGRADE") : [NSString stringWithFormat:UCLocalize("ESSENTIAL_UPGRADES"), count]) buttons:[NSArray arrayWithObjects: - CYLocalize("UPGRADE_ESSENTIAL"), - CYLocalize("COMPLETE_UPGRADE"), - CYLocalize("TEMPORARY_IGNORE"), + UCLocalize("UPGRADE_ESSENTIAL"), + UCLocalize("COMPLETE_UPGRADE"), + UCLocalize("TEMPORARY_IGNORE"), nil] defaultButtonIndex:0 delegate:self context:@"upgrade" ] autorelease]; - [sheet setBodyText:CYLocalize("ESSENTIAL_UPGRADE_EX")]; + [sheet setBodyText:UCLocalize("ESSENTIAL_UPGRADE_EX")]; [sheet popupAlertAnimated:YES]; } } @@ -7030,7 +7538,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { static bool loaded(false); UIProgressHUD *hud([self addProgressHUD]); - [hud setText:(loaded ? CYLocalize("RELOADING_DATA") : CYLocalize("LOADING_DATA"))]; + [hud setText:(loaded ? UCLocalize("RELOADING_DATA") : UCLocalize("LOADING_DATA"))]; loaded = true; [database_ yieldToSelector:@selector(reloadData) withObject:nil]; @@ -7156,7 +7664,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { detachNewThreadSelector:@selector(update_) toTarget:self withObject:nil - title:CYLocalize("UPDATING_SOURCES") + title:UCLocalize("UPDATING_SOURCES") ]; } @@ -7236,7 +7744,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) cancel { [self slideUp:[[[UIActionSheet alloc] initWithTitle:nil - buttons:[NSArray arrayWithObjects:CYLocalize("CONTINUE_QUEUING"), CYLocalize("CANCEL_CLEAR"), nil] + buttons:[NSArray arrayWithObjects:UCLocalize("CONTINUE_QUEUING"), UCLocalize("CANCEL_CLEAR"), nil] defaultButtonIndex:1 delegate:self context:@"cancel" @@ -7262,7 +7770,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { detachNewThreadSelector:@selector(perform) toTarget:database_ withObject:nil - title:CYLocalize("RUNNING") + title:UCLocalize("RUNNING") ]; } @@ -7299,7 +7807,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class { - BrowserView *browser = [[[_class alloc] initWithBook:book_] autorelease]; + CydiaBrowserView *browser = [[[_class alloc] initWithBook:book_] autorelease]; [browser loadURL:url]; return browser; } @@ -7342,38 +7850,49 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) askForSettings { - NSString *parenthetical(CYLocalize("PARENTHETICAL")); + NSString *parenthetical(UCLocalize("PARENTHETICAL")); UIActionSheet *role = [[[UIActionSheet alloc] - initWithTitle:CYLocalize("WHO_ARE_YOU") + initWithTitle:UCLocalize("WHO_ARE_YOU") buttons:[NSArray arrayWithObjects: - [NSString stringWithFormat:parenthetical, CYLocalize("USER"), CYLocalize("USER_EX")], - [NSString stringWithFormat:parenthetical, CYLocalize("HACKER"), CYLocalize("HACKER_EX")], - [NSString stringWithFormat:parenthetical, CYLocalize("DEVELOPER"), CYLocalize("DEVELOPER_EX")], + [NSString stringWithFormat:parenthetical, UCLocalize("USER"), UCLocalize("USER_EX")], + [NSString stringWithFormat:parenthetical, UCLocalize("HACKER"), UCLocalize("HACKER_EX")], + [NSString stringWithFormat:parenthetical, UCLocalize("DEVELOPER"), UCLocalize("DEVELOPER_EX")], nil] defaultButtonIndex:-1 delegate:self context:@"role" ] autorelease]; - [role setBodyText:CYLocalize("ROLE_EX")]; + [role setBodyText:UCLocalize("ROLE_EX")]; [role popupAlertAnimated:YES]; } - (void) setPackageView:(PackageView *)view { - if (package_ == nil) - package_ = [view retain]; + WebThreadLock(); + [view setPackage:nil]; + if ([details_ count] < 3) + [details_ addObject:view]; + WebThreadUnlock(); +} + +- (PackageView *) _packageView { + return [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; } - (PackageView *) packageView { PackageView *view; + size_t count([details_ count]); - if (package_ == nil) - view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; - else { - return package_; - view = [package_ autorelease]; - package_ = nil; + if (count == 0) { + view = [self _packageView]; + renew: + [details_ addObject:[self _packageView]]; + } else { + view = [[[details_ lastObject] retain] autorelease]; + [details_ removeLastObject]; + if (count == 1) + goto renew; } return view; @@ -7430,7 +7949,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @"install-dn.png", kUIButtonBarButtonSelectedInfo, [NSNumber numberWithInt:2], kUIButtonBarButtonTag, self, kUIButtonBarButtonTarget, - CYLocalize("SECTIONS"), kUIButtonBarButtonTitle, + UCLocalize("SECTIONS"), kUIButtonBarButtonTitle, @"0", kUIButtonBarButtonType, nil], @@ -7440,7 +7959,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @"changes-dn.png", kUIButtonBarButtonSelectedInfo, [NSNumber numberWithInt:3], kUIButtonBarButtonTag, self, kUIButtonBarButtonTarget, - CYLocalize("CHANGES"), kUIButtonBarButtonTitle, + UCLocalize("CHANGES"), kUIButtonBarButtonTitle, @"0", kUIButtonBarButtonType, nil], @@ -7450,7 +7969,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @"manage-dn.png", kUIButtonBarButtonSelectedInfo, [NSNumber numberWithInt:4], kUIButtonBarButtonTag, self, kUIButtonBarButtonTarget, - CYLocalize("MANAGE"), kUIButtonBarButtonTitle, + UCLocalize("MANAGE"), kUIButtonBarButtonTitle, @"0", kUIButtonBarButtonType, nil], @@ -7460,7 +7979,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @"search-dn.png", kUIButtonBarButtonSelectedInfo, [NSNumber numberWithInt:5], kUIButtonBarButtonTag, self, kUIButtonBarButtonTarget, - CYLocalize("SEARCH"), kUIButtonBarButtonTitle, + UCLocalize("SEARCH"), kUIButtonBarButtonTitle, @"0", kUIButtonBarButtonType, nil], nil]; @@ -7511,7 +8030,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { withClass:[ManageView class] ] retain]; - [self setPackageView:[self packageView]]; + details_ = [[NSMutableArray alloc] initWithCapacity:4]; + [details_ addObject:[self _packageView]]; + [details_ addObject:[self _packageView]]; PrintTimes(); @@ -7549,7 +8070,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self _reloadData]; else { Queuing_ = true; - [buttonbar_ setBadgeValue:CYLocalize("Q_D") forButton:4]; + [buttonbar_ setBadgeValue:UCLocalize("Q_D") forButton:4]; [book_ reloadData]; } @@ -7608,12 +8129,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { Changed_ = true; + [sheet dismiss]; + if (reset) [self updateData]; else [self finish]; - - [sheet dismiss]; } else if ([context isEqualToString:@"upgrade"]) { switch (button) { case 1: @@ -7676,20 +8197,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [window_ setUserInteractionEnabled:YES]; } -- (void) openMailToURL:(NSURL *)url { -// XXX: this makes me sad -#if 0 - [[[MailToView alloc] initWithView:underlay_ delegate:self url:url] autorelease]; -#else - [UIApp openURL:url];// asPanel:YES]; -#endif -} - -- (void) clearFirstResponder { - if (id responder = [window_ firstResponder]) - [responder resignFirstResponder]; -} - - (RVPage *) pageForPackage:(NSString *)name { if (Package *package = [database_ packageWithName:name]) { PackageView *view([self packageView]); @@ -7697,14 +8204,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return view; } else { UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:CYLocalize("CANNOT_LOCATE_PACKAGE") - buttons:[NSArray arrayWithObjects:CYLocalize("CLOSE"), nil] + initWithTitle:UCLocalize("CANNOT_LOCATE_PACKAGE") + buttons:[NSArray arrayWithObjects:UCLocalize("CLOSE"), nil] defaultButtonIndex:0 delegate:self context:@"missing" ] autorelease]; - [sheet setBodyText:[NSString stringWithFormat:CYLocalize("PACKAGE_CANNOT_BE_FOUND"), name]]; + [sheet setBodyText:[NSString stringWithFormat:UCLocalize("PACKAGE_CANNOT_BE_FOUND"), name]]; [sheet popupAlertAnimated:YES]; return nil; @@ -7715,6 +8222,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (tag != NULL) tag = 0; + NSString *href([url absoluteString]); + if ([href hasPrefix:@"apptapp://package/"]) + return [self pageForPackage:[href substringFromIndex:18]]; + NSString *scheme([[url scheme] lowercaseString]); if (![scheme isEqualToString:@"cydia"]) return nil; @@ -7728,13 +8239,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if ([path isEqualToString:@"/add-source"]) return [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease]; else if ([path isEqualToString:@"/storage"]) - return [self _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"storage" ofType:@"html"]] withClass:[BrowserView class]]; + return [self _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"storage" ofType:@"html"]] withClass:[CydiaBrowserView class]]; else if ([path isEqualToString:@"/sources"]) return [[[SourceTable alloc] initWithBook:book_ database:database_] autorelease]; else if ([path isEqualToString:@"/packages"]) return [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease]; else if ([path hasPrefix:@"/url/"]) - return [self _pageForURL:[NSURL URLWithString:[path substringFromIndex:5]] withClass:[BrowserView class]]; + return [self _pageForURL:[NSURL URLWithString:[path substringFromIndex:5]] withClass:[CydiaBrowserView class]]; else if ([path hasPrefix:@"/launch/"]) [self launchApplicationWithIdentifier:[path substringFromIndex:8] suspended:NO]; else if ([path hasPrefix:@"/package-settings/"]) @@ -7801,8 +8312,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if ( readlink("/Applications", NULL, 0) == -1 && errno == EINVAL || readlink("/Library/Ringtones", NULL, 0) == -1 && errno == EINVAL || - readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL || + readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL /*|| + readlink("/usr/bin", NULL, 0) == -1 && errno == EINVAL*/ || readlink("/usr/include", NULL, 0) == -1 && errno == EINVAL || + readlink("/usr/lib/pam", NULL, 0) == -1 && errno == EINVAL || readlink("/usr/libexec", NULL, 0) == -1 && errno == EINVAL || readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL /*|| readlink("/var/lib", NULL, 0) == -1 && errno == EINVAL*/ @@ -7921,7 +8434,7 @@ void $UIWebDocumentView$_setUIKitDelegate$(UIWebDocumentView *self, SEL sel, id int main(int argc, char *argv[]) { _pooled _trace(); - PackageName = reinterpret_cast(method_getImplementation(class_getInstanceMethod([Package class], @selector(name)))); + PackageName = reinterpret_cast(method_getImplementation(class_getInstanceMethod([Package class], @selector(cyname)))); /* Library Hacks {{{ */ class_addMethod(objc_getClass("DOMNodeList"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &DOMNodeList$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16");