X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/95cafe4fb4046d29bfc21c039927c7287a2c5e3d..e0c9f6b48aed7882012fc56df96035f00df8bd20:/Cydia.mm diff --git a/Cydia.mm b/Cydia.mm index 2caecf00..53ea2eac 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -1,7 +1,8 @@ /* Cydia - iPhone UIKit Front-End for Debian APT - * Copyright (C) 2008 Jay Freeman (saurik) + * Copyright (C) 2008-2010 Jay Freeman (saurik) */ +/* Modified BSD License {{{ */ /* * Redistribution and use in source and binary * forms, with or without modification, are permitted @@ -34,8 +35,15 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* }}} */ + +// XXX: wtf/FastMalloc.h... wtf? +#define USE_SYSTEM_MALLOC 1 /* #include Directives {{{ */ +#import "UICaboodle/UCPlatform.h" +#import "UICaboodle/UCLocalize.h" + #include #include @@ -43,39 +51,36 @@ #include #include -#include -#import - -#import +#if 0 +#define DEPLOYMENT_TARGET_MACOSX 1 +#define CF_BUILDING_CF 1 +#include +#endif -// XXX: remove -#import -#import -#import -#import -#import -#import -#import -#import -#import +#include +#include -// XXX: remove -#import +#import -#include -#include +#include +#import +#include +#include #include #include #include +#undef ABS + #include #include #include #include #include #include +#include #include #include #include @@ -84,10 +89,16 @@ #include #include #include +#include +#include + +#include #include #include #include +#include +#include #include #include @@ -103,114 +114,574 @@ extern "C" { #include #include -#import "BrowserView.h" -#import "ResetView.h" -#import "UICaboodle.h" +#include + +#import "UICaboodle/BrowserView.h" +#import "UICaboodle/ResetView.h" + +#import "substrate.h" +/* }}} */ + +/* Profiler {{{ */ +struct timeval _ltv; +bool _itv; + +#define _timestamp ({ \ + struct timeval tv; \ + gettimeofday(&tv, NULL); \ + tv.tv_sec * 1000000 + tv.tv_usec; \ +}) + +typedef std::vector TimeList; +TimeList times_; + +class ProfileTime { + private: + const char *name_; + uint64_t total_; + uint64_t count_; + + public: + ProfileTime(const char *name) : + name_(name), + total_(0) + { + times_.push_back(this); + } + + void AddTime(uint64_t time) { + total_ += time; + ++count_; + } + + void Print() { + if (total_ != 0) + std::cerr << std::setw(5) << count_ << ", " << std::setw(7) << total_ << " : " << name_ << std::endl; + total_ = 0; + count_ = 0; + } +}; + +class ProfileTimer { + private: + ProfileTime &time_; + uint64_t start_; + + public: + ProfileTimer(ProfileTime &time) : + time_(time), + start_(_timestamp) + { + } + + ~ProfileTimer() { + time_.AddTime(_timestamp - start_); + } +}; + +void PrintTimes() { + for (TimeList::const_iterator i(times_.begin()); i != times_.end(); ++i) + (*i)->Print(); + std::cerr << "========" << std::endl; +} + +#define _profile(name) { \ + static ProfileTime name(#name); \ + ProfileTimer _ ## name(name); + +#define _end } +/* }}} */ + +#define _pooled _H _pool([[NSAutoreleasePool alloc] init], true); + +static const NSUInteger UIViewAutoresizingFlexibleBoth(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight); + +void NSLogPoint(const char *fix, const CGPoint &point) { + NSLog(@"%s(%g,%g)", fix, point.x, point.y); +} + +void NSLogRect(const char *fix, const CGRect &rect) { + NSLog(@"%s(%g,%g)+(%g,%g)", fix, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); +} + +static _finline NSString *CydiaURL(NSString *path) { + char page[25]; + page[0] = 'h'; page[1] = 't'; page[2] = 't'; page[3] = 'p'; page[4] = ':'; + page[5] = '/'; page[6] = '/'; page[7] = 'c'; page[8] = 'y'; page[9] = 'd'; + page[10] = 'i'; page[11] = 'a'; page[12] = '.'; page[13] = 's'; page[14] = 'a'; + page[15] = 'u'; page[16] = 'r'; page[17] = 'i'; page[18] = 'k'; page[19] = '.'; + page[20] = 'c'; page[21] = 'o'; page[22] = 'm'; page[23] = '/'; page[24] = '\0'; + return [[NSString stringWithUTF8String:page] stringByAppendingString:path]; +} + +/* [NSObject yieldToSelector:(withObject:)] {{{*/ +@interface NSObject (Cydia) +- (id) yieldToSelector:(SEL)selector withObject:(id)object; +- (id) yieldToSelector:(SEL)selector; +@end + +@implementation NSObject (Cydia) + +- (void) doNothing { +} + +- (void) _yieldToContext:(NSMutableArray *)context { _pooled + SEL selector(reinterpret_cast([[context objectAtIndex:0] pointerValue])); + id object([[context objectAtIndex:1] nonretainedObjectValue]); + volatile bool &stopped(*reinterpret_cast([[context objectAtIndex:2] pointerValue])); + + /* XXX: deal with exceptions */ + id value([self performSelector:selector withObject:object]); + + NSMethodSignature *signature([self methodSignatureForSelector:selector]); + [context removeAllObjects]; + if ([signature methodReturnLength] != 0 && value != nil) + [context addObject:value]; + + stopped = true; + + [self + performSelectorOnMainThread:@selector(doNothing) + withObject:nil + waitUntilDone:NO + ]; +} + +- (id) yieldToSelector:(SEL)selector withObject:(id)object { + /*return [self performSelector:selector withObject:object];*/ + + volatile bool stopped(false); + + NSMutableArray *context([NSMutableArray arrayWithObjects: + [NSValue valueWithPointer:selector], + [NSValue valueWithNonretainedObject:object], + [NSValue valueWithPointer:const_cast(&stopped)], + nil]); + + NSThread *thread([[[NSThread alloc] + initWithTarget:self + selector:@selector(_yieldToContext:) + object:context + ] autorelease]); + + [thread start]; + + NSRunLoop *loop([NSRunLoop currentRunLoop]); + NSDate *future([NSDate distantFuture]); + + while (!stopped && [loop runMode:NSDefaultRunLoopMode beforeDate:future]); + + return [context count] == 0 ? nil : [context objectAtIndex:0]; +} + +- (id) yieldToSelector:(SEL)selector { + return [self yieldToSelector:selector withObject:nil]; +} + +@end /* }}} */ -static const NSStringCompareOptions CompareOptions_ = NSCaseInsensitiveSearch | NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSForcedOrderingSearch; +@interface CYActionSheet : UIAlertView { + unsigned button_; +} + +- (int) yieldToPopupAlertAnimated:(BOOL)animated; +@end + +@implementation CYActionSheet + +- (id) initWithTitle:(NSString *)title buttons:(NSArray *)buttons defaultButtonIndex:(int)index { + if ((self = [super init])) { + [self setDelegate:self]; + for (NSString *button in buttons) [self addButtonWithTitle:button]; + [self setCancelButtonIndex:index]; + } return self; +} + +- (void) alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex { + button_ = buttonIndex + 1; +} + +- (int) yieldToPopupAlertAnimated:(BOOL)animated { + button_ = 0; + [self popupAlertAnimated:animated]; + NSRunLoop *loop([NSRunLoop currentRunLoop]); + NSDate *future([NSDate distantFuture]); + while (button_ == 0 && [loop runMode:NSDefaultRunLoopMode beforeDate:future]); + return button_; +} + +@end + +/* NSForcedOrderingSearch doesn't work on the iPhone */ +static const NSStringCompareOptions MatchCompareOptions_ = NSLiteralSearch | NSCaseInsensitiveSearch; +static const NSStringCompareOptions LaxCompareOptions_ = NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSCaseInsensitiveSearch; +static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | kCFCompareNonliteral | kCFCompareLocalized | kCFCompareNumerically | kCFCompareWidthInsensitive | kCFCompareForcedOrdering; + +/* Information Dictionaries {{{ */ +@interface NSMutableArray (Cydia) +- (void) addInfoDictionary:(NSDictionary *)info; +@end + +@implementation NSMutableArray (Cydia) + +- (void) addInfoDictionary:(NSDictionary *)info { + [self addObject:info]; +} + +@end -@interface WebView (Cydia) -- (void) _setLayoutInterval:(float)interval; +@interface NSMutableDictionary (Cydia) +- (void) addInfoDictionary:(NSDictionary *)info; @end -/* iPhoneOS 2.0 Compatibility {{{ */ -#ifdef __OBJC2__ -@interface UICGColor : NSObject { +@implementation NSMutableDictionary (Cydia) + +- (void) addInfoDictionary:(NSDictionary *)info { + [self setObject:info forKey:[info objectForKey:@"CFBundleIdentifier"]]; } -- (id) initWithCGColor:(CGColorRef)color; @end +/* }}} */ +/* Pop Transitions {{{ */ +@interface PopTransitionView : UITransitionView { +} -@interface NSObject (iPhoneOS) -- (CGColorRef) cgColor; -- (CGColorRef) CGColor; -- (void) set; @end -@implementation NSObject (iPhoneOS) +@implementation PopTransitionView -- (CGColorRef) cgColor { - return [self CGColor]; +- (void) transitionViewDidComplete:(UITransitionView *)view fromView:(UIView *)from toView:(UIView *)to { + if (from != nil && to == nil) + [self removeFromSuperview]; } -- (CGColorRef) CGColor { - return (CGColorRef) self; +@end + +@implementation UIView (PopUpView) + +- (void) popFromSuperviewAnimated:(BOOL)animated { + [[self superview] transition:(animated ? UITransitionPushFromTop : UITransitionNone) toView:nil]; } -- (void) set { - [[[[objc_getClass("UICGColor") alloc] initWithCGColor:[self CGColor]] autorelease] set]; +- (void) popSubview:(UIView *)view { + UITransitionView *transition([[[PopTransitionView alloc] initWithFrame:[self bounds]] autorelease]); + [transition setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [self addSubview:transition]; + + [transition setDelegate:transition]; + + UIView *blank([[[UIView alloc] initWithFrame:[transition bounds]] autorelease]); + [blank setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + + [transition transition:UITransitionNone toView:blank]; + [transition transition:UITransitionPushFromBottom toView:view]; } @end +/* }}} */ + +#define lprintf(args...) fprintf(stderr, args) + +#define ForRelease 0 +#define TraceLogging (1 && !ForRelease) +#define HistogramInsertionSort (0 && !ForRelease) +#define ProfileTimes (0 && !ForRelease) +#define ForSaurik (0 && !ForRelease) +#define LogBrowser (0 && !ForRelease) +#define TrackResize (0 && !ForRelease) +#define ManualRefresh (0 && !ForRelease) +#define ShowInternals (0 && !ForRelease) +#define IgnoreInstall (0 && !ForRelease) +#define RecycleWebViews 0 +#define RecyclePackageViews (1 && ForRelease) +#define AlwaysReload (1 && !ForRelease) + +#if !TraceLogging +#undef _trace +#define _trace(args...) +#endif + +#if !ProfileTimes +#undef _profile +#define _profile(name) { +#undef _end +#define _end } +#define PrintTimes() do {} while (false) +#endif + +/* Radix Sort {{{ */ +typedef uint32_t (*SKRadixFunction)(id, void *); -@interface UITextView (iPhoneOS) -- (void) setTextSize:(float)size; +@interface NSMutableArray (Radix) +- (void) radixSortUsingSelector:(SEL)selector withObject:(id)object; +- (void) radixSortUsingFunction:(SKRadixFunction)function withContext:(void *)argument; @end -@implementation UITextView (iPhoneOS) +struct RadixItem_ { + size_t index; + uint32_t key; +}; + +static void RadixSort_(NSMutableArray *self, size_t count, struct RadixItem_ *swap) { + struct RadixItem_ *lhs(swap), *rhs(swap + count); + + static const size_t width = 32; + static const size_t bits = 11; + static const size_t slots = 1 << bits; + static const size_t passes = (width + (bits - 1)) / bits; + + size_t *hist(new size_t[slots]); + + for (size_t pass(0); pass != passes; ++pass) { + memset(hist, 0, sizeof(size_t) * slots); + + for (size_t i(0); i != count; ++i) { + uint32_t key(lhs[i].key); + key >>= pass * bits; + key &= _not(uint32_t) >> width - bits; + ++hist[key]; + } + + size_t offset(0); + for (size_t i(0); i != slots; ++i) { + size_t local(offset); + offset += hist[i]; + hist[i] = local; + } + + for (size_t i(0); i != count; ++i) { + uint32_t key(lhs[i].key); + key >>= pass * bits; + key &= _not(uint32_t) >> width - bits; + rhs[hist[key]++] = lhs[i]; + } + + RadixItem_ *tmp(lhs); + lhs = rhs; + rhs = tmp; + } + + delete [] hist; -- (void) setTextSize:(float)size { - [self setFont:[[self font] fontWithSize:size]]; + NSMutableArray *values([NSMutableArray arrayWithCapacity:count]); + for (size_t i(0); i != count; ++i) + [values addObject:[self objectAtIndex:lhs[i].index]]; + [self setArray:values]; + + delete [] swap; +} + +@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 + + struct RadixItem_ *swap(new RadixItem_[count * 2]); + + for (size_t i(0); i != count; ++i) { + RadixItem_ &item(swap[i]); + item.index = i; + + id object([self objectAtIndex:i]); + +#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:(SKRadixFunction)function withContext:(void *)argument { + size_t count([self count]); + struct RadixItem_ *swap(new RadixItem_[count * 2]); + + for (size_t i(0); i != count; ++i) { + RadixItem_ &item(swap[i]); + item.index = i; + + id object([self objectAtIndex:i]); + item.key = function(object, argument); + } + + RadixSort_(self, count, swap); } @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 +} + /* }}} */ -@interface UIApplication (IdleTimer) -- (void) setIdleTimerDisabled:(char)arg0; +/* Apple Bug Fixes {{{ */ +@implementation UIWebDocumentView (Cydia) + +- (void) _setScrollerOffset:(CGPoint)offset { + UIScroller *scroller([self _scroller]); + + CGSize size([scroller contentSize]); + CGSize bounds([scroller bounds].size); + + CGPoint max; + max.x = size.width - bounds.width; + max.y = size.height - bounds.height; + + // wtf Apple?! + if (max.x < 0) + max.x = 0; + if (max.y < 0) + max.y = 0; + + offset.x = offset.x < 0 ? 0 : offset.x > max.x ? max.x : offset.x; + offset.y = offset.y < 0 ? 0 : offset.y > max.y ? max.y : offset.y; + + [scroller setOffset:offset]; +} + @end +/* }}} */ -extern "C" int UIApplicationMain(int argc, char *argv[], NSString *principalClassName, NSString *delegateClassName); - -extern NSString *kUIButtonBarButtonAction; -extern NSString *kUIButtonBarButtonInfo; -extern NSString *kUIButtonBarButtonInfoOffset; -extern NSString *kUIButtonBarButtonSelectedInfo; -extern NSString *kUIButtonBarButtonStyle; -extern NSString *kUIButtonBarButtonTag; -extern NSString *kUIButtonBarButtonTarget; -extern NSString *kUIButtonBarButtonTitle; -extern NSString *kUIButtonBarButtonTitleVerticalHeight; -extern NSString *kUIButtonBarButtonTitleWidth; -extern NSString *kUIButtonBarButtonType; - -typedef enum { - kUIProgressIndicatorStyleLargeWhite = 0, - kUIProgressIndicatorStyleMediumWhite = 1, - kUIProgressIndicatorStyleMediumBrown = 2, - kUIProgressIndicatorStyleSmallWhite = 3, - kUIProgressIndicatorStyleSmallBlack = 4, - kUIProgressIndicatorStyleTinyWhite = 5, -} UIProgressIndicatorStyle; - -typedef enum { - kUIControlEventMouseDown = 1 << 0, - kUIControlEventMouseMovedInside = 1 << 2, // mouse moved inside control target - kUIControlEventMouseMovedOutside = 1 << 3, // mouse moved outside control target - kUIControlEventMouseUpInside = 1 << 6, // mouse up inside control target - kUIControlEventMouseUpOutside = 1 << 7, // mouse up outside control target - kUIControlAllEvents = (kUIControlEventMouseDown | kUIControlEventMouseMovedInside | kUIControlEventMouseMovedOutside | kUIControlEventMouseUpInside | kUIControlEventMouseUpOutside) -} UIControlEventMasks; +NSUInteger WebScriptObject$countByEnumeratingWithState$objects$count$(WebScriptObject *self, SEL sel, NSFastEnumerationState *state, id *objects, NSUInteger count) { + size_t length([self count] - state->state); + if (length <= 0) + return 0; + else if (length > count) + length = count; + for (size_t i(0); i != length; ++i) + objects[i] = [self objectAtIndex:state->state++]; + state->itemsPtr = objects; + state->mutationsPtr = (unsigned long *) self; + return length; +} + +NSUInteger DOMNodeList$countByEnumeratingWithState$objects$count$(DOMNodeList *self, SEL sel, NSFastEnumerationState *state, id *objects, NSUInteger count) { + size_t length([self length] - state->state); + if (length <= 0) + return 0; + else if (length > count) + length = count; + for (size_t i(0); i != length; ++i) + objects[i] = [self item:state->state++]; + state->itemsPtr = objects; + state->mutationsPtr = (unsigned long *) self; + return length; +} @interface NSString (UIKit) - (NSString *) stringByAddingPercentEscapes; -- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1; @end +/* Cydia NSString Additions {{{ */ @interface NSString (Cydia) ++ (NSString *) stringWithUTF8BytesNoCopy:(const char *)bytes length:(int)length; ++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length withZone:(NSZone *)zone inPool:(apr_pool_t *)pool; + (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length; - (NSComparisonResult) compareByPath:(NSString *)other; +- (NSString *) stringByCachingURLWithCurrentCDN; +- (NSString *) stringByAddingPercentEscapesIncludingReserved; @end @implementation NSString (Cydia) -+ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length { - char data[length + 1]; ++ (NSString *) stringWithUTF8BytesNoCopy:(const char *)bytes length:(int)length { + return [[[NSString alloc] initWithBytesNoCopy:const_cast(bytes) length:length encoding:NSUTF8StringEncoding freeWhenDone:NO] autorelease]; +} + ++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length withZone:(NSZone *)zone inPool:(apr_pool_t *)pool { + char *data(reinterpret_cast(apr_palloc(pool, length))); memcpy(data, bytes, length); - data[length] = '\0'; - return [NSString stringWithUTF8String:data]; + return [[[NSString allocWithZone:zone] initWithBytesNoCopy:data length:length encoding:NSUTF8StringEncoding freeWhenDone:NO] autorelease]; +} + ++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length { + return [[[NSString alloc] initWithBytes:bytes length:length encoding:NSUTF8StringEncoding] autorelease]; } - (NSComparisonResult) compareByPath:(NSString *)other { @@ -243,7 +714,151 @@ typedef enum { return result == NSOrderedSame ? value : result; } +- (NSString *) stringByCachingURLWithCurrentCDN { + return [self + stringByReplacingOccurrencesOfString:@"://cydia.saurik.com/" + withString:@"://cache.cydia.saurik.com/" + ]; +} + +- (NSString *) stringByAddingPercentEscapesIncludingReserved { + return [(id)CFURLCreateStringByAddingPercentEscapes( + kCFAllocatorDefault, + (CFStringRef) self, + NULL, + CFSTR(";/?:@&=+$,"), + kCFStringEncodingUTF8 + ) autorelease]; +} + @end +/* }}} */ + +/* C++ NSString Wrapper Cache {{{ */ +class CYString { + private: + char *data_; + size_t size_; + CFStringRef cache_; + + _finline void clear_() { + if (cache_ != NULL) { + CFRelease(cache_); + cache_ = NULL; + } + } + + public: + _finline bool empty() const { + return size_ == 0; + } + + _finline size_t size() const { + return size_; + } + + _finline char *data() const { + return data_; + } + + _finline void clear() { + size_ = 0; + clear_(); + } + + _finline CYString() : + data_(0), + size_(0), + cache_(NULL) + { + } + + _finline ~CYString() { + clear_(); + } + + void operator =(const CYString &rhs) { + data_ = rhs.data_; + size_ = rhs.size_; + + if (rhs.cache_ == nil) + cache_ = NULL; + else + cache_ = reinterpret_cast(CFRetain(rhs.cache_)); + } + + void set(apr_pool_t *pool, const char *data, size_t size) { + if (size == 0) + clear(); + else { + clear_(); + + char *temp(reinterpret_cast(apr_palloc(pool, size + 1))); + memcpy(temp, data, size); + temp[size] = '\0'; + data_ = temp; + size_ = size; + } + } + + _finline void set(apr_pool_t *pool, const char *data) { + set(pool, data, data == NULL ? 0 : strlen(data)); + } + + _finline void set(apr_pool_t *pool, const std::string &rhs) { + set(pool, rhs.data(), rhs.size()); + } + + bool operator ==(const CYString &rhs) const { + return size_ == rhs.size_ && memcmp(data_, rhs.data_, size_) == 0; + } + + operator CFStringRef() { + if (cache_ == NULL) { + if (size_ == 0) + return nil; + cache_ = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(data_), size_, kCFStringEncodingUTF8, NO, kCFAllocatorNull); + if (cache_ == NULL) + cache_ = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(data_), size_, kCFStringEncodingISOLatin1, NO, kCFAllocatorNull); + } return cache_; + } + + _finline operator id() { + return (NSString *) static_cast(*this); + } +}; +/* }}} */ +/* C++ NSString Algorithm Adapters {{{ */ +extern "C" { + CF_EXPORT CFHashCode CFStringHashNSString(CFStringRef str); +} + +struct NSStringMapHash : + std::unary_function +{ + _finline size_t operator ()(NSString *value) const { + return CFStringHashNSString((CFStringRef) value); + } +}; + +struct NSStringMapLess : + std::binary_function +{ + _finline bool operator ()(NSString *lhs, NSString *rhs) const { + return [lhs compare:rhs] == NSOrderedAscending; + } +}; + +struct NSStringMapEqual : + std::binary_function +{ + _finline bool operator ()(NSString *lhs, NSString *rhs) const { + return CFStringCompare((CFStringRef) lhs, (CFStringRef) rhs, 0) == kCFCompareEqualTo; + //CFEqual((CFTypeRef) lhs, (CFTypeRef) rhs); + //[lhs isEqualToString:rhs]; + } +}; +/* }}} */ /* Perl-Compatible RegEx {{{ */ class Pcre { @@ -263,7 +878,7 @@ class Pcre { code_ = pcre_compile(regex, 0, &error, &offset, NULL); if (code_ == NULL) { - fprintf(stderr, "%d:%s\n", offset, error); + lprintf("%d:%s\n", offset, error); _assert(false); } @@ -300,6 +915,8 @@ class Pcre { - (NSString *) name; - (NSString *) address; +- (void) setAddress:(NSString *)address; + + (Address *) addressWithString:(NSString *)string; - (Address *) initWithString:(NSString *)string; @end @@ -321,6 +938,15 @@ class Pcre { return address_; } +- (void) setAddress:(NSString *)address { + if (address_ != nil) + [address_ autorelease]; + if (address == nil) + address_ = nil; + else + address_ = [address retain]; +} + + (Address *) addressWithString:(NSString *)string { return [[[Address alloc] initWithString:string] autorelease]; } @@ -348,12 +974,7 @@ class Pcre { name_ = [address_r[1] retain]; address_ = [address_r[2] retain]; } else { - name_ = [[NSString alloc] - initWithBytes:data - length:size - encoding:kCFStringEncodingUTF8 - ]; - + name_ = [string retain]; address_ = nil; } } return self; @@ -399,28 +1020,37 @@ class CGColor { }; /* }}} */ -extern "C" void UISetColor(CGColorRef color); - /* Random Global Variables {{{ */ static const int PulseInterval_ = 50000; +static const int ButtonBarWidth_ = 60; static const int ButtonBarHeight_ = 48; static const float KeyboardTime_ = 0.3f; -static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist"; + +static int Finish_; +static NSArray *Finishes_; + +#define SpringBoard_ "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist" +#define NotifyConfig_ "/etc/notify.conf" + +static bool Queuing_; static CGColor Blue_; static CGColor Blueish_; static CGColor Black_; static CGColor Off_; -static CGColor Red_; static CGColor White_; static CGColor Gray_; +static CGColor Green_; +static CGColor Purple_; +static CGColor Purplish_; + +static UIColor *InstallingColor_; +static UIColor *RemovingColor_; static NSString *App_; static NSString *Home_; -static BOOL Sounds_Keyboard_; static BOOL Advanced_; -static BOOL Loaded_; static BOOL Ignored_; static UIFont *Font12_; @@ -429,24 +1059,21 @@ static UIFont *Font14_; static UIFont *Font18Bold_; static UIFont *Font22Bold_; -static const char *Firmware_ = NULL; static const char *Machine_ = NULL; -static const NSString *UniqueID_ = NULL; - -unsigned Major_; -unsigned Minor_; -unsigned BugFix_; +static const NSString *System_ = NULL; +static const NSString *SerialNumber_ = nil; +static const NSString *ChipID_ = nil; +static const NSString *Token_ = nil; +static const NSString *UniqueID_ = nil; +static const NSString *Build_ = nil; +static const NSString *Product_ = nil; +static const NSString *Safari_ = nil; -CFLocaleRef Locale_; -CGColorSpaceRef space_; +static CFLocaleRef Locale_; +static NSArray *Languages_; +static CGColorSpaceRef space_; -#define FW_LEAST(major, minor, bugfix) \ - (major < Major_ || major == Major_ && \ - (minor < Minor_ || minor == Minor_ && \ - bugfix <= BugFix_)) - -bool bootstrap_; -bool reload_; +static bool reload_; static NSDictionary *SectionMap_; static NSMutableDictionary *Metadata_; @@ -455,30 +1082,27 @@ static _transient NSString *Role_; static _transient NSMutableDictionary *Packages_; static _transient NSMutableDictionary *Sections_; static _transient NSMutableDictionary *Sources_; -static _transient NSMutableArray *Documents_; static bool Changed_; static NSDate *now_; -NSString *GetLastUpdate() { - NSDate *update = [Metadata_ objectForKey:@"LastUpdate"]; - - if (update == nil) - return @"Never or Unknown"; - - CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle); - CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update); - - CFRelease(formatter); +static bool IsWildcat_; - return [(NSString *) formatted autorelease]; -} +#if RecycleWebViews +static NSMutableArray *Documents_; +#endif /* }}} */ + /* Display Helpers {{{ */ inline float Interpolate(float begin, float end, float fraction) { return (end - begin) * fraction + begin; } +/* XXX: localize this! */ NSString *SizeString(double size) { + bool negative = size < 0; + if (negative) + size = -size; + unsigned power = 0; while (size > 1024) { size /= 1024; @@ -487,37 +1111,42 @@ NSString *SizeString(double size) { static const char *powers_[] = {"B", "kB", "MB", "GB"}; - return [NSString stringWithFormat:@"%.1f%s", size, powers_[power]]; + return [NSString stringWithFormat:@"%s%.1f %s", (negative ? "-" : ""), size, powers_[power]]; } -NSString *StripVersion(NSString *version) { - NSRange colon = [version rangeOfString:@":"]; - if (colon.location != NSNotFound) - version = [version substringFromIndex:(colon.location + 1)]; - return version; +static _finline CFStringRef CFCString(const char *value) { + return CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(value), strlen(value), kCFStringEncodingUTF8, NO, kCFAllocatorNull); } -static const float TextViewOffset_ = 22; +const char *StripVersion_(const char *version) { + const char *colon(strchr(version, ':')); + if (colon != NULL) + version = colon + 1; + return version; +} -UITextView *GetTextView(NSString *value, float left, bool html) { - UITextView *text([[[UITextView alloc] initWithFrame:CGRectMake(left, 3, 310 - left, 1000)] autorelease]); - [text setEditable:NO]; - [text setTextSize:16]; - /*if (html) - [text setHTML:value]; - else*/ - [text setText:value]; - [text setEnabled:NO]; +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); +} - [text setBackgroundColor:[UIColor clearColor]]; +NSString *LocalizeSection(NSString *section) { + static Pcre title_r("^(.*?) \\((.*)\\)$"); + if (title_r(section)) { + NSString *parent(title_r[1]); + NSString *child(title_r[2]); - CGRect frame = [text frame]; - [text setFrame:frame]; - CGRect rect = [text visibleTextRect]; - frame.size.height = rect.size.height; - [text setFrame:frame]; + return [NSString stringWithFormat:UCLocalize("PARENTHETICAL"), + LocalizeSection(parent), + LocalizeSection(child) + ]; + } - return text; + return [[NSBundle mainBundle] localizedStringForKey:section value:nil table:@"Sections"]; } NSString *Simplify(NSString *title) { @@ -532,7 +1161,7 @@ NSString *Simplify(NSString *title) { if (paren_r(data, size)) return Simplify(paren_r[1]); - static Pcre title_r("^(.*?) \\(.*\\)$"); + static Pcre title_r("^(.*?) \\((.*)\\)$"); if (title_r(data, size)) return Simplify(title_r[1]); @@ -540,9 +1169,23 @@ NSString *Simplify(NSString *title) { } /* }}} */ +NSString *GetLastUpdate() { + NSDate *update = [Metadata_ objectForKey:@"LastUpdate"]; + + if (update == nil) + return UCLocalize("NEVER_OR_UNKNOWN"); + + CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle); + CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update); + + CFRelease(formatter); + + return [(NSString *) formatted autorelease]; +} + bool isSectionVisible(NSString *section) { - NSDictionary *metadata = [Sections_ objectForKey:section]; - NSNumber *hidden = metadata == nil ? nil : [metadata objectForKey:@"Hidden"]; + NSDictionary *metadata([Sections_ objectForKey:section]); + NSNumber *hidden(metadata == nil ? nil : [metadata objectForKey:@"Hidden"]); return hidden == nil || ![hidden boolValue]; } @@ -553,19 +1196,8 @@ bool isSectionVisible(NSString *section) { @interface NSObject (ProgressDelegate) @end -@implementation NSObject(ProgressDelegate) - -- (void) _setProgressError:(NSArray *)args { - [self performSelector:@selector(setProgressError:forPackage:) - withObject:[args objectAtIndex:0] - withObject:([args count] == 1 ? nil : [args objectAtIndex:1]) - ]; -} - -@end - @protocol ProgressDelegate -- (void) setProgressError:(NSString *)error forPackage:(NSString *)id; +- (void) setProgressError:(NSString *)error withTitle:(NSString *)id; - (void) setProgressTitle:(NSString *)title; - (void) setProgressPercent:(float)percent; - (void) startProgress; @@ -578,8 +1210,13 @@ bool isSectionVisible(NSString *section) { - (void) setConfigurationData:(NSString *)data; @end +@class PackageView; + @protocol CydiaDelegate +- (void) setPackageView:(PackageView *)view; +- (void) clearPackage:(Package *)package; - (void) installPackage:(Package *)package; +- (void) installPackages:(NSArray *)packages; - (void) removePackage:(Package *)package; - (void) slideUp:(UIActionSheet *)alert; - (void) distUpgrade; @@ -587,6 +1224,9 @@ bool isSectionVisible(NSString *section) { - (void) syncData; - (void) askForSettings; - (UIProgressHUD *) addProgressHUD; +- (void) removeProgressHUD:(UIProgressHUD *)hud; +- (RVPage *) pageForPackage:(NSString *)name; +- (PackageView *) packageView; @end /* }}} */ @@ -607,6 +1247,10 @@ class Status : delegate_ = delegate; } + NSObject *getDelegate() const { + return delegate_; + } + virtual bool MediaChange(std::string media, std::string drive) { return false; } @@ -615,7 +1259,8 @@ class Status : } virtual void Fetch(pkgAcquire::ItemDesc &item) { - [delegate_ setProgressTitle:[NSString stringWithUTF8String:("Downloading " + item.ShortDesc).c_str()]]; + //NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]); + [delegate_ setProgressTitle:[NSString stringWithFormat:UCLocalize("DOWNLOADING_"), [NSString stringWithUTF8String:item.ShortDesc.c_str()]]]; } virtual void Done(pkgAcquire::ItemDesc &item) { @@ -628,8 +1273,19 @@ class Status : ) return; - [delegate_ performSelectorOnMainThread:@selector(_setProgressError:) - withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()], nil] + std::string &error(item.Owner->ErrorText); + if (error.empty()) + return; + + NSString *description([NSString stringWithUTF8String:item.Description.c_str()]); + NSArray *fields([description componentsSeparatedByString:@" "]); + NSString *source([fields count] == 0 ? nil : [fields objectAtIndex:0]); + + [delegate_ performSelectorOnMainThread:@selector(_setProgressErrorPackage:) + withObject:[NSArray arrayWithObjects: + [NSString stringWithUTF8String:error.c_str()], + source, + nil] waitUntilDone:YES ]; } @@ -660,16 +1316,23 @@ class Progress : { private: _transient id delegate_; + float percent_; protected: virtual void Update() { - [delegate_ setProgressTitle:[NSString stringWithUTF8String:Op.c_str()]]; - [delegate_ setProgressPercent:(Percent / 100)]; + /*if (abs(Percent - percent_) > 2) + //NSLog(@"%s:%s:%f", Op.c_str(), SubOp.c_str(), Percent); + percent_ = Percent; + }*/ + + /*[delegate_ setProgressTitle:[NSString stringWithUTF8String:Op.c_str()]]; + [delegate_ setProgressPercent:(Percent / 100)];*/ } public: Progress() : - delegate_(nil) + delegate_(nil), + percent_(0) { } @@ -677,14 +1340,26 @@ class Progress : delegate_ = delegate; } + id getDelegate() const { + return delegate_; + } + virtual void Done() { - [delegate_ setProgressPercent:1]; + //NSLog(@"DONE"); + //[delegate_ setProgressPercent:1]; } }; /* }}} */ /* Database Interface {{{ */ +typedef std::map< unsigned long, _H > SourceMap; + @interface Database : NSObject { + NSZone *zone_; + apr_pool_t *pool_; + + unsigned era_; + pkgCacheFile cache_; pkgDepCache::Policy *policy_; pkgRecords *records_; @@ -694,7 +1369,7 @@ class Progress : SPtr manager_; pkgSourceList *list_; - NSMutableDictionary *sources_; + SourceMap sources_; NSMutableArray *packages_; _transient NSObject *delegate_; @@ -706,6 +1381,9 @@ class Progress : FILE *input_; } ++ (Database *) sharedInstance; +- (unsigned) era; + - (void) _readCydia:(NSNumber *)fd; - (void) _readStatus:(NSNumber *)fd; - (void) _readOutput:(NSNumber *)fd; @@ -714,50 +1392,92 @@ class Progress : - (Package *) packageWithName:(NSString *)name; -- (Database *) init; - (pkgCacheFile &) cache; - (pkgDepCache::Policy *) policy; - (pkgRecords *) records; - (pkgProblemResolver *) resolver; - (pkgAcquire &) fetcher; +- (pkgSourceList &) list; - (NSArray *) packages; - (NSArray *) sources; - (void) reloadData; - (void) configure; -- (void) prepare; +- (bool) prepare; - (void) perform; -- (void) upgrade; +- (bool) upgrade; - (void) update; +- (void) setVisible; + - (void) updateWithStatus:(Status &)status; - (void) setDelegate:(id)delegate; -- (Source *) getSource:(const pkgCache::PkgFileIterator &)file; +- (Source *) getSource:(pkgCache::PkgFileIterator)file; +@end +/* }}} */ +/* Delegate Helpers {{{ */ +@implementation NSObject(ProgressDelegate) + +- (void) _setProgressErrorPackage:(NSArray *)args { + [self performSelector:@selector(setProgressError:forPackage:) + withObject:[args objectAtIndex:0] + withObject:([args count] == 1 ? nil : [args objectAtIndex:1]) + ]; +} + +- (void) _setProgressErrorTitle:(NSArray *)args { + [self performSelector:@selector(setProgressError:withTitle:) + withObject:[args objectAtIndex:0] + withObject:([args count] == 1 ? nil : [args objectAtIndex:1]) + ]; +} + +- (void) _setProgressError:(NSString *)error withTitle:(NSString *)title { + [self performSelectorOnMainThread:@selector(_setProgressErrorTitle:) + withObject:[NSArray arrayWithObjects:error, title, nil] + waitUntilDone:YES + ]; +} + +- (void) setProgressError:(NSString *)error forPackage:(NSString *)id { + Package *package = id == nil ? nil : [[Database sharedInstance] packageWithName:id]; + // XXX: holy typecast batman! + [(id)self setProgressError:error withTitle:(package == nil ? id : [package name])]; +} + @end /* }}} */ /* Source Class {{{ */ @interface Source : NSObject { - NSString *description_; - NSString *label_; - NSString *origin_; + 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 *authority_; - 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; - (BOOL) trusted; @@ -779,24 +1499,37 @@ class Progress : @implementation Source -- (void) dealloc { - [uri_ release]; - [distribution_ release]; - [type_ release]; +- (void) _clear { + uri_.clear(); + distribution_.clear(); + type_.clear(); - if (description_ != nil) - [description_ release]; - if (label_ != nil) - [label_ release]; - if (origin_ != nil) - [origin_ release]; - if (version_ != nil) - [version_ release]; - if (defaultIcon_ != nil) - [defaultIcon_ release]; - if (record_ != nil) + 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; + } + if (authority_ != nil) { + [authority_ release]; + authority_ = nil; + } +} + +- (void) dealloc { + [self _clear]; [super dealloc]; } @@ -812,44 +1545,72 @@ class Progress : return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name]; } -- (Source *) initWithMetaIndex:(metaIndex *)index { - if ((self = [super init]) != nil) { - 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]; - - 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; +- (void) setMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool { + [self _clear]; + + trusted_ = index->IsTrusted(); + + uri_.set(pool, index->GetURI()); + distribution_.set(pool, index->GetDist()); + type_.set(pool, index->GetType()); - 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 == "Version") - version_ = [[NSString stringWithUTF8String:value.c_str()] retain]; + debReleaseIndex *dindex(dynamic_cast(index)); + if (dindex != NULL) { + 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]; + + NSURL *url([NSURL URLWithString:uri_]); + + host_ = [url host]; + if (host_ != nil) + host_ = [[host_ lowercaseString] retain]; + + if (host_ != nil) + authority_ = host_; + else + authority_ = [url path]; + + if (authority_ != nil) + authority_ = [authority_ retain]; +} - record_ = [Sources_ objectForKey:[self key]]; - if (record_ != nil) - record_ = [record_ retain]; +- (Source *) initWithMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool { + if ((self = [super init]) != nil) { + [self setMetaIndex:index inPool:pool]; } return self; } @@ -873,7 +1634,15 @@ class Progress : return NSOrderedDescending; } - return [lhs compare:rhs options:CompareOptions_]; + return [lhs compare:rhs options:LaxCompareOptions_]; +} + +- (NSString *) depictionForPackage:(NSString *)package { + return depiction_.empty() ? nil : [depiction_ stringByReplacingOccurrencesOfString:@"*" withString:package]; +} + +- (NSString *) supportForPackage:(NSString *)package { + return support_.empty() ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package]; } - (NSDictionary *) record { @@ -897,15 +1666,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() ? authority_ : origin_; } - (NSString *) description { @@ -913,7 +1682,7 @@ class Progress : } - (NSString *) label { - return label_ == nil ? [self host] : label_; + return label_.empty() ? authority_ : label_; } - (NSString *) origin { @@ -966,76 +1735,83 @@ class Progress : @end /* }}} */ /* Package Class {{{ */ -NSString *Scour(const char *field, const char *begin, const char *end) { - size_t i(0), l(strlen(field)); - - for (;;) { - const char *name = begin + i; - const char *colon = name + l; - const char *value = colon + 1; - - if ( - value < end && - *colon == ':' && - memcmp(name, field, l) == 0 - ) { - while (value != end && value[0] == ' ') - ++value; - const char *line = std::find(value, end, '\n'); - while (line != value && line[-1] == ' ') - --line; - - return [NSString stringWithUTF8Bytes:value length:(line - value)]; - } else { - begin = std::find(begin, end, '\n'); - if (begin == end) - return nil; - ++begin; - } - } -} - @interface Package : NSObject { + unsigned era_; + apr_pool_t *pool_; + + pkgCache::VerIterator version_; pkgCache::PkgIterator iterator_; _transient Database *database_; - pkgCache::VerIterator version_; pkgCache::VerFileIterator file_; Source *source_; bool cached_; + bool parsed_; + + CYString section_; + NSString *section$_; + bool essential_; + bool required_; + bool visible_; + bool obsolete_; NSString *latest_; - NSString *installed_; + CYString installed_; - NSString *id_; - NSString *name_; - NSString *tagline_; - NSString *icon_; - NSString *depiction_; - NSString *homepage_; - Address *sponsor_; - Address *author_; - NSArray *tags_; + CYString id_; + CYString name_; + CYString tagline_; + CYString icon_; + CYString depiction_; + CYString homepage_; + + CYString sponsor_; + Address *sponsor$_; + + CYString author_; + Address *author$_; + + CYString bugs_; + CYString support_; + NSMutableArray *tags_; NSString *role_; NSArray *relationships_; + + NSMutableDictionary *metadata_; + _transient NSDate *firstSeen_; + _transient NSDate *lastSeen_; + bool subscribed_; } -- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database; -+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database; +- (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database; ++ (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; + +- (NSString *) longSection; +- (NSString *) shortSection; + +- (NSString *) uri; + - (Address *) maintainer; - (size_t) size; -- (NSString *) description; -- (NSString *) index; +- (NSString *) longDescription; +- (NSString *) shortDescription; +- (unichar) index; +- (NSMutableDictionary *) metadata; - (NSDate *) seen; +- (BOOL) subscribed; +- (BOOL) ignored; - (NSString *) latest; - (NSString *) installed; +- (BOOL) uninstalled; - (BOOL) valid; - (BOOL) upgradableAndEssential:(BOOL)essential; @@ -1050,15 +1826,21 @@ NSString *Scour(const char *field, const char *begin, const char *end) { - (BOOL) hasMode; - (NSString *) mode; +- (void) setVisible; + - (NSString *) id; - (NSString *) name; -- (NSString *) tagline; -- (NSString *) icon; +- (UIImage *) icon; - (NSString *) homepage; - (NSString *) depiction; - (Address *) author; +- (NSString *) support; + +- (NSArray *) files; - (NSArray *) relationships; +- (NSArray *) warnings; +- (NSArray *) applications; - (Source *) source; - (NSString *) role; @@ -1067,46 +1849,173 @@ NSString *Scour(const char *field, const char *begin, const char *end) { - (bool) hasSupportingRole; - (BOOL) hasTag:(NSString *)tag; +- (NSString *) primaryPurpose; +- (NSArray *) purposes; +- (bool) isCommercial; + +- (CYString &) cyname; + +- (uint32_t) compareBySection:(NSArray *)sections; -- (NSComparisonResult) compareByName:(Package *)package; -- (NSComparisonResult) compareBySection:(Package *)package; -- (NSComparisonResult) compareBySectionAndName:(Package *)package; -- (NSComparisonResult) compareForChanges:(Package *)package; +- (uint32_t) compareForChanges; - (void) install; - (void) remove; -- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search; -- (NSNumber *) isInstalledAndVisible:(NSNumber *)number; -- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)section; -- (NSNumber *) isVisibleInSource:(Source *)source; +- (bool) isUnfilteredAndSearchedForBy:(NSString *)search; +- (bool) isUnfilteredAndSelectedForBy:(NSString *)search; +- (bool) isInstalledAndVisible:(NSNumber *)number; +- (bool) isVisibleInSection:(NSString *)section; +- (bool) isVisibleInSource:(Source *)source; @end +uint32_t PackageChangesRadix(Package *self, void *) { + union { + uint32_t key; + + struct { + uint32_t timestamp : 30; + uint32_t ignored : 1; + uint32_t upgradable : 1; + } bits; + } value; + + bool upgradable([self upgradableAndEssential:YES]); + value.bits.upgradable = upgradable ? 1 : 0; + + if (upgradable) { + value.bits.timestamp = 0; + value.bits.ignored = [self ignored] ? 0 : 1; + value.bits.upgradable = 1; + } else { + value.bits.timestamp = static_cast([[self seen] timeIntervalSince1970]) >> 2; + value.bits.ignored = 0; + value.bits.upgradable = 0; + } + + return _not(uint32_t) - value.key; +} + +_finline static void Stifle(uint8_t &value) { +} + +uint32_t PackagePrefixRadix(Package *self, void *context) { + size_t offset(reinterpret_cast(context)); + CYString &name([self cyname]); + + size_t size(name.size()); + if (size == 0) + return 0; + char *text(name.data()); + + 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; + } + + 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); + + if (lhn == NULL) + return rhn == NULL ? NSOrderedSame : NSOrderedAscending; + else if (rhn == NULL) + return NSOrderedDescending; + + _profile(PackageNameCompare$NumbersLast) + if (!lhi.empty() && !rhi.empty()) { + UniChar lhc(CFStringGetCharacterAtIndex(lhn, 0)); + UniChar rhc(CFStringGetCharacterAtIndex(rhn, 0)); + bool lha(CFUniCharIsMemberOf(lhc, kCFUniCharLetterCharacterSet)); + if (lha != CFUniCharIsMemberOf(rhc, kCFUniCharLetterCharacterSet)) + return lha ? NSOrderedAscending : NSOrderedDescending; + } + _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 *context) { + return PackageNameCompare(*lhs, *rhs, context); +} + +struct PackageNameOrdering : + std::binary_function +{ + _finline bool operator ()(Package *lhs, Package *rhs) const { + return PackageNameCompare(lhs, rhs, NULL) == NSOrderedAscending; + } +}; + @implementation Package +- (NSString *) description { + return [NSString stringWithFormat:@"", static_cast(name_)]; +} + - (void) dealloc { if (source_ != nil) [source_ release]; + if (section$_ != nil) + [section$_ release]; - [latest_ release]; - if (installed_ != nil) - [installed_ release]; + if (latest_ != nil) + [latest_ release]; - [id_ release]; - if (name_ != nil) - [name_ release]; - [tagline_ release]; - if (icon_ != nil) - [icon_ release]; - if (depiction_ != nil) - [depiction_ release]; - if (homepage_ != nil) - [homepage_ release]; - if (sponsor_ != nil) - [sponsor_ release]; - if (author_ != nil) - [author_ release]; + if (sponsor$_ != nil) + [sponsor$_ release]; + if (author$_ != nil) + [author$_ release]; if (tags_ != nil) [tags_ release]; if (role_ != nil) @@ -1114,12 +2023,25 @@ NSString *Scour(const char *field, const char *begin, const char *end) { if (relationships_ != nil) [relationships_ release]; + if (metadata_ != nil) + [metadata_ release]; [super dealloc]; } ++ (NSString *) webScriptNameForSelector:(SEL)selector { + if (selector == @selector(hasTag:)) + return @"hasTag"; + else + return nil; +} + ++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector { + return [self webScriptNameForSelector:selector] == nil; +} + + (NSArray *) _attributeKeys { - return [NSArray arrayWithObjects:@"author", @"depiction", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"maintainer", @"name", @"section", @"size", @"source", @"sponsor", @"tagline", 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 { @@ -1130,121 +2052,279 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name]; } -- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database { +- (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}, + {"bugs", &bugs_}, + {"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 +} + +- (void) setVisible { + visible_ = required_ && [self unfiltered]; +} + +- (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database { if ((self = [super init]) != nil) { - iterator_ = iterator; + _profile(Package$initWithVersion) + @synchronized (database) { + era_ = [database era]; + pool_ = pool; + + version_ = version; + iterator_ = version.ParentPkg(); database_ = database; - version_ = [database_ policy]->GetCandidateVer(iterator_); - latest_ = version_.end() ? nil : [StripVersion([NSString stringWithUTF8String:version_.VerStr()]) retain]; + _profile(Package$initWithVersion$Latest) + latest_ = (NSString *) StripVersion(version_.VerStr()); + _end - if (!version_.end()) - file_ = version_.FileList(); - else { - pkgCache &cache([database_ cache]); - file_ = pkgCache::VerFileIterator(cache, cache.VerFileP); - } + pkgCache::VerIterator current; + _profile(Package$initWithVersion$Versions) + current = iterator_.CurrentVer(); + if (!current.end()) + installed_.set(pool_, StripVersion_(current.VerStr())); - pkgCache::VerIterator current = iterator_.CurrentVer(); - installed_ = current.end() ? nil : [StripVersion([NSString stringWithUTF8String:current.VerStr()]) retain]; + if (!version_.end()) + file_ = version_.FileList(); + else { + pkgCache &cache([database_ cache]); + file_ = pkgCache::VerFileIterator(cache, cache.VerFileP); + } + _end - id_ = [[[NSString stringWithUTF8String:iterator_.Name()] lowercaseString] retain]; + _profile(Package$initWithVersion$Name) + id_.set(pool_, iterator_.Name()); + name_.set(pool, iterator_.Display()); + _end if (!file_.end()) { - pkgRecords::Parser *parser = &[database_ records]->Lookup(file_); - - const char *begin, *end; - parser->GetRec(begin, end); - - name_ = Scour("Name", begin, end); - if (name_ != nil) - name_ = [name_ retain]; - tagline_ = [[NSString stringWithUTF8String:parser->ShortDesc().c_str()] retain]; - icon_ = Scour("Icon", begin, end); - if (icon_ != nil) - icon_ = [icon_ retain]; - depiction_ = Scour("Depiction", begin, end); - if (depiction_ != nil) - depiction_ = [depiction_ retain]; - homepage_ = Scour("Homepage", begin, end); - if (homepage_ == nil) - homepage_ = Scour("Website", begin, end); - if ([homepage_ isEqualToString:depiction_]) - homepage_ = nil; - if (homepage_ != nil) - homepage_ = [homepage_ retain]; - NSString *sponsor = Scour("Sponsor", begin, end); - if (sponsor != nil) - sponsor_ = [[Address addressWithString:sponsor] retain]; - NSString *author = Scour("Author", begin, end); - if (author != nil) - author_ = [[Address addressWithString:author] retain]; - NSString *tags = Scour("Tag", begin, end); - if (tags != nil) - tags_ = [[tags componentsSeparatedByString:@", "] retain]; + _profile(Package$initWithVersion$Source) + source_ = [database_ getSource:file_.File()]; + if (source_ != nil) + [source_ retain]; + cached_ = true; + _end } - if (tags_ != nil) - for (int i(0), e([tags_ count]); i != e; ++i) { - NSString *tag = [tags_ objectAtIndex:i]; - if ([tag hasPrefix:@"role::"]) { - role_ = [[tag substringFromIndex:6] retain]; - break; + required_ = true; + + _profile(Package$initWithVersion$Tags) + 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 (required_ && strncmp(name, "require::", 9) == 0 && ( + true + )) + required_ = false; + ++tag; + } while (!tag.end()); + } + _end + + bool changed(false); + NSString *key([id_ lowercaseString]); + + _profile(Package$initWithVersion$Metadata) + metadata_ = [Packages_ objectForKey:key]; + + if (metadata_ == nil) { + firstSeen_ = now_; + + metadata_ = [[NSMutableDictionary dictionaryWithObjectsAndKeys: + firstSeen_, @"FirstSeen", + latest_, @"LastVersion", + nil] mutableCopy]; + + changed = true; + } else { + firstSeen_ = [metadata_ objectForKey:@"FirstSeen"]; + lastSeen_ = [metadata_ objectForKey:@"LastSeen"]; + + if (NSNumber *subscribed = [metadata_ objectForKey:@"IsSubscribed"]) + subscribed_ = [subscribed boolValue]; + + NSString *version([metadata_ objectForKey:@"LastVersion"]); + + if (firstSeen_ == nil) { + firstSeen_ = lastSeen_ == nil ? now_ : lastSeen_; + [metadata_ setObject:firstSeen_ forKey:@"FirstSeen"]; + changed = true; + } + + if (version == nil) { + [metadata_ setObject:latest_ forKey:@"LastVersion"]; + changed = true; + } else if (![version isEqualToString:latest_]) { + [metadata_ setObject:latest_ forKey:@"LastVersion"]; + lastSeen_ = now_; + [metadata_ setObject:lastSeen_ forKey:@"LastSeen"]; + changed = true; } } - NSMutableDictionary *metadata = [Packages_ objectForKey:id_]; - if (metadata == nil || [metadata count] == 0) { - metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys: - now_, @"FirstSeen", - nil]; + metadata_ = [metadata_ retain]; - [Packages_ setObject:metadata forKey:id_]; - Changed_ = true; - } - } return self; + if (changed) { + [Packages_ setObject:metadata_ forKey:key]; + Changed_ = true; + } + _end + + _profile(Package$initWithVersion$Section) + section_.set(pool_, iterator_.Section()); + _end + + obsolete_ = [self hasTag:@"cydia::obsolete"]; + essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"]; + [self setVisible]; + } _end } return self; } -+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database { ++ (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) + version = [database policy]->GetCandidateVer(iterator); + _end + + if (version.end()) + return nil; + return [[[Package alloc] - initWithIterator:iterator + initWithVersion:version + withZone:zone + inPool:pool database:database ] autorelease]; -} +} } - (pkgCache::PkgIterator) iterator { return iterator_; } - (NSString *) section { - const char *section = iterator_.Section(); - if (section == NULL) - return nil; + if (section$_ == nil) { + if (section_.empty()) + return nil; - NSString *name = [[NSString stringWithUTF8String:section] stringByReplacingCharacter:' ' withCharacter:'_']; + std::replace(section_.data(), section_.data() + section_.size(), ' ', '_'); + NSString *name(section_); - lookup: - if (NSDictionary *value = [SectionMap_ objectForKey:name]) - if (NSString *rename = [value objectForKey:@"Rename"]) { - name = rename; - goto lookup; - } + lookup: + if (NSDictionary *value = [SectionMap_ objectForKey:name]) + if (NSString *rename = [value objectForKey:@"Rename"]) { + name = rename; + goto lookup; + } - return [name stringByReplacingCharacter:'_' withCharacter:' ']; + section$_ = [[name stringByReplacingCharacter:'_' withCharacter:' '] retain]; + } return section$_; } -- (Address *) maintainer { - if (file_.end()) +- (NSString *) simpleSection { + if (NSString *section = [self section]) + return Simplify(section); + else + return nil; +} + +- (NSString *) longSection { + return LocalizeSection([self section]); +} + +- (NSString *) shortSection { + return [[NSBundle mainBundle] localizedStringForKey:[self simpleSection] value:nil table:@"Sections"]; +} + +- (NSString *) uri { + return nil; +#if 0 + pkgIndexFile *index; + pkgCache::PkgFileIterator file(file_.File()); + if (![database_ list].FindIndex(file, index)) + return nil; + return [NSString stringWithUTF8String:iterator_->Path]; + //return [NSString stringWithUTF8String:file.Site()]; + //return [NSString stringWithUTF8String:index->ArchiveURI(file.FileName()).c_str()]; +#endif +} + +- (Address *) maintainer { + if (file_.end()) return nil; pkgRecords::Parser *parser = &[database_ records]->Lookup(file_); - return [Address addressWithString:[NSString stringWithUTF8String:parser->Maintainer().c_str()]]; + const std::string &maintainer(parser->Maintainer()); + return maintainer.empty() ? nil : [Address addressWithString:[NSString stringWithUTF8String:maintainer.c_str()]]; } - (size_t) size { return version_.end() ? 0 : version_->InstalledSize; } -- (NSString *) description { +- (NSString *) longDescription { if (file_.end()) return nil; pkgRecords::Parser *parser = &[database_ records]->Lookup(file_); @@ -1256,7 +2336,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return nil; NSCharacterSet *whitespace = [NSCharacterSet whitespaceCharacterSet]; - for (size_t i(1); i != [lines count]; ++i) { + for (size_t i(1), e([lines count]); i != e; ++i) { NSString *trim = [[lines objectAtIndex:i] stringByTrimmingCharactersInSet:whitespace]; [trimmed addObject:trim]; } @@ -1264,13 +2344,42 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return [trimmed componentsJoinedByString:@"\n"]; } -- (NSString *) index { - NSString *index = [[[self name] substringToIndex:1] uppercaseString]; - return [index length] != 0 && isalpha([index characterAtIndex:0]) ? index : @"123"; +- (NSString *) shortDescription { + return tagline_; +} + +- (unichar) index { + _profile(Package$index) + CFStringRef name((CFStringRef) [self name]); + if (CFStringGetLength(name) == 0) + return '#'; + UniChar character(CFStringGetCharacterAtIndex(name, 0)); + if (!CFUniCharIsMemberOf(character, kCFUniCharLetterCharacterSet)) + return '#'; + return toupper(character); + _end +} + +- (NSMutableDictionary *) metadata { + return metadata_; } - (NSDate *) seen { - return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"]; + if (subscribed_ && lastSeen_ != nil) + return lastSeen_; + return firstSeen_; +} + +- (BOOL) subscribed { + return subscribed_; +} + +- (BOOL) ignored { + NSDictionary *metadata([self metadata]); + if (NSNumber *ignored = [metadata objectForKey:@"IsIgnored"]) + return [ignored boolValue]; + else + return false; } - (NSString *) latest { @@ -1281,23 +2390,26 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return installed_; } +- (BOOL) uninstalled { + return installed_.empty(); +} + - (BOOL) valid { return !version_.end(); } - (BOOL) upgradableAndEssential:(BOOL)essential { - pkgCache::VerIterator current = iterator_.CurrentVer(); - - if (current.end()) - return essential && [self essential]; - else { - pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_); - return !candidate.end() && candidate != current; - } + _profile(Package$upgradableAndEssential) + pkgCache::VerIterator current(iterator_.CurrentVer()); + if (current.end()) + return essential && essential_ && visible_; + else + return !version_.end() && version_ != current;// && (!essential || ![database_ cache][iterator_].Keep()); + _end } - (BOOL) essential { - return (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES; + return essential_; } - (BOOL) broken { @@ -1305,16 +2417,16 @@ NSString *Scour(const char *field, const char *begin, const char *end) { } - (BOOL) unfiltered { - NSString *section = [self section]; - return section == nil || isSectionVisible(section); + NSString *section([self section]); + return !obsolete_ && [self hasSupportingRole] && (section == nil || isSectionVisible(section)); } - (BOOL) visible { - return [self hasSupportingRole] && [self unfiltered]; + return visible_; } - (BOOL) half { - unsigned char current = iterator_->CurrentState; + unsigned char current(iterator_->CurrentState); return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled; } @@ -1337,33 +2449,31 @@ NSString *Scour(const char *field, const char *begin, const char *end) { switch (state.Mode) { case pkgDepCache::ModeDelete: if ((state.iFlags & pkgDepCache::Purge) != 0) - return @"Purge"; + return @"PURGE"; else - return @"Remove"; - _assert(false); + return @"REMOVE"; case pkgDepCache::ModeKeep: - if ((state.iFlags & pkgDepCache::AutoKept) != 0) - return nil; + if ((state.iFlags & pkgDepCache::ReInstall) != 0) + return @"REINSTALL"; + /*else if ((state.iFlags & pkgDepCache::AutoKept) != 0) + return nil;*/ else return nil; - _assert(false); case pkgDepCache::ModeInstall: - if ((state.iFlags & pkgDepCache::ReInstall) != 0) - return @"Reinstall"; - else switch (state.Status) { + /*if ((state.iFlags & pkgDepCache::ReInstall) != 0) + return @"REINSTALL"; + else*/ switch (state.Status) { case -1: - return @"Downgrade"; + return @"DOWNGRADE"; case 0: - return @"Install"; + return @"INSTALL"; case 1: - return @"Upgrade"; + return @"UPGRADE"; case 2: - return @"New Install"; - default: - _assert(false); + return @"NEW_INSTALL"; + _nodefault } - default: - _assert(false); + _nodefault } } @@ -1372,15 +2482,24 @@ NSString *Scour(const char *field, const char *begin, const char *end) { } - (NSString *) name { - return name_ == nil ? id_ : name_; + return name_.empty() ? id_ : name_; } -- (NSString *) tagline { - return tagline_; -} +- (UIImage *) icon { + NSString *section = [self simpleSection]; -- (NSString *) icon { - return icon_; + UIImage *icon(nil); + if (!icon_.empty()) + if ([icon_ hasPrefix:@"file:///"]) + icon = [UIImage imageAtPath:[icon_ substringFromIndex:7]]; + if (icon == nil) if (section != nil) + icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]]; + if (icon == nil) if (source_ != nil) if (NSString *dicon = [source_ defaultIcon]) + if ([dicon hasPrefix:@"file:///"]) + icon = [UIImage imageAtPath:[dicon substringFromIndex:7]]; + if (icon == nil) + icon = [UIImage applicationImageNamed:@"unknown.png"]; + return icon; } - (NSString *) homepage { @@ -1388,25 +2507,146 @@ NSString *Scour(const char *field, const char *begin, const char *end) { } - (NSString *) depiction { - return depiction_; + return !depiction_.empty() ? depiction_ : [[self source] depictionForPackage:id_]; } - (Address *) sponsor { - return sponsor_; + if (sponsor$_ == nil) { + if (sponsor_.empty()) + return nil; + sponsor$_ = [[Address addressWithString:sponsor_] retain]; + } return sponsor$_; } - (Address *) author { - return author_; + if (author$_ == nil) { + if (author_.empty()) + return nil; + author$_ = [[Address addressWithString:author_] retain]; + } return author$_; +} + +- (NSString *) support { + return !bugs_.empty() ? bugs_ : [[self source] supportForPackage:id_]; +} + +- (NSArray *) files { + NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", static_cast(id_)]; + NSMutableArray *files = [NSMutableArray arrayWithCapacity:128]; + + std::ifstream fin; + fin.open([path UTF8String]); + if (!fin.is_open()) + return nil; + + std::string line; + while (std::getline(fin, line)) + [files addObject:[NSString stringWithUTF8String:line.c_str()]]; + + return files; } - (NSArray *) relationships { return relationships_; } +- (NSArray *) warnings { + NSMutableArray *warnings([NSMutableArray arrayWithCapacity:4]); + const char *name(iterator_.Name()); + + size_t length(strlen(name)); + if (length < 2) invalid: + [warnings addObject:UCLocalize("ILLEGAL_PACKAGE_IDENTIFIER")]; + else for (size_t i(0); i != length; ++i) + if ( + /* XXX: technically this is not allowed */ + (name[i] < 'A' || name[i] > 'Z') && + (name[i] < 'a' || name[i] > 'z') && + (name[i] < '0' || name[i] > '9') && + (i == 0 || name[i] != '+' && name[i] != '-' && name[i] != '.') + ) goto invalid; + + if (strcmp(name, "cydia") != 0) { + bool cydia = false; + bool user = false; + bool _private = false; + bool stash = false; + + bool repository = [[self section] isEqualToString:@"Repositories"]; + + if (NSArray *files = [self files]) + for (NSString *file in files) + if (!cydia && [file isEqualToString:@"/Applications/Cydia.app"]) + cydia = true; + else if (!user && [file isEqualToString:@"/User"]) + user = true; + else if (!_private && [file isEqualToString:@"/private"]) + _private = true; + else if (!stash && [file isEqualToString:@"/var/stash"]) + stash = true; + + /* XXX: this is not sensitive enough. only some folders are valid. */ + if (cydia && !repository) + [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"Cydia.app"]]; + if (user) + [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/User"]]; + if (_private) + [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/private"]]; + if (stash) + [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/var/stash"]]; + } + + return [warnings count] == 0 ? nil : warnings; +} + +- (NSArray *) applications { + NSString *me([[NSBundle mainBundle] bundleIdentifier]); + + NSMutableArray *applications([NSMutableArray arrayWithCapacity:2]); + + static Pcre application_r("^/Applications/(.*)\\.app/Info.plist$"); + if (NSArray *files = [self files]) + for (NSString *file in files) + if (application_r(file)) { + NSDictionary *info([NSDictionary dictionaryWithContentsOfFile:file]); + NSString *id([info objectForKey:@"CFBundleIdentifier"]); + if ([id isEqualToString:me]) + continue; + + NSString *display([info objectForKey:@"CFBundleDisplayName"]); + if (display == nil) + display = application_r[1]; + + NSString *bundle([file stringByDeletingLastPathComponent]); + NSString *icon([info objectForKey:@"CFBundleIconFile"]); + if (icon == nil || [icon length] == 0) + icon = @"icon.png"; + NSURL *url([NSURL fileURLWithPath:[bundle stringByAppendingPathComponent:icon]]); + + NSMutableArray *application([NSMutableArray arrayWithCapacity:2]); + [applications addObject:application]; + + [application addObject:id]; + [application addObject:display]; + [application addObject:url]; + } + + return [applications count] == 0 ? nil : applications; +} + - (Source *) source { if (!cached_) { - source_ = file_.end() ? nil : [[database_ getSource:file_.File()] retain]; - cached_ = true; + @synchronized (database_) { + if ([database_ era] != era_ || file_.end()) + source_ = nil; + else { + source_ = [database_ getSource:file_.File()]; + if (source_ != nil) + [source_ retain]; + } + + cached_ = true; + } } return source_; @@ -1422,15 +2662,15 @@ NSString *Scour(const char *field, const char *begin, const char *end) { NSRange range; - range = [[self id] rangeOfString:text options:NSCaseInsensitiveSearch]; + range = [[self id] rangeOfString:text options:MatchCompareOptions_]; if (range.location != NSNotFound) return YES; - range = [[self name] rangeOfString:text options:NSCaseInsensitiveSearch]; + range = [[self name] rangeOfString:text options:MatchCompareOptions_]; if (range.location != NSNotFound) return YES; - range = [[self tagline] rangeOfString:text options:NSCaseInsensitiveSearch]; + range = [[self shortDescription] rangeOfString:text options:MatchCompareOptions_]; if (range.location != NSNotFound) return YES; @@ -1459,77 +2699,70 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return tags_ == nil ? NO : [tags_ containsObject:tag]; } -- (NSComparisonResult) compareByName:(Package *)package { - NSString *lhs = [self name]; - NSString *rhs = [package name]; - - if ([lhs length] != 0 && [rhs length] != 0) { - unichar lhc = [lhs characterAtIndex:0]; - unichar rhc = [rhs characterAtIndex:0]; +- (NSString *) primaryPurpose { + for (NSString *tag in tags_) + if ([tag hasPrefix:@"purpose::"]) + return [tag substringFromIndex:9]; + return nil; +} - if (isalpha(lhc) && !isalpha(rhc)) - return NSOrderedAscending; - else if (!isalpha(lhc) && isalpha(rhc)) - return NSOrderedDescending; - } +- (NSArray *) purposes { + NSMutableArray *purposes([NSMutableArray arrayWithCapacity:2]); + for (NSString *tag in tags_) + if ([tag hasPrefix:@"purpose::"]) + [purposes addObject:[tag substringFromIndex:9]]; + return [purposes count] == 0 ? nil : purposes; +} - return [lhs compare:rhs options:CompareOptions_]; +- (bool) isCommercial { + return [self hasTag:@"cydia::commercial"]; } -- (NSComparisonResult) compareBySection:(Package *)package { - NSString *lhs = [self section]; - NSString *rhs = [package section]; +- (CYString &) cyname { + return name_.empty() ? id_ : name_; +} - if (lhs == NULL && rhs != NULL) - return NSOrderedAscending; - else if (lhs != NULL && rhs == NULL) - return NSOrderedDescending; - else if (lhs != NULL && rhs != NULL) { - NSComparisonResult result = [lhs compare:rhs options:CompareOptions_]; - if (result != NSOrderedSame) - return result; +- (uint32_t) compareBySection:(NSArray *)sections { + NSString *section([self section]); + for (size_t i(0), e([sections count]); i != e; ++i) { + if ([section isEqualToString:[[sections objectAtIndex:i] name]]) + return i; } - return NSOrderedSame; + return _not(uint32_t); } -- (NSComparisonResult) compareBySectionAndName:(Package *)package { - NSString *lhs = [self section]; - NSString *rhs = [package section]; - - if (lhs == NULL && rhs != NULL) - return NSOrderedAscending; - else if (lhs != NULL && rhs == NULL) - return NSOrderedDescending; - else if (lhs != NULL && rhs != NULL) { - NSComparisonResult result = [lhs compare:rhs]; - if (result != NSOrderedSame) - return result; - } +- (uint32_t) compareForChanges { + union { + uint32_t key; - return [self compareByName:package]; -} + struct { + uint32_t timestamp : 30; + uint32_t ignored : 1; + uint32_t upgradable : 1; + } bits; + } value; -- (NSComparisonResult) compareForChanges:(Package *)package { - BOOL lhs = [self upgradableAndEssential:YES]; - BOOL rhs = [package upgradableAndEssential:YES]; + bool upgradable([self upgradableAndEssential:YES]); + value.bits.upgradable = upgradable ? 1 : 0; - if (lhs != rhs) - return lhs ? NSOrderedAscending : NSOrderedDescending; - else if (!lhs) { - switch ([[self seen] compare:[package seen]]) { - case NSOrderedAscending: - return NSOrderedDescending; - case NSOrderedSame: - break; - case NSOrderedDescending: - return NSOrderedAscending; - default: - _assert(false); - } + if (upgradable) { + value.bits.timestamp = 0; + value.bits.ignored = [self ignored] ? 0 : 1; + value.bits.upgradable = 1; + } else { + value.bits.timestamp = static_cast([[self seen] timeIntervalSince1970]) >> 2; + value.bits.ignored = 0; + value.bits.upgradable = 0; } - return [self compareByName:package]; + return _not(uint32_t) - value.key; +} + +- (void) clear { + pkgProblemResolver *resolver = [database_ resolver]; + resolver->Clear(iterator_); + resolver->Protect(iterator_); } - (void) install { @@ -1551,33 +2784,58 @@ NSString *Scour(const char *field, const char *begin, const char *end) { [database_ cache]->MarkDelete(iterator_, true); } -- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search { - return [NSNumber numberWithBool:( - [self unfiltered] && [self matches:search] - )]; +- (bool) isUnfilteredAndSearchedForBy:(NSString *)search { + _profile(Package$isUnfilteredAndSearchedForBy) + bool value(true); + + _profile(Package$isUnfilteredAndSearchedForBy$Unfiltered) + value &= [self unfiltered]; + _end + + _profile(Package$isUnfilteredAndSearchedForBy$Match) + value &= [self matches:search]; + _end + + return value; + _end +} + +- (bool) isUnfilteredAndSelectedForBy:(NSString *)search { + if ([search length] == 0) + return false; + + _profile(Package$isUnfilteredAndSelectedForBy) + bool value(true); + + _profile(Package$isUnfilteredAndSelectedForBy$Unfiltered) + value &= [self unfiltered]; + _end + + _profile(Package$isUnfilteredAndSelectedForBy$Match) + value &= [[self name] compare:search options:MatchCompareOptions_ range:NSMakeRange(0, [search length])] == NSOrderedSame; + _end + + return value; + _end } -- (NSNumber *) isInstalledAndVisible:(NSNumber *)number { - return [NSNumber numberWithBool:( - (![number boolValue] || [self visible]) && [self installed] != nil - )]; +- (bool) isInstalledAndVisible:(NSNumber *)number { + return (![number boolValue] || [self visible]) && ![self uninstalled]; } -- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)name { +- (bool) isVisibleInSection:(NSString *)name { NSString *section = [self section]; - return [NSNumber numberWithBool:( - [self visible] && - [self installed] == nil && ( + return + [self visible] && ( name == nil || section == nil && [name length] == 0 || [name isEqualToString:section] - ) - )]; + ); } -- (NSNumber *) isVisibleInSource:(Source *)source { - return [NSNumber numberWithBool:([self source] == source && [self visible])]; +- (bool) isVisibleInSource:(Source *)source { + return [self source] == source && [self visible]; } @end @@ -1585,32 +2843,45 @@ NSString *Scour(const char *field, const char *begin, const char *end) { /* Section Class {{{ */ @interface Section : NSObject { NSString *name_; + unichar index_; size_t row_; size_t count_; + NSString *localized_; } -- (NSComparisonResult) compareByName:(Section *)section; -- (Section *) initWithName:(NSString *)name; -- (Section *) initWithName:(NSString *)name row:(size_t)row; +- (NSComparisonResult) compareByLocalized:(Section *)section; +- (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; + - (size_t) row; - (size_t) count; + +- (void) addToRow; - (void) addToCount; +- (void) setCount:(size_t)count; +- (NSString *) localized; + @end @implementation Section - (void) dealloc { [name_ release]; + if (localized_ != nil) + [localized_ release]; [super dealloc]; } -- (NSComparisonResult) compareByName:(Section *)section { - NSString *lhs = [self name]; - NSString *rhs = [section name]; +- (NSComparisonResult) compareByLocalized:(Section *)section { + 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]; @@ -1618,18 +2889,37 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return NSOrderedAscending; else if (!isalpha(lhc) && isalpha(rhc)) return NSOrderedDescending; - } + }*/ - return [lhs compare:rhs options:CompareOptions_]; + 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; + if (localize) + localized_ = [LocalizeSection(name_) retain]; + } return self; +} + +/* XXX: localize the index thingees */ +- (Section *) initWithIndex:(unichar)index row:(size_t)row { + if ((self = [super init]) != nil) { + name_ = [[NSString stringWithCharacters:&index length:1] retain]; + index_ = index; row_ = row; } return self; } @@ -1638,6 +2928,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return name_; } +- (unichar) index { + return index_; +} + - (size_t) row { return row_; } @@ -1646,27 +2940,52 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return count_; } +- (void) addToRow { + ++row_; +} + - (void) addToCount { ++count_; } +- (void) setCount:(size_t)count { + count_ = count; +} + +- (NSString *) localized { + return localized_; +} + @end /* }}} */ -int Finish_; -NSArray *Finishes_; +static NSString *Colon_; +static NSString *Error_; +static NSString *Warning_; /* Database Implementation {{{ */ @implementation Database ++ (Database *) sharedInstance { + static Database *instance; + if (instance == nil) + instance = [[Database alloc] init]; + return instance; +} + +- (unsigned) era { + return era_; +} + - (void) dealloc { _assert(false); + NSRecycleZone(zone_); + // XXX: malloc_destroy_zone(zone_); + apr_pool_destroy(pool_); [super dealloc]; } -- (void) _readCydia:(NSNumber *)fd { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - +- (void) _readCydia:(NSNumber *)fd { _pooled __gnu_cxx::stdio_filebuf ib([fd intValue], std::ios::in); std::istream is(&ib); std::string line; @@ -1676,7 +2995,7 @@ NSArray *Finishes_; while (std::getline(is, line)) { const char *data(line.c_str()); size_t size = line.size(); - fprintf(stderr, "C:%s\n", data); + lprintf("C:%s\n", data); if (finish_r(data, size)) { NSString *finish = finish_r[1]; @@ -1686,13 +3005,10 @@ NSArray *Finishes_; } } - [pool release]; - _assert(false); + _assume(false); } -- (void) _readStatus:(NSNumber *)fd { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - +- (void) _readStatus:(NSNumber *)fd { _pooled __gnu_cxx::stdio_filebuf ib([fd intValue], std::ios::in); std::istream is(&ib); std::string line; @@ -1702,8 +3018,8 @@ NSArray *Finishes_; while (std::getline(is, line)) { const char *data(line.c_str()); - size_t size = line.size(); - fprintf(stderr, "S:%s\n", data); + size_t size(line.size()); + lprintf("S:%s\n", data); if (conffile_r(data, size)) { [delegate_ setConfigurationData:conffile_r[1]]; @@ -1720,36 +3036,34 @@ NSArray *Finishes_; NSString *string = pmstatus_r[4]; if (type == "pmerror") - [delegate_ performSelectorOnMainThread:@selector(_setProgressError:) + [delegate_ performSelectorOnMainThread:@selector(_setProgressErrorPackage:) withObject:[NSArray arrayWithObjects:string, id, nil] waitUntilDone:YES ]; - else if (type == "pmstatus") + else if (type == "pmstatus") { [delegate_ setProgressTitle:string]; - else if (type == "pmconffile") + } else if (type == "pmconffile") [delegate_ setConfigurationData:string]; - else _assert(false); - } else _assert(false); + else + lprintf("E:unknown pmstatus\n"); + } else + lprintf("E:unknown status\n"); } - [pool release]; - _assert(false); + _assume(false); } -- (void) _readOutput:(NSNumber *)fd { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - +- (void) _readOutput:(NSNumber *)fd { _pooled __gnu_cxx::stdio_filebuf ib([fd intValue], std::ios::in); std::istream is(&ib); std::string line; while (std::getline(is, line)) { - fprintf(stderr, "O:%s\n", line.c_str()); + lprintf("O:%s\n", line.c_str()); [delegate_ addProgressOutput:[NSString stringWithUTF8String:line.c_str()]]; } - [pool release]; - _assert(false); + _assume(false); } - (FILE *) input { @@ -1757,11 +3071,12 @@ 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 database:self]; -} + return iterator.end() ? nil : [Package packageWithIterator:iterator withZone:NULL inPool:pool_ database:self]; +} } - (Database *) init { if ((self = [super init]) != nil) { @@ -1771,8 +3086,10 @@ NSArray *Finishes_; fetcher_ = NULL; lock_ = NULL; - sources_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain]; - packages_ = [[NSMutableArray arrayWithCapacity:16] retain]; + zone_ = NSCreateZone(1024 * 1024, 256 * 1024, NO); + apr_pool_create(&pool_, NULL); + + packages_ = [[NSMutableArray alloc] init]; int fds[2]; @@ -1835,15 +3152,128 @@ NSArray *Finishes_; return *fetcher_; } +- (pkgSourceList &) list { + return *list_; +} + - (NSArray *) packages { return packages_; } - (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; } -- (void) reloadData { +- (NSArray *) issues { + if (cache_->BrokenCount() == 0) + return nil; + + NSMutableArray *issues([NSMutableArray arrayWithCapacity:4]); + + for (Package *package in packages_) { + if (![package broken]) + continue; + pkgCache::PkgIterator pkg([package iterator]); + + NSMutableArray *entry([NSMutableArray arrayWithCapacity:4]); + [entry addObject:[package name]]; + [issues addObject:entry]; + + pkgCache::VerIterator ver(cache_[pkg].InstVerIter(cache_)); + if (ver.end()) + continue; + + for (pkgCache::DepIterator dep(ver.DependsList()); !dep.end(); ) { + pkgCache::DepIterator start; + pkgCache::DepIterator end; + dep.GlobOr(start, end); // ++dep + + if (!cache_->IsImportantDep(end)) + continue; + if ((cache_[end] & pkgDepCache::DepGInstall) != 0) + continue; + + NSMutableArray *failure([NSMutableArray arrayWithCapacity:4]); + [entry addObject:failure]; + [failure addObject:[NSString stringWithUTF8String:start.DepType()]]; + + NSString *name([NSString stringWithUTF8String:start.TargetPkg().Name()]); + if (Package *package = [self packageWithName:name]) + name = [package name]; + [failure addObject:name]; + + pkgCache::PkgIterator target(start.TargetPkg()); + if (target->ProvidesList != 0) + [failure addObject:@"?"]; + else { + pkgCache::VerIterator ver(cache_[target].InstVerIter(cache_)); + if (!ver.end()) + [failure addObject:[NSString stringWithUTF8String:ver.VerStr()]]; + else if (!cache_[target].CandidateVerIter(cache_).end()) + [failure addObject:@"-"]; + else if (target->ProvidesList == 0) + [failure addObject:@"!"]; + else + [failure addObject:@"%"]; + } + + _forever { + if (start.TargetVer() != 0) + [failure addObject:[NSString stringWithFormat:@"%s %s", start.CompType(), start.TargetVer()]]; + if (start == end) + break; + ++start; + } + } + } + + return issues; +} + +- (bool) popErrorWithTitle:(NSString *)title { + bool fatal(false); + std::string message; + + while (!_error->empty()) { + std::string error; + bool warning(!_error->PopMessage(error)); + if (!warning) + fatal = true; + for (;;) { + size_t size(error.size()); + if (size == 0 || error[size - 1] != '\n') + break; + error.resize(size - 1); + } + lprintf("%c:[%s]\n", warning ? 'W' : 'E', error.c_str()); + + if (!message.empty()) + message += "\n\n"; + message += error; + } + + if (fatal && !message.empty()) + [delegate_ _setProgressError:[NSString stringWithUTF8String:message.c_str()] withTitle:[NSString stringWithFormat:Colon_, fatal ? Error_ : Warning_, title]]; + + return fatal; +} + +- (bool) popErrorWithTitle:(NSString *)title forOperation:(bool)success { + return [self popErrorWithTitle:title] || !success; +} + +- (void) reloadData { _pooled +@synchronized ([Database class]) { + @synchronized (self) { + ++era_; + } + + [packages_ removeAllObjects]; + sources_.clear(); + _error->Discard(); delete list_; @@ -1860,14 +3290,27 @@ NSArray *Finishes_; delete policy_; policy_ = NULL; + if (now_ != nil) { + [now_ release]; + now_ = nil; + } + cache_.Close(); - if (!cache_.Open(progress_, true)) { + apr_pool_clear(pool_); + NSRecycleZone(zone_); + + int chk(creat("/tmp/cydia.chk", 0644)); + if (chk != -1) + close(chk); + + NSString *title(UCLocalize("DATABASE")); + + _trace(); + if (!cache_.Open(progress_, true)) { pop: std::string error; - if (!_error->PopMessage(error)) - _assert(false); - _error->Discard(); - fprintf(stderr, "cache_.Open():[%s]\n", error.c_str()); + bool warning(!_error->PopMessage(error)); + lprintf("cache_.Open():[%s]\n", error.c_str()); if (error == "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct the problem. ") [delegate_ repairWithSelector:@selector(configure)]; @@ -1876,10 +3319,17 @@ NSArray *Finishes_; // else if (error == "Could not open lock file /var/lib/dpkg/lock - open (13 Permission denied)") // else if (error == "Could not get lock /var/lib/dpkg/lock - open (35 Resource temporarily unavailable)") // else if (error == "The list of sources could not be read.") - else _assert(false); + else + [delegate_ _setProgressError:[NSString stringWithUTF8String:error.c_str()] withTitle:[NSString stringWithFormat:Colon_, warning ? Warning_ : Error_, title]]; + if (warning) + goto pop; + _error->Discard(); return; } + _trace(); + + unlink("/tmp/cydia.chk"); now_ = [[NSDate date] retain]; @@ -1890,47 +3340,107 @@ NSArray *Finishes_; lock_ = NULL; list_ = new pkgSourceList(); - _assert(list_->ReadMainList()); + if ([self popErrorWithTitle:title forOperation:list_->ReadMainList()]) + return; + + if (cache_->DelCount() != 0 || cache_->InstCount() != 0) { + [delegate_ _setProgressError:@"COUNTS_NONZERO_EX" withTitle:title]; + return; + } - _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0); - _assert(pkgApplyStatus(cache_)); + if ([self popErrorWithTitle:title forOperation:pkgApplyStatus(cache_)]) + return; if (cache_->BrokenCount() != 0) { - _assert(pkgFixBroken(cache_)); - _assert(cache_->BrokenCount() == 0); - _assert(pkgMinimizeUpgrade(cache_)); + if ([self popErrorWithTitle:title forOperation:pkgFixBroken(cache_)]) + return; + + if (cache_->BrokenCount() != 0) { + [delegate_ _setProgressError:@"STILL_BROKEN_EX" withTitle:title]; + return; + } + + if ([self popErrorWithTitle:title forOperation:pkgMinimizeUpgrade(cache_)]) + return; } - [sources_ removeAllObjects]; + _trace(); + 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) - [sources_ - setObject:[[[Source alloc] initWithMetaIndex:*source] autorelease] - forKey:[NSNumber numberWithLong:reinterpret_cast(*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]; + } } - [packages_ removeAllObjects]; - for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator) - if (Package *package = [Package packageWithIterator:iterator database:self]) - [packages_ addObject:package]; + _trace(); - [packages_ sortUsingSelector:@selector(compareByName:)]; -} + { + /*std::vector packages; + packages.reserve(std::max(10000U, [packages_ count] + 1000)); + [packages_ release]; + packages_ = nil;*/ + + _trace(); + + for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator) + if (Package *package = [Package packageWithIterator:iterator withZone:zone_ inPool:pool_ database:self]) + //packages.push_back(package); + [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()); + + //CFArraySortValues((CFMutableArrayRef) packages_, CFRangeMake(0, [packages_ count]), reinterpret_cast(&PackageNameCompare), NULL); + + CFArrayInsertionSortValues((CFMutableArrayRef) packages_, CFRangeMake(0, [packages_ count]), reinterpret_cast(&PackageNameCompare), NULL); + + //[packages_ sortUsingFunction:reinterpret_cast(&PackageNameCompare) context:NULL]; + + _trace(); + } +} } - (void) configure { NSString *dpkg = [NSString stringWithFormat:@"dpkg --configure -a --status-fd %u", statusfd_]; system([dpkg UTF8String]); } -- (void) clean { +- (bool) clean { + // XXX: I don't remember this condition if (lock_ != NULL) - return; + return false; FileFd Lock; Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock")); - _assert(!_error->PendingError()); + + NSString *title(UCLocalize("CLEAN_ARCHIVES")); + + if ([self popErrorWithTitle:title]) + return false; pkgAcquire fetcher; fetcher.Clean(_config->FindDir("Dir::Cache::Archives")); @@ -1944,33 +3454,43 @@ NSArray *Finishes_; } } cleaner; - if (!cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)) { - std::string error; - while (_error->PopMessage(error)) - fprintf(stderr, "ArchiveCleaner: %s\n", error.c_str()); - } + if ([self popErrorWithTitle:title forOperation:cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)]) + return false; + + return true; } -- (void) prepare { +- (bool) prepare { + fetcher_->Shutdown(); + pkgRecords records(cache_); lock_ = new FileFd(); lock_->Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock")); - _assert(!_error->PendingError()); + + NSString *title(UCLocalize("PREPARE_ARCHIVES")); + + if ([self popErrorWithTitle:title]) + return false; pkgSourceList list; - // XXX: explain this with an error message - _assert(list.ReadMainList()); + if ([self popErrorWithTitle:title forOperation:list.ReadMainList()]) + return false; manager_ = (_system->CreatePM(cache_)); - _assert(manager_->GetArchives(fetcher_, &list, &records)); - _assert(!_error->PendingError()); -} + if ([self popErrorWithTitle:title forOperation:manager_->GetArchives(fetcher_, &list, &records)]) + return false; + + return true; +} - (void) perform { + NSString *title(UCLocalize("PERFORM_SELECTIONS")); + NSMutableArray *before = [NSMutableArray arrayWithCapacity:16]; { pkgSourceList list; - _assert(list.ReadMainList()); + if ([self popErrorWithTitle:title forOperation:list.ReadMainList()]) + return; for (pkgSourceList::const_iterator source = list.begin(); source != list.end(); ++source) [before addObject:[NSString stringWithUTF8String:(*source)->GetURI().c_str()]]; } @@ -1984,15 +3504,19 @@ 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; - fprintf(stderr, "pAf:%s:%s\n", uri.c_str(), error.c_str()); + lprintf("pAf:%s:%s\n", uri.c_str(), error.c_str()); failed = true; - [delegate_ performSelectorOnMainThread:@selector(_setProgressError:) - withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:error.c_str()], nil] + [delegate_ performSelectorOnMainThread:@selector(_setProgressErrorPackage:) + withObject:[NSArray arrayWithObjects: + [NSString stringWithUTF8String:error.c_str()], + nil] waitUntilDone:YES ]; } @@ -2022,7 +3546,8 @@ NSArray *Finishes_; NSMutableArray *after = [NSMutableArray arrayWithCapacity:16]; { pkgSourceList list; - _assert(list.ReadMainList()); + if ([self popErrorWithTitle:title forOperation:list.ReadMainList()]) + return; for (pkgSourceList::const_iterator source = list.begin(); source != list.end(); ++source) [after addObject:[NSString stringWithUTF8String:(*source)->GetURI().c_str()]]; } @@ -2031,41 +3556,40 @@ NSArray *Finishes_; [self update]; } -- (void) upgrade { - _assert(pkgDistUpgrade(cache_)); +- (bool) upgrade { + NSString *title(UCLocalize("UPGRADE")); + if ([self popErrorWithTitle:title forOperation:pkgDistUpgrade(cache_)]) + return false; + return true; } - (void) update { [self updateWithStatus:status_]; } +- (void) setVisible { + for (Package *package in packages_) + [package setVisible]; +} + - (void) updateWithStatus:(Status &)status { + _transient NSObject *delegate(status.getDelegate()); + NSString *title(UCLocalize("REFRESHING_DATA")); + pkgSourceList list; - _assert(list.ReadMainList()); + if (!list.ReadMainList()) + [delegate _setProgressError:@"Unable to read source list." withTitle:title]; FileFd lock; lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); - _assert(!_error->PendingError()); - - pkgAcquire fetcher(&status); - _assert(list.GetIndexes(&fetcher)); - - if (fetcher.Run(PulseInterval_) != pkgAcquire::Failed) { - bool failed = false; - for (pkgAcquire::ItemIterator item = fetcher.ItemsBegin(); item != fetcher.ItemsEnd(); item++) - if ((*item)->Status != pkgAcquire::Item::StatDone) { - (*item)->Finished(); - failed = true; - } + if ([self popErrorWithTitle:title]) + return; - if (!failed && _config->FindB("APT::Get::List-Cleanup", true) == true) { - _assert(fetcher.Clean(_config->FindDir("Dir::State::lists"))); - _assert(fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/")); - } + if ([self popErrorWithTitle:title forOperation:ListUpdate(status, list, PulseInterval_)]) + /* XXX: ignore this because users suck and don't understand why refreshing is important: return */; - [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"]; - Changed_ = true; - } + [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"]; + Changed_ = true; } - (void) setDelegate:(id)delegate { @@ -2074,27 +3598,15 @@ NSArray *Finishes_; progress_.setDelegate(delegate); } -- (Source *) getSource:(const pkgCache::PkgFileIterator &)file { - pkgIndexFile *index(NULL); - list_->FindIndex(file, index); - return [sources_ objectForKey:[NSNumber numberWithLong:reinterpret_cast(index)]]; +- (Source *) getSource:(pkgCache::PkgFileIterator)file { + SourceMap::const_iterator i(sources_.find(file->ID)); + return i == sources_.end() ? nil : i->second; } @end /* }}} */ /* Confirmation View {{{ */ -void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString *key) { - if ([packages count] == 0) - return; - - UITextView *text = GetTextView([packages count] == 0 ? @"n/a" : [packages componentsJoinedByString:@", "], 120, false); - [fields setObject:text forKey:key]; - - CGColor blue(space_, 0, 0, 0.4, 1); - [text setTextColor:[UIColor colorWithCGColor:blue]]; -} - bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (!iterator.end()) for (pkgCache::DepIterator dep(iterator.DependsList()); !dep.end(); ++dep) { @@ -2110,326 +3622,588 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return false; } -@protocol ConfirmationViewDelegate -- (void) cancel; -- (void) confirm; -@end - -@interface ConfirmationView : UIView { - Database *database_; +/* Web Scripting {{{ */ +@interface CydiaObject : NSObject { + id indirect_; id delegate_; - UITransitionView *transition_; - UIView *overlay_; - UINavigationBar *navbar_; - UIPreferencesTable *table_; - NSMutableDictionary *fields_; - UIActionSheet *essential_; - BOOL substrate_; } -- (void) cancel; - -- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate; - +- (id) initWithDelegate:(IndirectDelegate *)indirect; @end -@implementation ConfirmationView +@implementation CydiaObject - (void) dealloc { - [navbar_ setDelegate:nil]; - [transition_ setDelegate:nil]; - [table_ setDataSource:nil]; - - [transition_ release]; - [overlay_ release]; - [navbar_ release]; - [table_ release]; - [fields_ release]; - if (essential_ != nil) - [essential_ release]; + [indirect_ release]; [super dealloc]; } -- (void) cancel { - [transition_ transition:7 toView:nil]; - [delegate_ cancel]; +- (id) initWithDelegate:(IndirectDelegate *)indirect { + if ((self = [super init]) != nil) { + indirect_ = [indirect retain]; + } return self; } -- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to { - if (from != nil && to == nil) - [self removeFromSuperview]; +- (void) setDelegate:(id)delegate { + delegate_ = delegate; } -- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button { - switch (button) { - case 0: - if (essential_ != nil) - [essential_ popupAlertAnimated:YES]; - else { - if (substrate_) - Finish_ = 2; - [delegate_ confirm]; - } - break; - - case 1: - [self cancel]; - break; - } ++ (NSArray *) _attributeKeys { + return [NSArray arrayWithObjects:@"device", @"firewire", @"imei", @"mac", @"serial", nil]; } -- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { - NSString *context = [sheet context]; - - if ([context isEqualToString:@"remove"]) - switch (button) { - case 1: - [self cancel]; - break; - case 2: - if (substrate_) - Finish_ = 2; - [delegate_ confirm]; - break; - default: - _assert(false); - } - else if ([context isEqualToString:@"unable"]) - [self cancel]; - - [sheet dismiss]; +- (NSArray *) attributeKeys { + return [[self class] _attributeKeys]; } -- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table { - return 2; ++ (BOOL) isKeyExcludedFromWebScript:(const char *)name { + return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name]; } -- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group { - switch (group) { - case 0: return @"Statistics"; - case 1: return @"Modifications"; - - default: _assert(false); - } +- (NSString *) device { + return [[UIDevice currentDevice] uniqueIdentifier]; } -- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group { - switch (group) { - case 0: return 3; - case 1: return [fields_ count]; - - default: _assert(false); - } +#if 0 // XXX: implement! +- (NSString *) mac { + if (![indirect_ promptForSensitive:@"Mac Address"]) + return nil; } -- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed { - if (group != 1 || row == -1) - return proposed; - else { - _assert(size_t(row) < [fields_ count]); - return [[[fields_ allValues] objectAtIndex:row] visibleTextRect].size.height + TextViewOffset_; - } +- (NSString *) serial { + if (![indirect_ promptForSensitive:@"Serial #"]) + return nil; } -- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group { - UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease]; - [cell setShowSelection:NO]; - - switch (group) { - case 0: switch (row) { - case 0: { - [cell setTitle:@"Downloading"]; - [cell setValue:SizeString([database_ fetcher].FetchNeeded())]; - } break; - - case 1: { - [cell setTitle:@"Resuming At"]; - [cell setValue:SizeString([database_ fetcher].PartialPresent())]; - } break; - - case 2: { - double size([database_ cache]->UsrSize()); - - if (size < 0) { - [cell setTitle:@"Disk Freeing"]; - [cell setValue:SizeString(-size)]; - } else { - [cell setTitle:@"Disk Using"]; - [cell setValue:SizeString(size)]; - } - } break; +- (NSString *) firewire { + if (![indirect_ promptForSensitive:@"Firewire GUID"]) + return nil; +} - default: _assert(false); - } break; +- (NSString *) imei { + if (![indirect_ promptForSensitive:@"IMEI"]) + return nil; +} +#endif - case 1: - _assert(size_t(row) < [fields_ count]); - [cell setTitle:[[fields_ allKeys] objectAtIndex:row]]; - [cell addSubview:[[fields_ allValues] objectAtIndex:row]]; - break; ++ (NSString *) webScriptNameForSelector:(SEL)selector { + if (selector == @selector(close)) + return @"close"; + else if (selector == @selector(getInstalledPackages)) + return @"getInstalledPackages"; + else if (selector == @selector(getPackageById:)) + return @"getPackageById"; + else if (selector == @selector(installPackages:)) + return @"installPackages"; + 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(setToken:)) + return @"setToken"; + 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; +} - default: _assert(false); - } ++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector { + return [self webScriptNameForSelector:selector] == nil; +} - return cell; +- (BOOL) supports:(NSString *)feature { + return [feature isEqualToString:@"window.open"]; } -- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate { - if ((self = [super initWithFrame:[view bounds]]) != nil) { - database_ = database; - delegate_ = delegate; +- (NSArray *) getInstalledPackages { + NSArray *packages([[Database sharedInstance] packages]); + NSMutableArray *installed([NSMutableArray arrayWithCapacity:[packages count]]); + for (Package *package in packages) + if ([package installed] != nil) + [installed addObject:package]; + return installed; +} - transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]]; - [self addSubview:transition_]; +- (Package *) getPackageById:(NSString *)id { + Package *package([[Database sharedInstance] packageWithName:id]); + [package parse]; + return package; +} - overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]]; +- (NSArray *) statfs:(NSString *)path { + struct statfs stat; - CGSize navsize = [UINavigationBar defaultSize]; - CGRect navrect = {{0, 0}, navsize}; - CGRect bounds = [overlay_ bounds]; + if (path == nil || statfs([path UTF8String], &stat) == -1) + return nil; - navbar_ = [[UINavigationBar alloc] initWithFrame:navrect]; - [navbar_ setDelegate:self]; + return [NSArray arrayWithObjects: + [NSNumber numberWithUnsignedLong:stat.f_bsize], + [NSNumber numberWithUnsignedLong:stat.f_blocks], + [NSNumber numberWithUnsignedLong:stat.f_bfree], + nil]; +} - UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease]; - [navbar_ pushNavigationItem:navitem]; - [navbar_ showButtonsWithLeftTitle:@"Cancel" rightTitle:@"Confirm"]; +- (NSNumber *) du:(NSString *)path { + NSNumber *value(nil); - fields_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain]; + int fds[2]; + _assert(pipe(fds) != -1); - NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16]; - NSMutableArray *reinstalling = [NSMutableArray arrayWithCapacity:16]; - NSMutableArray *upgrading = [NSMutableArray arrayWithCapacity:16]; - NSMutableArray *downgrading = [NSMutableArray arrayWithCapacity:16]; - NSMutableArray *removing = [NSMutableArray arrayWithCapacity:16]; + 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)]; + } + } - bool remove(false); + fclose(du); + } else _assert(close(fds[0])); - pkgDepCache::Policy *policy([database_ policy]); + int status; + wait: + if (waitpid(pid, &status, 0) == -1) + if (errno == EINTR) + goto wait; + else _assert(false); - pkgCacheFile &cache([database_ cache]); - NSArray *packages = [database_ packages]; - for (size_t i(0), e = [packages count]; i != e; ++i) { - Package *package = [packages objectAtIndex:i]; - pkgCache::PkgIterator iterator = [package iterator]; - pkgDepCache::StateCache &state(cache[iterator]); + return value; +} - NSString *name([package name]); +- (void) close { + [indirect_ close]; +} - if (state.NewInstall()) - [installing addObject:name]; - else if (!state.Delete() && (state.iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall) - [reinstalling addObject:name]; - else if (state.Upgrade()) - [upgrading addObject:name]; - else if (state.Downgrade()) - [downgrading addObject:name]; - else if (state.Delete()) { - if ([package essential]) - remove = true; - [removing addObject:name]; - } else continue; +- (void) installPackages:(NSArray *)packages { + [delegate_ performSelectorOnMainThread:@selector(installPackages:) withObject:packages waitUntilDone:NO]; +} - substrate_ |= DepSubstrate(policy->GetCandidateVer(iterator)); - substrate_ |= DepSubstrate(iterator.CurrentVer()); - } +- (void) setAutoPopup:(BOOL)popup { + [indirect_ setAutoPopup:popup]; +} - if (!remove) - essential_ = nil; - else if (Advanced_ || true) { - essential_ = [[UIActionSheet alloc] - initWithTitle:@"Removing Essentials" - buttons:[NSArray arrayWithObjects: - @"Cancel Operation (Safe)", - @"Force Removal (Unsafe)", - nil] - defaultButtonIndex:0 - delegate:self - context:@"remove" - ]; +- (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function { + [indirect_ setButtonImage:button withStyle:style toFunction:function]; +} -#ifndef __OBJC2__ - [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]]; -#endif - [essential_ setBodyText:@"This operation involves the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. If you continue, you may not be able to use Cydia to repair any damage."]; - } else { - essential_ = [[UIActionSheet alloc] - initWithTitle:@"Unable to Comply" - buttons:[NSArray arrayWithObjects:@"Okay", nil] - defaultButtonIndex:0 - delegate:self - context:@"unable" - ]; +- (void) setButtonTitle:(NSString *)button withStyle:(NSString *)style toFunction:(id)function { + [indirect_ setButtonTitle:button withStyle:style toFunction:function]; +} - [essential_ setBodyText:@"This operation requires the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. In order to continue and force this operation you will need to be activate the Advanced mode under to continue and force this operation you will need to be activate the Advanced mode under Settings."]; - } +- (void) setSpecial:(id)function { + [indirect_ setSpecial:function]; +} - AddTextView(fields_, installing, @"Installing"); - AddTextView(fields_, reinstalling, @"Reinstalling"); - AddTextView(fields_, upgrading, @"Upgrading"); - AddTextView(fields_, downgrading, @"Downgrading"); - AddTextView(fields_, removing, @"Removing"); +- (void) setToken:(NSString *)token { + if (Token_ != nil) + [Token_ release]; + Token_ = [token retain]; - table_ = [[UIPreferencesTable alloc] initWithFrame:CGRectMake( - 0, navsize.height, bounds.size.width, bounds.size.height - navsize.height - )]; + [Metadata_ setObject:Token_ forKey:@"Token"]; + Changed_ = true; +} - [table_ setDataSource:self]; - [table_ reloadData]; +- (void) setFinishHook:(id)function { + [indirect_ setFinishHook:function]; +} - [overlay_ addSubview:navbar_]; - [overlay_ addSubview:table_]; +- (void) setPopupHook:(id)function { + [indirect_ setPopupHook:function]; +} - [view addSubview:self]; +- (void) setViewportWidth:(float)width { + [indirect_ setViewportWidth:width]; +} - [transition_ setDelegate: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]; +} - UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease]; - [transition_ transition:0 toView:blank]; - [transition_ transition:3 toView:overlay_]; - } return self; +- (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 /* }}} */ -/* Progress Data {{{ */ -@interface ProgressData : NSObject { - SEL selector_; - id target_; - id object_; +@interface CydiaBrowserView : BrowserView { + CydiaObject *cydia_; } -- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object; - -- (SEL) selector; -- (id) target; -- (id) object; @end -@implementation ProgressData +@implementation CydiaBrowserView -- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object { - if ((self = [super init]) != nil) { - selector_ = selector; - target_ = target; - object_ = object; - } return self; +- (void) dealloc { + [cydia_ release]; + [super dealloc]; } -- (SEL) selector { - return selector_; +- (void) setHeaders:(NSDictionary *)headers forHost:(NSString *)host { } -- (id) target { - return target_; +- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { + [super webView:sender didClearWindowObject:window forFrame:frame]; + + WebDataSource *source([frame dataSource]); + NSURLResponse *response([source response]); + NSURL *url([response URL]); + NSString *scheme([url scheme]); + + NSHTTPURLResponse *http; + if (scheme != nil && ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"])) + http = (NSHTTPURLResponse *) response; + else + http = nil; + + NSDictionary *headers([http allHeaderFields]); + NSString *host([url host]); + [self setHeaders:headers forHost:host]; + + if ( + [host isEqualToString:@"cydia.saurik.com"] || + [host hasSuffix:@".cydia.saurik.com"] || + [scheme isEqualToString:@"file"] + ) + [window setValue:cydia_ forKey:@"cydia"]; } -- (id) object { - return object_; +- (void) _setMoreHeaders:(NSMutableURLRequest *)request { + if (System_ != NULL) + [request setValue:System_ forHTTPHeaderField:@"X-System"]; + if (Machine_ != NULL) + [request setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"]; + if (Token_ != nil) + [request setValue:Token_ forHTTPHeaderField:@"X-Cydia-Token"]; + if (Role_ != nil) + [request setValue:Role_ forHTTPHeaderField:@"X-Role"]; } -@end +- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)source { + NSMutableURLRequest *copy = [request mutableCopy]; + [self _setMoreHeaders:copy]; + return copy; +} + +- (void) setDelegate:(id)delegate { + [super setDelegate:delegate]; + [cydia_ setDelegate:delegate]; +} + +- (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([document_ webView]); + + Package *package([[Database sharedInstance] packageWithName:@"cydia"]); + + NSString *application = package == nil ? @"Cydia" : [NSString + stringWithFormat:@"Cydia/%@", + [package installed] + ]; + + if (Safari_ != nil) + application = [NSString stringWithFormat:@"Safari/%@ %@", Safari_, application]; + if (Build_ != nil) + application = [NSString stringWithFormat:@"Mobile/%@ %@", Build_, application]; + if (Product_ != nil) + application = [NSString stringWithFormat:@"Version/%@ %@", Product_, application]; + + [webview setApplicationNameForUserAgent:application]; + } return self; +} + +@end + +@protocol ConfirmationViewDelegate +- (void) cancel; +- (void) confirm; +- (void) queue; +@end + +@interface ConfirmationView : CydiaBrowserView { + _transient Database *database_; + UIActionSheet *essential_; + NSArray *changes_; + NSArray *issues_; + NSArray *sizes_; + BOOL substrate_; +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database; + +@end + +@implementation ConfirmationView + +- (void) dealloc { + [changes_ release]; + if (issues_ != nil) + [issues_ release]; + [sizes_ release]; + if (essential_ != nil) + [essential_ release]; + [super dealloc]; +} + +- (void) cancel { + [delegate_ cancel]; + [book_ popFromSuperviewAnimated:YES]; +} + +- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { + NSString *context([sheet context]); + + if ([context isEqualToString:@"remove"]) { + switch (button) { + case 1: + [self cancel]; + break; + case 2: + if (substrate_) + Finish_ = 2; + [delegate_ confirm]; + break; + _nodefault + } + + [sheet dismiss]; + } else if ([context isEqualToString:@"unable"]) { + [self cancel]; + [sheet dismiss]; + } else + [super alertSheet:sheet buttonClicked:button]; +} + +- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { + [super webView:sender didClearWindowObject:window forFrame:frame]; + [window setValue:changes_ forKey:@"changes"]; + [window setValue:issues_ forKey:@"issues"]; + [window setValue:sizes_ forKey:@"sizes"]; +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database { + if ((self = [super initWithBook:book]) != nil) { + database_ = database; + + NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16]; + NSMutableArray *reinstalling = [NSMutableArray arrayWithCapacity:16]; + NSMutableArray *upgrading = [NSMutableArray arrayWithCapacity:16]; + NSMutableArray *downgrading = [NSMutableArray arrayWithCapacity:16]; + NSMutableArray *removing = [NSMutableArray arrayWithCapacity:16]; + + bool remove(false); + + pkgDepCache::Policy *policy([database_ policy]); + + pkgCacheFile &cache([database_ cache]); + NSArray *packages = [database_ packages]; + for (Package *package in packages) { + pkgCache::PkgIterator iterator = [package iterator]; + pkgDepCache::StateCache &state(cache[iterator]); + + NSString *name([package name]); + + if (state.NewInstall()) + [installing addObject:name]; + else if (!state.Delete() && (state.iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall) + [reinstalling addObject:name]; + else if (state.Upgrade()) + [upgrading addObject:name]; + else if (state.Downgrade()) + [downgrading addObject:name]; + else if (state.Delete()) { + if ([package essential]) + remove = true; + [removing addObject:name]; + } else continue; + + substrate_ |= DepSubstrate(policy->GetCandidateVer(iterator)); + substrate_ |= DepSubstrate(iterator.CurrentVer()); + } + + if (!remove) + essential_ = nil; + else if (Advanced_) { + NSString *parenthetical(UCLocalize("PARENTHETICAL")); + + essential_ = [[UIActionSheet alloc] + initWithTitle:UCLocalize("REMOVING_ESSENTIALS") + buttons:[NSArray arrayWithObjects: + [NSString stringWithFormat:parenthetical, UCLocalize("CANCEL_OPERATION"), UCLocalize("SAFE")], + [NSString stringWithFormat:parenthetical, UCLocalize("FORCE_REMOVAL"), UCLocalize("UNSAFE")], + nil] + defaultButtonIndex:0 + delegate:self + context:@"remove" + ]; + + [essential_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + + [essential_ setDestructiveButtonIndex:1]; + [essential_ setBodyText:UCLocalize("REMOVING_ESSENTIALS_EX")]; + } else { + essential_ = [[UIActionSheet alloc] + initWithTitle:UCLocalize("UNABLE_TO_COMPLY") + buttons:[NSArray arrayWithObjects:UCLocalize("OKAY"), nil] + defaultButtonIndex:0 + delegate:self + context:@"unable" + ]; + + [essential_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + + [essential_ setBodyText:UCLocalize("UNABLE_TO_COMPLY_EX")]; + } + + changes_ = [[NSArray alloc] initWithObjects: + installing, + reinstalling, + upgrading, + downgrading, + removing, + nil]; + + issues_ = [database_ issues]; + if (issues_ != nil) + issues_ = [issues_ retain]; + + sizes_ = [[NSArray alloc] initWithObjects: + SizeString([database_ fetcher].FetchNeeded()), + SizeString([database_ fetcher].PartialPresent()), + SizeString([database_ cache]->UsrSize()), + nil]; + + [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"confirm" ofType:@"html"]]]; + + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + } return self; +} + +- (NSString *) backButtonTitle { + return UCLocalize("CONFIRM"); +} + +- (NSString *) leftButtonTitle { + return [NSString stringWithFormat:UCLocalize("SLASH_DELIMITED"), UCLocalize("CANCEL"), UCLocalize("QUEUE")]; +} + +- (id) rightButtonTitle { + return issues_ != nil ? nil : [super rightButtonTitle]; +} + +- (id) _rightButtonTitle { +#if AlwaysReload || IgnoreInstall + return [super _rightButtonTitle]; +#else + return UCLocalize("CONFIRM"); +#endif +} + +- (void) _leftButtonClicked { + [self cancel]; +} + +#if !AlwaysReload +- (void) _rightButtonClicked { +#if IgnoreInstall + return [super _rightButtonClicked]; +#endif + if (essential_ != nil) + [essential_ popupAlertAnimated:YES]; + else { + if (substrate_) + Finish_ = 2; + [delegate_ confirm]; + } +} +#endif + +@end +/* }}} */ + +/* Progress Data {{{ */ +@interface ProgressData : NSObject { + SEL selector_; + id target_; + id object_; +} + +- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object; + +- (SEL) selector; +- (id) target; +- (id) object; +@end + +@implementation ProgressData + +- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object { + if ((self = [super init]) != nil) { + selector_ = selector; + target_ = target; + object_ = object; + } return self; +} + +- (SEL) selector { + return selector_; +} + +- (id) target { + return target_; +} + +- (id) object { + return object_; +} + +@end /* }}} */ /* Progress View {{{ */ @interface ProgressView : UIView < @@ -2449,12 +4223,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { id delegate_; BOOL running_; SHA1SumValue springlist_; - size_t received_; - NSTimeInterval last_; + SHA1SumValue notifyconf_; + NSString *title_; } -- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to; - - (id) initWithFrame:(struct CGRect)frame database:(Database *)database delegate:(id)delegate; - (void) setContentView:(UIView *)view; - (void) resetView; @@ -2487,31 +4259,26 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [output_ release]; [status_ release]; [close_ release]; + if (title_ != nil) + [title_ release]; [super dealloc]; } -- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to { - if (bootstrap_ && from == overlay_ && to == view_) - exit(0); -} - - (id) initWithFrame:(struct CGRect)frame database:(Database *)database delegate:(id)delegate { if ((self = [super initWithFrame:frame]) != nil) { database_ = database; delegate_ = delegate; transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]]; + [transition_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [transition_ setDelegate:self]; overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]]; + [overlay_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; - if (bootstrap_) - [overlay_ setBackgroundColor:[UIColor blackColor]]; - else { - background_ = [[UIView alloc] initWithFrame:[self bounds]]; - [background_ setBackgroundColor:[UIColor blackColor]]; - [self addSubview:background_]; - } + background_ = [[UIView alloc] initWithFrame:[self bounds]]; + [background_ setBackgroundColor:[UIColor blackColor]]; + [self addSubview:background_]; [self addSubview:transition_]; @@ -2519,6 +4286,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { CGRect navrect = {{0, 0}, navsize}; navbar_ = [[UINavigationBar alloc] initWithFrame:navrect]; + [navbar_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; [overlay_ addSubview:navbar_]; [navbar_ setBarStyle:1]; @@ -2536,6 +4304,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { }, prgsize}; progress_ = [[UIProgressBar alloc] initWithFrame:prgrect]; + [progress_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)]; [progress_ setStyle:0]; status_ = [[UITextLabel alloc] initWithFrame:CGRectMake( @@ -2545,6 +4314,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { 24 )]; + [status_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)]; + [status_ setColor:[UIColor whiteColor]]; [status_ setBackgroundColor:[UIColor clearColor]]; @@ -2558,8 +4329,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { bounds.size.height - navsize.height - 62 - navrect.size.height )]; + [output_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [overlay_ addSubview:output_]; + //[output_ setTextFont:@"Courier New"]; - [output_ setTextSize:12]; + [output_ setFont:[[output_ font] fontWithSize:12]]; [output_ setTextColor:[UIColor whiteColor]]; [output_ setBackgroundColor:[UIColor clearColor]]; @@ -2568,8 +4342,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [output_ setAllowsRubberBanding:YES]; [output_ setEditable:NO]; - [overlay_ addSubview:output_]; - close_ = [[UIPushButton alloc] initWithFrame:CGRectMake( 10, bounds.size.height - prgsize.height - 50, @@ -2577,6 +4349,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { 32 + prgsize.height )]; + [close_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)]; + [close_ setAutosizesToFit:NO]; [close_ setDrawsShadow:YES]; [close_ setStretchBackground:YES]; @@ -2585,7 +4359,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { UIFont *bold = [UIFont boldSystemFontOfSize:22]; [close_ setTitleFont:bold]; - [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside]; + [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:UIControlEventTouchUpInside]; [close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0]; [close_ setBackground:[UIImage applicationImageNamed:@"green-dn.png"] forState:1]; } return self; @@ -2600,7 +4374,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { - NSString *context = [sheet context]; + NSString *context([sheet context]); + if ([context isEqualToString:@"conffile"]) { FILE *input = [database_ input]; @@ -2613,23 +4388,27 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { fprintf(input, "Y\n"); fflush(input); break; - default: - _assert(false); + _nodefault } - } - [sheet dismiss]; + [sheet dismiss]; + } } - (void) closeButtonPushed { + running_ = NO; + switch (Finish_) { case 0: - [delegate_ progressViewIsComplete:self]; [self resetView]; break; case 1: - [delegate_ suspendWithAnimation:YES]; + [delegate_ terminateWithSuccess]; + /*if ([delegate_ respondsToSelector:@selector(suspendWithAnimation:)]) + [delegate_ suspendWithAnimation:YES]; + else + [delegate_ suspend];*/ break; case 2: @@ -2637,7 +4416,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { break; case 3: - system("launchctl unload /System/Library/LaunchDaemons/com.apple.SpringBoard.plist; launchctl load /System/Library/LaunchDaemons/com.apple.SpringBoard.plist"); + system("launchctl unload "SpringBoard_"; launchctl load "SpringBoard_); break; case 4: @@ -2647,103 +4426,77 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) _retachThread { - UINavigationItem *item = [navbar_ topItem]; - [item setTitle:@"Complete"]; + UINavigationItem *item([navbar_ topItem]); + [item setTitle:UCLocalize("COMPLETE")]; [overlay_ addSubview:close_]; [progress_ removeFromSuperview]; [status_ removeFromSuperview]; - { - FileFd file("/System/Library/LaunchDaemons/com.apple.SpringBoard.plist", FileFd::ReadOnly); - 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:@"Return to Cydia"]; break; - case 1: [close_ setTitle:@"Close Cydia (Restart)"]; break; - case 2: [close_ setTitle:@"Restart SpringBoard"]; break; - case 3: [close_ setTitle:@"Reload SpringBoard"]; break; - case 4: [close_ setTitle:@"Reboot Device"]; break; - } - -#define Cache_ "/User/Library/Caches/com.apple.mobile.installation.plist" - - if (NSMutableDictionary *cache = [[NSMutableDictionary alloc] initWithContentsOfFile:@ Cache_]) { - [cache autorelease]; - - NSFileManager *manager = [NSFileManager defaultManager]; - id error = nil; - - NSMutableDictionary *system = [cache objectForKey:@"System"]; - if (system == nil) - goto error; - - struct stat info; - if (stat(Cache_, &info) == -1) - goto error; - - [system removeAllObjects]; - - if (NSArray *apps = [manager contentsOfDirectoryAtPath:@"/Applications" error:&error]) - for (NSString *app in apps) - if ([app hasSuffix:@".app"]) { - NSString *path = [@"/Applications" stringByAppendingPathComponent:app]; - NSString *plist = [path stringByAppendingPathComponent:@"Info.plist"]; - if (NSMutableDictionary *info = [[NSMutableDictionary alloc] initWithContentsOfFile:plist]) { - [info autorelease]; - [info setObject:path forKey:@"Path"]; - [info setObject:@"System" forKey:@"ApplicationType"]; - NSString *bundle = [info objectForKey:@"CFBundleIdentifier"]; - [system setObject:info forKey:bundle]; - } - } - else goto error; + [database_ popErrorWithTitle:title_]; + [delegate_ progressViewIsComplete:self]; - [cache writeToFile:@Cache_ atomically:YES]; + if (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 (chown(Cache_, info.st_uid, info.st_gid) == -1) - goto error; - if (chmod(Cache_, info.st_mode) == -1) - goto error; + if (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; + } + } - if (false) error: - fprintf(stderr, "%s\n", error == nil ? strerror(errno) : [[error localizedDescription] UTF8String]); + switch (Finish_) { + 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; } - notify_post("com.apple.mobile.application_installed"); + system("su -c /usr/bin/uicache mobile"); [delegate_ setStatusBarShowsProgress:NO]; - - running_ = NO; } -- (void) _detachNewThreadData:(ProgressData *)data { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - +- (void) _detachNewThreadData:(ProgressData *)data { _pooled [[data target] performSelector:[data selector] withObject:[data object]]; [data release]; [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES]; - - [pool release]; } - (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title { - UINavigationItem *item = [navbar_ topItem]; - [item setTitle:title]; + if (title_ != nil) + [title_ release]; + if (title == nil) + title_ = nil; + else + title_ = [title retain]; + + UINavigationItem *item([navbar_ topItem]); + [item setTitle:title_]; [status_ setText:nil]; [output_ setText:@""]; [progress_ setProgress:0]; - received_ = 0; - last_ = 0;//[NSDate timeIntervalSinceReferenceDate]; - [close_ removeFromSuperview]; [overlay_ addSubview:progress_]; [overlay_ addSubview:status_]; @@ -2752,11 +4505,27 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { running_ = YES; { - FileFd file("/System/Library/LaunchDaemons/com.apple.SpringBoard.plist", 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(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; + 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_]; @@ -2777,7 +4546,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { detachNewThreadSelector:selector toTarget:database_ withObject:nil - title:@"Repairing" + title:UCLocalize("REPAIRING") ]; } @@ -2789,19 +4558,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { ]; } -- (void) setProgressError:(NSString *)error forPackage:(NSString *)id { - Package *package = id == nil ? nil : [database_ packageWithName:id]; - - UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:(package == nil ? @"Source Error" : [package name]) - buttons:[NSArray arrayWithObjects:@"Okay", nil] +- (void) setProgressError:(NSString *)error withTitle:(NSString *)title { + CYActionSheet *sheet([[[CYActionSheet alloc] + initWithTitle:title + buttons:[NSArray arrayWithObjects:UCLocalize("OKAY"), nil] defaultButtonIndex:0 - delegate:self - context:@"error" - ] autorelease]; + ] autorelease]); [sheet setBodyText:error]; - [sheet popupAlertAnimated:YES]; + [sheet yieldToPopupAlertAnimated:YES]; + [sheet dismiss]; } - (void) setProgressTitle:(NSString *)title { @@ -2821,7 +4587,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) startProgress { - last_ = [NSDate timeIntervalSinceReferenceDate]; } - (void) addProgressOutput:(NSString *)output { @@ -2833,47 +4598,47 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (bool) isCancelling:(size_t)received { - if (last_ != 0) { - NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate]; - if (received_ != received) { - received_ = received; - last_ = now; - } else if (now - last_ > 30) - return true; - } - return false; } - (void) _setConfigurationData:(NSString *)data { static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); - _assert(conffile_r(data)); + if (!conffile_r(data)) { + lprintf("E:invalid conffile\n"); + return; + } NSString *ofile = conffile_r[1]; //NSString *nfile = conffile_r[2]; UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:@"Configuration Upgrade" + initWithTitle:UCLocalize("CONFIGURATION_UPGRADE") buttons:[NSArray arrayWithObjects: - @"Keep My Old Copy", - @"Accept The New Copy", - // XXX: @"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: - @"The following file has been changed by both the package maintainer and by you (or for you by a script).\n\n%@" - , ofile]]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [sheet setBodyText:[NSString stringWithFormat:@"%@\n\n%@", UCLocalize("CONFIGURATION_UPGRADE_EX"), ofile]]; [sheet popupAlertAnimated:YES]; } - (void) _setProgressTitle:(NSString *)title { - [status_ setText:title]; + NSMutableArray *words([[title componentsSeparatedByString:@" "] mutableCopy]); + for (size_t i(0), e([words count]); i != e; ++i) { + NSString *word([words objectAtIndex:i]); + if (Package *package = [database_ packageWithName:word]) + [words replaceObjectAtIndex:i withObject:[package name]]; + } + + [status_ setText:[words componentsJoinedByString:@" "]]; } - (void) _setProgressPercent:(NSNumber *)percent { @@ -2895,22 +4660,56 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* }}} */ /* Package Cell {{{ */ -@interface PackageCell : UISimpleTableCell { +@interface ContentView : UIView { + _transient id delegate_; +} + +@end + +@interface PackageCell : UITableViewCell { UIImage *icon_; NSString *name_; NSString *description_; + bool commercial_; NSString *source_; - //UIImageView *trusted_; -#ifdef USE_BADGES - UIImageView *badge_; - UITextLabel *status_; -#endif + UIImage *badge_; + Package *package_; + UIColor *color_; + ContentView *content_; + BOOL faded_; + float fade_; + UIImage *placard_; } - (PackageCell *) init; - (void) setPackage:(Package *)package; + (int) heightForPackage:(Package *)package; +- (void) drawContentRect:(CGRect)rect; + +@end + +@implementation ContentView + +- (id) initWithFrame:(CGRect)frame { + if ((self = [super initWithFrame:frame]) != nil) { + } return self; +} + +- (void) setDelegate:(id)delegate { + delegate_ = delegate; +} + +/* Fix landscape: redraw when frame changes. */ +- (void) setFrame:(CGRect)frame { + [super setFrame:frame]; + [self setNeedsDisplay]; +} + +- (void) drawRect:(CGRect)rect { + [super drawRect:rect]; + [delegate_ drawContentRect:rect]; +} @end @@ -2936,49 +4735,82 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [source_ release]; source_ = nil; } + + if (badge_ != nil) { + [badge_ release]; + badge_ = nil; + } + + if (placard_ != nil) { + [placard_ release]; + placard_ = nil; + } + + [package_ release]; + package_ = nil; } - (void) dealloc { [self clearPackage]; -#ifdef USE_BADGES - [badge_ release]; - [status_ release]; -#endif - //[trusted_ release]; + [content_ release]; + [color_ release]; [super dealloc]; } +- (float) fade { + return faded_ ? [self selectionPercent] : fade_; +} + - (PackageCell *) init { - if ((self = [super init]) != nil) { -#ifdef USE_BADGES - badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)]; + CGRect frame(CGRectMake(0, 0, 320, 74)); + if ((self = [super initWithFrame:frame reuseIdentifier:@"Package"]) != nil) { + UIView *content([self contentView]); + CGRect bounds([content bounds]); - status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)]; - [status_ setBackgroundColor:[UIColor clearColor]]; - [status_ setFont:small]; -#endif + content_ = [[ContentView alloc] initWithFrame:bounds]; + [content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [content addSubview:content_]; + + [content_ setDelegate:self]; + [content_ setOpaque:YES]; + if ([self respondsToSelector:@selector(selectionPercent)]) + faded_ = YES; + + [self setNeedsDisplayOnBoundsChange:YES]; } return self; } +- (void) _setBackgroundColor { + UIColor *color; + if (NSString *mode = [package_ mode]) { + bool remove([mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"]); + color = remove ? RemovingColor_ : InstallingColor_; + } else + color = [UIColor whiteColor]; + + [content_ setBackgroundColor:color]; + [self setNeedsDisplay]; +} + - (void) setPackage:(Package *)package { [self clearPackage]; + [package parse]; Source *source = [package source]; - icon_ = nil; - if (NSString *icon = [package icon]) - icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]]; - if (icon_ == nil) if (NSString *section = [package section]) - icon_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, Simplify(section)]]; - /*if (icon_ == nil) if (NSString *icon = [source defaultIcon]) - icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];*/ - if (icon_ == nil) - icon_ = [UIImage applicationImageNamed:@"unknown.png"]; + icon_ = [[package icon] retain]; + name_ = [[package name] retain]; + + if (IsWildcat_) + description_ = [package longDescription]; + if (description_ == nil) + description_ = [package shortDescription]; + if (description_ != nil) + description_ = [description_ retain]; - icon_ = [icon_ retain]; + commercial_ = [package isCommercial]; - name_ = [[package name] retain]; - description_ = [[package tagline] retain]; + package_ = [package retain]; NSString *label = nil; bool trusted = false; @@ -2987,46 +4819,43 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { label = [source label]; trusted = [source trusted]; } else if ([[package id] isEqualToString:@"firmware"]) - label = @"Apple"; + label = UCLocalize("APPLE"); else - label = @"Unknown/Local"; + label = [NSString stringWithFormat:UCLocalize("SLASH_DELIMITED"), UCLocalize("UNKNOWN"), UCLocalize("LOCAL")]; - NSString *from = [NSString stringWithFormat:@"from %@", label]; + NSString *from(label); - NSString *section = Simplify([package section]); - if (section != nil && ![section isEqualToString:label]) - from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]]; + NSString *section = [package simpleSection]; + if (section != nil && ![section isEqualToString:label]) { + section = [[NSBundle mainBundle] localizedStringForKey:section value:nil table:@"Sections"]; + from = [NSString stringWithFormat:UCLocalize("PARENTHETICAL"), from, section]; + } + from = [NSString stringWithFormat:UCLocalize("FROM"), from]; source_ = [from retain]; -#ifdef USE_BADGES - [badge_ removeFromSuperview]; - [status_ removeFromSuperview]; + if (NSString *purpose = [package primaryPurpose]) + if ((badge_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Purposes/%@.png", App_, purpose]]) != nil) + badge_ = [badge_ retain]; - if (NSString *mode = [package mode]) { - [badge_ setImage:[UIImage applicationImageNamed: - [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png" - ]]; - - [status_ setText:[NSString stringWithFormat:@"Queued for %@", mode]]; - [status_ setColor:Blueish_]; - } else if ([package half]) { - [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]]; - [status_ setText:@"Package Damaged"]; - [status_ setColor:[UIColor redColor]]; - } else { - [badge_ setImage:nil]; - [status_ setText:nil]; - goto done; - } + if ([package installed] != nil) + if ((placard_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/installed.png", App_]]) != nil) + placard_ = [placard_ retain]; - [self addSubview:badge_]; - [self addSubview:status_]; - done:; -#endif + [self _setBackgroundColor]; + [content_ setNeedsDisplay]; } -- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected { +- (void) drawContentRect:(CGRect)rect { + bool selected([self isSelected]); + float width([self bounds].size.width); + +#if 0 + CGContextRef context(UIGraphicsGetCurrentContext()); + [([[self selectedBackgroundView] superview] != nil ? [UIColor clearColor] : [self backgroundColor]) set]; + CGContextFillRect(context, rect); +#endif + if (icon_ != nil) { CGRect rect; rect.size = [icon_ size]; @@ -3040,36 +4869,46 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [icon_ drawInRect:rect]; } + if (badge_ != nil) { + CGSize size = [badge_ size]; + + [badge_ drawAtPoint:CGPointMake( + 36 - size.width / 2, + 36 - size.height / 2 + )]; + } + if (selected) UISetColor(White_); if (!selected) - UISetColor(Black_); - [name_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2]; - [source_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2]; + UISetColor(commercial_ ? Purple_ : Black_); + [name_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - (placard_ == nil ? 80 : 106)) withFont:Font18Bold_ ellipsis:2]; + [source_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ ellipsis:2]; if (!selected) - UISetColor(Gray_); - [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2]; + UISetColor(commercial_ ? Purplish_ : Gray_); + [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ ellipsis:2]; - [super drawContentInRect:rect selected:selected]; + if (placard_ != nil) + [placard_ drawAtPoint:CGPointMake(width - 52, 9)]; +} + +- (void) setSelected:(BOOL)selected animated:(BOOL)fade { + //[self _setBackgroundColor]; + [super setSelected:selected animated:fade]; + [content_ setNeedsDisplay]; } + (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 /* }}} */ /* Section Cell {{{ */ @interface SectionCell : UISimpleTableCell { + NSString *basic_; NSString *section_; NSString *name_; NSString *count_; @@ -3086,6 +4925,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @implementation SectionCell - (void) clearSection { + if (basic_ != nil) { + [basic_ release]; + basic_ = nil; + } + if (section_ != nil) { [section_ release]; section_ = nil; @@ -3112,17 +4956,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (id) init { if ((self = [super init]) != nil) { icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain]; - switch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(218, 9, 60, 25)]; - [switch_ addTarget:self action:@selector(onSwitch:) forEvents:kUIControlEventMouseUpInside]; + [switch_ addTarget:self action:@selector(onSwitch:) forEvents:UIControlEventTouchUpInside]; } return self; } - (void) onSwitch:(id)sender { - NSMutableDictionary *metadata = [Sections_ objectForKey:section_]; + NSMutableDictionary *metadata = [Sections_ objectForKey:basic_]; if (metadata == nil) { metadata = [NSMutableDictionary dictionaryWithCapacity:2]; - [Sections_ setObject:metadata forKey:section_]; + [Sections_ setObject:metadata forKey:basic_]; } Changed_ = true; @@ -3141,20 +4984,31 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self clearSection]; if (section == nil) { - name_ = [@"All Packages" retain]; + name_ = [UCLocalize("ALL_PACKAGES") retain]; count_ = nil; } else { - section_ = [section name]; + basic_ = [section name]; + if (basic_ != nil) + basic_ = [basic_ retain]; + + section_ = [section localized]; if (section_ != nil) section_ = [section_ retain]; - name_ = [(section_ == nil ? @"(No Section)" : section_) retain]; + + name_ = [(section_ == nil || [section_ length] == 0 ? UCLocalize("NO_SECTION") : section_) retain]; count_ = [[NSString stringWithFormat:@"%d", [section count]] retain]; if (editing_) - [switch_ setValue:isSectionVisible(section_) animated:NO]; + [switch_ setValue:(isSectionVisible(basic_) ? 1 : 0) animated:NO]; } } +- (void) setFrame:(CGRect)frame { + [super setFrame:frame]; + CGRect rect([switch_ frame]); + [switch_ setFrame:CGRectMake(frame.size.width - 102, 9, rect.size.width, rect.size.height)]; +} + - (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected { [icon_ drawInRect:CGRectMake(8, 7, 32, 32)]; @@ -3163,13 +5017,18 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (!selected) UISetColor(Black_); - [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(editing_ ? 164 : 250) withFont:Font22Bold_ ellipsis:2]; + + float width(rect.size.width + 23); + if (editing_) + width -= 110; + + [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(width - 70) withFont:Font22Bold_ ellipsis:2]; CGSize size = [count_ sizeWithFont:Font14_]; UISetColor(White_); if (count_ != nil) - [count_ drawAtPoint:CGPointMake(12 + (29 - size.width) / 2, 15) withFont:Font12Bold_]; + [count_ drawAtPoint:CGPointMake(13 + (29 - size.width) / 2, 16) withFont:Font12Bold_]; [super drawContentInRect:rect selected:selected]; } @@ -3235,7 +5094,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self addSubview:list_]; UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:@"Name" + initWithTitle:UCLocalize("NAME") identifier:@"name" width:[self frame].size.width ] autorelease]; @@ -3245,6 +5104,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [list_ addTableColumn:column]; [list_ setDelegate:self]; [list_ setReusesTableCells:YES]; + + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -3265,14 +5127,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { package_ = [package retain]; name_ = [[package id] retain]; - NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_]; - - { - std::ifstream fin([path UTF8String]); - std::string line; - while (std::getline(fin, line)) - [files_ addObject:[NSString stringWithUTF8String:line.c_str()]]; - } + if (NSArray *files = [package files]) + [files_ addObjectsFromArray:files]; if ([files_ count] != 0) { if ([[files_ objectAtIndex:0] isEqualToString:@"/."]) @@ -3309,19 +5165,21 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) title { - return @"Installed Files"; + return UCLocalize("INSTALLED_FILES"); } - (NSString *) backButtonTitle { - return @"Files"; + return UCLocalize("FILES"); } @end /* }}} */ /* Package View {{{ */ -@interface PackageView : BrowserView { +@interface PackageView : CydiaBrowserView { + _transient Database *database_; Package *package_; NSString *name_; + bool commercial_; NSMutableArray *buttons_; } @@ -3341,75 +5199,101 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [super dealloc]; } +- (void) release { + if ([self retainCount] == 1) + [delegate_ setPackageView:self]; + [super release]; +} + +/* XXX: this is not safe at all... localization of /fail/ */ - (void) _clickButtonWithName:(NSString *)name { - if ([name isEqualToString:@"Install"]) + if ([name isEqualToString:UCLocalize("CLEAR")]) + [delegate_ clearPackage:package_]; + else if ([name isEqualToString:UCLocalize("INSTALL")]) [delegate_ installPackage:package_]; - else if ([name isEqualToString:@"Reinstall"]) + else if ([name isEqualToString:UCLocalize("REINSTALL")]) [delegate_ installPackage:package_]; - else if ([name isEqualToString:@"Remove"]) + else if ([name isEqualToString:UCLocalize("REMOVE")]) [delegate_ removePackage:package_]; - else if ([name isEqualToString:@"Upgrade"]) + else if ([name isEqualToString:UCLocalize("UPGRADE")]) [delegate_ installPackage:package_]; else _assert(false); } - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { - int count = [buttons_ count]; - _assert(count != 0); - _assert(button <= count + 1); + NSString *context([sheet context]); - if (count != button - 1) - [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]]; + if ([context isEqualToString:@"modify"]) { + int count = [buttons_ count]; + _assert(count != 0); + _assert(button <= count + 1); - [sheet dismiss]; + if (count != button - 1) + [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]]; + + [sheet dismiss]; + } else + [super alertSheet:sheet buttonClicked:button]; } - (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame { - [[frame windowObject] evaluateWebScript:@"document.base.target = '_top'"]; return [super webView:sender didFinishLoadForFrame:frame]; } - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { + [super webView:sender didClearWindowObject:window forFrame:frame]; [window setValue:package_ forKey:@"package"]; } -- (void) _rightButtonClicked { - /*[super _rightButtonClicked]; - return;*/ +- (bool) _allowJavaScriptPanel { + return commercial_; +} - int count = [buttons_ count]; - _assert(count != 0); +#if !AlwaysReload +- (void) __rightButtonClicked { + int count([buttons_ count]); + if (count == 0) + return; if (count == 1) [self _clickButtonWithName:[buttons_ objectAtIndex:0]]; else { NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)]; [buttons addObjectsFromArray:buttons_]; - [buttons addObject:@"Cancel"]; + [buttons addObject:UCLocalize("CANCEL")]; [delegate_ slideUp:[[[UIActionSheet alloc] initWithTitle:nil buttons:buttons - defaultButtonIndex:2 + defaultButtonIndex:([buttons count] - 1) delegate:self - context:@"manage" + context:@"modify" ] autorelease]]; } } -- (NSString *) _rightButtonTitle { +- (void) _rightButtonClicked { + if (commercial_) + [super _rightButtonClicked]; + else + [self __rightButtonClicked]; +} +#endif + +- (id) _rightButtonTitle { int count = [buttons_ count]; - return count == 0 ? nil : count != 1 ? @"Modify" : [buttons_ objectAtIndex:0]; + return count == 0 ? nil : count != 1 ? UCLocalize("MODIFY") : [buttons_ objectAtIndex:0]; } -- (NSString *) title { +- (NSString *) backButtonTitle { return @"Details"; } - (id) initWithBook:(RVBook *)book database:(Database *)database { - if ((self = [super initWithBook:book database:database]) != nil) { + if ((self = [super initWithBook:book]) != nil) { database_ = database; buttons_ = [[NSMutableArray alloc] initWithCapacity:4]; + [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]]; } return self; } @@ -3427,26 +5311,58 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [buttons_ removeAllObjects]; if (package != nil) { + [package parse]; + package_ = [package retain]; name_ = [[package id] retain]; + commercial_ = [package isCommercial]; - [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]]; - + if ([package_ mode] != nil) + [buttons_ addObject:UCLocalize("CLEAR")]; if ([package_ source] == nil); else if ([package_ upgradableAndEssential:NO]) - [buttons_ addObject:@"Upgrade"]; - else if ([package_ installed] == nil) - [buttons_ addObject:@"Install"]; + [buttons_ addObject:UCLocalize("UPGRADE")]; + else if ([package_ uninstalled]) + [buttons_ addObject:UCLocalize("INSTALL")]; else - [buttons_ addObject:@"Reinstall"]; - if ([package_ installed] != nil) - [buttons_ addObject:@"Remove"]; + [buttons_ addObject:UCLocalize("REINSTALL")]; + if (![package_ uninstalled]) + [buttons_ addObject:UCLocalize("REMOVE")]; + + if (special_ != NULL) { + CGRect frame([document_ frame]); + frame.size.width = 320; + frame.size.height = 0; + [document_ setFrame:frame]; + + if ([scroller_ respondsToSelector:@selector(scrollPointVisibleAtTopLeft:)]) + [scroller_ scrollPointVisibleAtTopLeft:CGPointZero]; + else + [scroller_ scrollRectToVisible:CGRectZero animated:NO]; + + WebThreadLock(); + [[[document_ webView] windowScriptObject] setValue:package_ forKey:@"package"]; + + [self setButtonTitle:nil withStyle:nil toFunction:nil]; + + [self setFinishHook:nil]; + [self setPopupHook:nil]; + WebThreadUnlock(); + + //[self yieldToSelector:@selector(callFunction:) withObject:special_]; + [super callFunction:special_]; + } } + + [self reloadButtons]; +} + +- (bool) isLoading { + return commercial_ ? [super isLoading] : false; } - (void) reloadData { [self setPackage:[database_ packageWithName:name_]]; - [self reloadButtons]; } @end @@ -3455,22 +5371,21 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @interface PackageTable : RVPage { _transient Database *database_; NSString *title_; - SEL filter_; - id object_; NSMutableArray *packages_; NSMutableArray *sections_; - UISectionList *list_; + UITableView *list_; + NSMutableArray *index_; + NSMutableDictionary *indices_; } -- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object; +- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title; - (void) setDelegate:(id)delegate; -- (void) setObject:(id)object; - (void) reloadData; - (void) resetCursor; -- (UISectionList *) list; +- (UITableView *) list; - (void) setShouldHideHeaderInShortLists:(BOOL)hide; @@ -3482,87 +5397,88 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [list_ setDataSource:nil]; [title_ release]; - if (object_ != nil) - [object_ release]; [packages_ release]; [sections_ release]; [list_ release]; + [index_ release]; + [indices_ release]; [super dealloc]; } -- (int) numberOfSectionsInSectionList:(UISectionList *)list { - return [sections_ count]; +- (NSInteger) numberOfSectionsInTableView:(UITableView *)list { + NSInteger count([sections_ count]); + return count == 0 ? 1 : count; } -- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section { +- (NSString *) tableView:(UITableView *)list titleForHeaderInSection:(NSInteger)section { + if ([sections_ count] == 0) + return nil; return [[sections_ objectAtIndex:section] name]; } -- (int) sectionList:(UISectionList *)list rowForSection:(int)section { - return [[sections_ objectAtIndex:section] row]; +- (NSInteger) tableView:(UITableView *)list numberOfRowsInSection:(NSInteger)section { + if ([sections_ count] == 0) + return 0; + return [[sections_ objectAtIndex:section] count]; } -- (int) numberOfRowsInTable:(UITable *)table { - return [packages_ count]; +- (Package *) packageAtIndexPath:(NSIndexPath *)path { + Section *section([sections_ objectAtIndex:[path section]]); + NSInteger row([path row]); + Package *package([packages_ objectAtIndex:([section row] + row)]); + return package; } -- (float) table:(UITable *)table heightForRow:(int)row { - return [PackageCell heightForPackage:[packages_ objectAtIndex:row]]; +- (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path { + PackageCell *cell([table dequeueReusableCellWithIdentifier:@"Package"]); + if (cell == nil) + cell = [[[PackageCell alloc] init] autorelease]; + [cell setPackage:[self packageAtIndexPath:path]]; + return cell; } -- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing { - if (reusing == nil) - reusing = [[[PackageCell alloc] init] autorelease]; - [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]]; - return reusing; +- (CGFloat) tableView:(UITableView *)table heightForRowAtIndexPath:(NSIndexPath *)path { + return 73; + return [PackageCell heightForPackage:[self packageAtIndexPath:path]]; } -- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row { - return NO; +- (NSIndexPath *) tableView:(UITableView *)table willSelectRowAtIndexPath:(NSIndexPath *)path { + Package *package([self packageAtIndexPath:path]); + package = [database_ packageWithName:[package id]]; + PackageView *view([delegate_ packageView]); + [view setPackage:package]; + [view setDelegate:delegate_]; + [book_ pushPage:view]; + return path; } -- (void) tableRowSelected:(NSNotification *)notification { - int row = [[notification object] selectedRow]; - if (row == INT_MAX) - return; +- (NSArray *) sectionIndexTitlesForTableView:(UITableView *)tableView { + return [packages_ count] > 20 ? index_ : nil; +} - Package *package = [packages_ objectAtIndex:row]; - PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; - [view setDelegate:delegate_]; - [view setPackage:package]; - [book_ pushPage:view]; +- (NSInteger)tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index { + return index; } -- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object { +- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title { if ((self = [super initWithBook:book]) != nil) { database_ = database; title_ = [title retain]; - filter_ = filter; - object_ = object == nil ? nil : [object retain]; + + index_ = [[NSMutableArray alloc] initWithCapacity:32]; + indices_ = [[NSMutableDictionary alloc] initWithCapacity:32]; packages_ = [[NSMutableArray arrayWithCapacity:16] retain]; sections_ = [[NSMutableArray arrayWithCapacity:16] retain]; - list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:YES]; - [list_ setDataSource:self]; - - UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:@"Name" - identifier:@"name" - width:[self frame].size.width - ] autorelease]; - - UITable *table = [list_ table]; - [table setSeparatorStyle:1]; - [table addTableColumn:column]; - [table setDelegate:self]; - [table setReusesTableCells:YES]; - + list_ = [[UITableView alloc] initWithFrame:[self bounds] style:UITableViewStylePlain]; + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [self addSubview:list_]; - [self reloadData]; - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [list_ setDataSource:self]; + [list_ setDelegate:self]; + + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -3570,13 +5486,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { delegate_ = delegate; } -- (void) setObject:(id)object { - if (object_ != nil) - [object_ release]; - if (object == nil) - object_ = nil; - else - object_ = [object retain]; +- (bool) hasPackage:(Package *)package { + return true; } - (void) reloadData { @@ -3585,27 +5496,47 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [packages_ removeAllObjects]; [sections_ removeAllObjects]; - for (size_t i(0); i != [packages count]; ++i) { - Package *package([packages objectAtIndex:i]); - if ([package valid] && [[package performSelector:filter_ withObject:object_] boolValue]) - [packages_ addObject:package]; - } + _profile(PackageTable$reloadData$Filter) + for (Package *package in packages) + if ([self hasPackage:package]) + [packages_ addObject:package]; + _end + + [index_ removeAllObjects]; + [indices_ removeAllObjects]; Section *section = nil; - for (size_t offset(0); offset != [packages_ count]; ++offset) { - Package *package = [packages_ objectAtIndex:offset]; - NSString *name = [package index]; + _profile(PackageTable$reloadData$Section) + for (size_t offset(0), end([packages_ count]); offset != end; ++offset) { + Package *package; + unichar index; - if (section == nil || ![[section name] isEqualToString:name]) { - section = [[[Section alloc] initWithName:name row:offset] autorelease]; - [sections_ addObject:section]; - } + _profile(PackageTable$reloadData$Section$Package) + package = [packages_ objectAtIndex:offset]; + index = [package index]; + _end - [section addToCount]; - } + if (section == nil || [section index] != index) { + _profile(PackageTable$reloadData$Section$Allocate) + section = [[[Section alloc] initWithIndex:index row:offset] autorelease]; + _end - [list_ reloadData]; + [index_ addObject:[section name]]; + //[indices_ setObject:[NSNumber numberForInt:[sections_ count]] forKey:index]; + + _profile(PackageTable$reloadData$Section$Add) + [sections_ addObject:section]; + _end + } + + [section addToCount]; + } + _end + + _profile(PackageTable$reloadData$List) + [list_ reloadData]; + _end } - (NSString *) title { @@ -3617,15 +5548,78 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) resetCursor { - [[list_ table] scrollPointVisibleAtTopLeft:CGPointMake(0, 0) animated:NO]; + [list_ scrollRectToVisible:CGRectMake(0, 0, 0, 0) animated:NO]; } -- (UISectionList *) list { +- (UITableView *) list { return list_; } - (void) setShouldHideHeaderInShortLists:(BOOL)hide { - [list_ setShouldHideHeaderInShortLists:hide]; + //XXX:[list_ setShouldHideHeaderInShortLists:hide]; +} + +@end +/* }}} */ +/* Filtered Package Table {{{ */ +@interface FilteredPackageTable : PackageTable { + SEL filter_; + IMP imp_; + id object_; +} + +- (void) setObject:(id)object; +- (void) setObject:(id)object forFilter:(SEL)filter; + +- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object; + +@end + +@implementation FilteredPackageTable + +- (void) dealloc { + if (object_ != nil) + [object_ release]; + [super dealloc]; +} + +- (void) setFilter:(SEL)filter { + filter_ = filter; + + /* XXX: this is an unsafe optimization of doomy hell */ + Method method(class_getInstanceMethod([Package class], filter)); + _assert(method != NULL); + imp_ = method_getImplementation(method); + _assert(imp_ != NULL); +} + +- (void) setObject:(id)object { + if (object_ != nil) + [object_ release]; + if (object == nil) + object_ = nil; + else + object_ = [object retain]; +} + +- (void) setObject:(id)object forFilter:(SEL)filter { + [self setFilter:filter]; + [self setObject:object]; + +} + +- (bool) hasPackage:(Package *)package { + _profile(FilteredPackageTable$hasPackage) + return [package valid] && (*reinterpret_cast(imp_))(package, filter_, object_); + _end +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object { + if ((self = [super initWithBook:book database:database title:title]) != nil) { + [self setFilter:filter]; + object_ = object == nil ? nil : [object retain]; + [self reloadData]; + } return self; } @end @@ -3689,6 +5683,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected { + float width(rect.size.width); + if (icon_ != nil) [icon_ drawInRect:CGRectMake(10, 10, 30, 30)]; @@ -3697,15 +5693,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (!selected) UISetColor(Black_); - [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2]; + [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - 80) withFont:Font18Bold_ ellipsis:2]; if (!selected) UISetColor(Blue_); - [label_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2]; + [label_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ ellipsis:2]; if (!selected) UISetColor(Gray_); - [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2]; + [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 40) withFont:Font14_ ellipsis:2]; [super drawContentInRect:rect selected:selected]; } @@ -3725,11 +5721,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { NSError *error_; //NSURLConnection *installer_; + NSURLConnection *trivial_; NSURLConnection *trivial_bz2_; NSURLConnection *trivial_gz_; //NSURLConnection *automatic_; - BOOL trivial_; + BOOL cydia_; } - (id) initWithBook:(RVBook *)book database:(Database *)database; @@ -3758,6 +5755,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [error_ release]; //[self _deallocConnection:installer_]; + [self _deallocConnection:trivial_]; [self _deallocConnection:trivial_gz_]; [self _deallocConnection:trivial_bz2_]; //[self _deallocConnection:automatic_]; @@ -3773,12 +5771,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section { switch (section + (offset_ == 0 ? 1 : 0)) { - case 0: return @"Entered by User"; - case 1: return @"Installed by Packages"; + case 0: return UCLocalize("ENTERED_BY_USER"); + case 1: return UCLocalize("INSTALLED_BY_PACKAGE"); - default: - _assert(false); - return nil; + _nodefault } } @@ -3787,9 +5783,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { case 0: return 0; case 1: return offset_; - default: - _assert(false); - return -1; + _nodefault } } @@ -3824,7 +5818,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { Source *source = [sources_ objectAtIndex:row]; - PackageTable *packages = [[[PackageTable alloc] + PackageTable *packages = [[[FilteredPackageTable alloc] initWithBook:book_ database:database_ title:[source label] @@ -3852,9 +5846,40 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [delegate_ syncData]; } +- (void) complete { + [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys: + @"deb", @"Type", + href_, @"URI", + @"./", @"Distribution", + nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]]; + + [delegate_ syncData]; +} + +- (NSString *) getWarning { + NSString *href(href_); + NSRange colon([href rangeOfString:@"://"]); + if (colon.location != NSNotFound) + href = [href substringFromIndex:(colon.location + 3)]; + href = [href stringByAddingPercentEscapes]; + href = [CydiaURL(@"api/repotag/") stringByAppendingString:href]; + href = [href stringByCachingURLWithCurrentCDN]; + + NSURL *url([NSURL URLWithString:href]); + + NSStringEncoding encoding; + NSError *error(nil); + + if (NSString *warning = [NSString stringWithContentsOfURL:url usedEncoding:&encoding error:&error]) + return [warning length] == 0 ? nil : warning; + return nil; +} + - (void) _endConnection:(NSURLConnection *)connection { NSURLConnection **field = NULL; - if (connection == trivial_bz2_) + if (connection == trivial_) + field = &trivial_; + else if (connection == trivial_bz2_) field = &trivial_bz2_; else if (connection == trivial_gz_) field = &trivial_gz_; @@ -3863,50 +5888,69 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { *field = nil; if ( + trivial_ == nil && trivial_bz2_ == nil && trivial_gz_ == nil ) { - [delegate_ setStatusBarShowsProgress:NO]; - - [hud_ show:NO]; - [hud_ removeFromSuperview]; - [hud_ autorelease]; - hud_ = nil; - - if (trivial_) { - [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys: - @"deb", @"Type", - href_, @"URI", - @"./", @"Distribution", - nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]]; - - [delegate_ syncData]; + bool defer(false); + + if (cydia_) { + if (NSString *warning = [self yieldToSelector:@selector(getWarning)]) { + defer = true; + + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:UCLocalize("SOURCE_WARNING") + buttons:[NSArray arrayWithObjects:UCLocalize("ADD_ANYWAY"), UCLocalize("CANCEL"), nil] + defaultButtonIndex:0 + delegate:self + context:@"warning" + ] autorelease]; + + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + + [sheet setNumberOfRows:1]; + [sheet setBodyText:warning]; + [sheet popupAlertAnimated:YES]; + } else + [self complete]; } else if (error_ != nil) { UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:@"Verification Error" - buttons:[NSArray arrayWithObjects:@"OK", nil] + initWithTitle:UCLocalize("VERIFICATION_ERROR") + buttons:[NSArray arrayWithObjects:UCLocalize("OK"), nil] defaultButtonIndex:0 delegate:self context:@"urlerror" ] autorelease]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [sheet setBodyText:[error_ localizedDescription]]; [sheet popupAlertAnimated:YES]; } else { UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:@"Did not Find Repository" - buttons:[NSArray arrayWithObjects:@"OK", nil] + initWithTitle:UCLocalize("NOT_REPOSITORY") + buttons:[NSArray arrayWithObjects:UCLocalize("OK"), nil] defaultButtonIndex:0 delegate:self context:@"trivial" ] autorelease]; - [sheet setBodyText:@"The indicated repository could not be found. This could be because you are trying to add a legacy Installer repository (these are not supported). Also, this interface is only capable of working with exact repository URLs. If you host a repository and are having issues please contact the author of Cydia with any questions you have."]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + + [sheet setBodyText:UCLocalize("NOT_REPOSITORY_EX")]; [sheet popupAlertAnimated:YES]; } - [href_ release]; - href_ = nil; + [delegate_ setStatusBarShowsProgress:NO]; + [delegate_ removeProgressHUD:hud_]; + + [hud_ autorelease]; + hud_ = nil; + + if (!defer) { + [href_ release]; + href_ = nil; + } if (error_ != nil) { [error_ release]; @@ -3918,12 +5962,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) connection:(NSURLConnection *)connection didReceiveResponse:(NSHTTPURLResponse *)response { switch ([response statusCode]) { case 200: - trivial_ = YES; + cydia_ = YES; } } - (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { - fprintf(stderr, "connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]); + lprintf("connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]); if (error_ != nil) error_ = [error retain]; [self _endConnection:connection]; @@ -3937,17 +5981,25 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:href] cachePolicy:NSURLRequestUseProtocolCachePolicy - timeoutInterval:20.0 + timeoutInterval:120.0 ]; [request setHTTPMethod:method]; + if (Machine_ != NULL) + [request setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"]; + if (UniqueID_ != nil) + [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"]; + if (Role_ != nil) + [request setValue:Role_ forHTTPHeaderField:@"X-Role"]; + return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease]; } - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { - NSString *context = [sheet context]; - if ([context isEqualToString:@"source"]) + NSString *context([sheet context]); + + if ([context isEqualToString:@"source"]) { switch (button) { case 1: { NSString *href = [[sheet textField] text]; @@ -3960,24 +6012,45 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { href_ = href; href_ = [href_ retain]; + trivial_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages"] method:@"HEAD"] retain]; trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.bz2"] method:@"HEAD"] retain]; trivial_gz_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.gz"] method:@"HEAD"] retain]; //trivial_bz2_ = [[self _requestHRef:[href stringByAppendingString:@"dists/Release"] method:@"HEAD"] retain]; - trivial_ = false; + cydia_ = false; - hud_ = [delegate_ addProgressHUD]; - [hud_ setText:@"Verifying URL"]; + hud_ = [[delegate_ addProgressHUD] retain]; + [hud_ setText:UCLocalize("VERIFYING_URL")]; } break; case 2: break; - default: - _assert(false); + _nodefault } - [sheet dismiss]; + [sheet dismiss]; + } else if ([context isEqualToString:@"trivial"]) + [sheet dismiss]; + else if ([context isEqualToString:@"urlerror"]) + [sheet dismiss]; + else if ([context isEqualToString:@"warning"]) { + switch (button) { + case 1: + [self complete]; + break; + + case 2: + break; + + _nodefault + } + + [href_ release]; + href_ = nil; + + [sheet dismiss]; + } } - (id) initWithBook:(RVBook *)book database:(Database *)database { @@ -3987,13 +6060,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { //list_ = [[UITable alloc] initWithFrame:[self bounds]]; list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:NO]; - [list_ setShouldHideHeaderInShortLists:NO]; - + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [self addSubview:list_]; + + [list_ setShouldHideHeaderInShortLists:NO]; [list_ setDataSource:self]; UITableColumn *column = [[UITableColumn alloc] - initWithTitle:@"Name" + initWithTitle:UCLocalize("NAME") identifier:@"name" width:[self frame].size.width ]; @@ -4005,20 +6079,22 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self reloadData]; - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } - (void) reloadData { pkgSourceList list; - _assert(list.ReadMainList()); + if (!list.ReadMainList()) + return; [sources_ removeAllObjects]; [sources_ addObjectsFromArray:[database_ sources]]; + _trace(); [sources_ sortUsingSelector:@selector(compareByNameAndType:)]; + _trace(); - int count = [sources_ count]; + int count([sources_ count]); for (offset_ = 0; offset_ != count; ++offset_) { Source *source = [sources_ objectAtIndex:offset_]; if ([source record] == nil) @@ -4039,19 +6115,24 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { ] autorelease]];*/ UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:@"Enter Cydia/APT URL" - buttons:[NSArray arrayWithObjects:@"Add Source", @"Cancel", nil] + initWithTitle:UCLocalize("ENTER_APT_URL") + buttons:[NSArray arrayWithObjects:UCLocalize("ADD_SOURCE"), UCLocalize("CANCEL"), nil] defaultButtonIndex:0 delegate:self context:@"source" ] autorelease]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + + [sheet setNumberOfRows:1]; [sheet addTextFieldWithValue:@"http://" label:@""]; UITextInputTraits *traits = [[sheet textField] textInputTraits]; - [traits setAutocapitalizationType:0]; - [traits setKeyboardType:3]; - [traits setAutocorrectionType:1]; + [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone]; + [traits setAutocorrectionType:UITextAutocorrectionTypeNo]; + [traits setKeyboardType:UIKeyboardTypeURL]; + // XXX: UIReturnKeyDone + [traits setReturnKeyType:UIReturnKeyNext]; [sheet popupAlertAnimated:YES]; } @@ -4064,19 +6145,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) title { - return @"Sources"; -} - -- (NSString *) backButtonTitle { - return @"Sources"; + return UCLocalize("SOURCES"); } - (NSString *) leftButtonTitle { - return [[list_ table] isRowDeletionEnabled] ? @"Add" : nil; + return [[list_ table] isRowDeletionEnabled] ? UCLocalize("ADD") : nil; } -- (NSString *) rightButtonTitle { - return [[list_ table] isRowDeletionEnabled] ? @"Done" : @"Edit"; +- (id) rightButtonTitle { + return [[list_ table] isRowDeletionEnabled] ? UCLocalize("DONE") : UCLocalize("EDIT"); } - (UINavigationButtonStyle) rightButtonStyle { @@ -4089,7 +6166,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* Installed View {{{ */ @interface InstalledView : RVPage { _transient Database *database_; - PackageTable *packages_; + FilteredPackageTable *packages_; BOOL expert_; } @@ -4108,7 +6185,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if ((self = [super initWithBook:book]) != nil) { database_ = database; - packages_ = [[PackageTable alloc] + packages_ = [[FilteredPackageTable alloc] initWithBook:book database:database title:nil @@ -4116,10 +6193,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { with:[NSNumber numberWithBool:YES] ]; + [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [self addSubview:packages_]; - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -4139,15 +6216,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) title { - return @"Installed"; + return UCLocalize("INSTALLED"); } - (NSString *) backButtonTitle { - return @"Packages"; + return UCLocalize("PACKAGES"); } -- (NSString *) rightButtonTitle { - return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? @"Expert" : @"Simple"; +- (id) rightButtonTitle { + return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? UCLocalize("EXPERT") : UCLocalize("SIMPLE"); } - (UINavigationButtonStyle) rightButtonStyle { @@ -4163,7 +6240,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* }}} */ /* Home View {{{ */ -@interface HomeView : BrowserView { +@interface HomeView : CydiaBrowserView { } @end @@ -4171,44 +6248,46 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @implementation HomeView - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { - [sheet dismiss]; + NSString *context([sheet context]); + + if ([context isEqualToString:@"about"]) + [sheet dismiss]; + else + [super alertSheet:sheet buttonClicked:button]; +} + +- (void) _setMoreHeaders:(NSMutableURLRequest *)request { + [super _setMoreHeaders:request]; + if (ChipID_ != nil) + [request setValue:ChipID_ forHTTPHeaderField:@"X-Chip-ID"]; + if (UniqueID_ != nil) + [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"]; } - (void) _leftButtonClicked { - UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:@"About Cydia Installer" - buttons:[NSArray arrayWithObjects:@"Close", nil] - defaultButtonIndex:0 - delegate:self - context:@"about" - ] autorelease]; + UIAlertView *alert = [[[UIAlertView alloc] init] autorelease]; + [alert setTitle:UCLocalize("ABOUT_CYDIA")]; + [alert addButtonWithTitle:UCLocalize("CLOSE")]; + [alert setCancelButtonIndex:0]; - [sheet setBodyText: - @"Copyright (C) 2008\n" + [alert setMessage: + @"Copyright (C) 2008-2010\n" "Jay Freeman (saurik)\n" "saurik@saurik.com\n" - "http://www.saurik.com/\n" - "\n" - "The Okori Group\n" - "http://www.theokorigroup.com/\n" - "\n" - "College of Creative Studies,\n" - "University of California,\n" - "Santa Barbara\n" - "http://www.ccs.ucsb.edu/" + "http://www.saurik.com/" ]; - [sheet popupAlertAnimated:YES]; + [alert show]; } - (NSString *) leftButtonTitle { - return @"About"; + return UCLocalize("ABOUT"); } @end /* }}} */ /* Manage View {{{ */ -@interface ManageView : BrowserView { +@interface ManageView : CydiaBrowserView { } @end @@ -4216,506 +6295,434 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @implementation ManageView - (NSString *) title { - return @"Manage"; + return UCLocalize("MANAGE"); } - (void) _leftButtonClicked { [delegate_ askForSettings]; + [delegate_ updateData]; } - (NSString *) leftButtonTitle { - return @"Settings"; + return UCLocalize("SETTINGS"); } -- (NSString *) _rightButtonTitle { - return nil; +#if !AlwaysReload +- (id) _rightButtonTitle { + return Queuing_ ? UCLocalize("QUEUE") : nil; } -@end -/* }}} */ - -/* Indirect Delegate {{{ */ -@interface IndirectDelegate : NSProxy { - _transient id delegate_; -} - -- (void) setDelegate:(id)delegate; -- (id) initWithDelegate:(id)delegate; -@end - -@implementation IndirectDelegate - -- (void) setDelegate:(id)delegate { - delegate_ = delegate; -} - -- (id) initWithDelegate:(id)delegate { - delegate_ = delegate; - return self; -} - -- (void) doesNotRecognizeSelector:(SEL)sel { - fprintf(stderr, "doesNotRecognizeSelector:@selector(%s)", sel_getName(sel)); +- (UINavigationButtonStyle) rightButtonStyle { + return Queuing_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal; } -- (NSMethodSignature*) methodSignatureForSelector:(SEL)sel { - if (delegate_ != nil) - if (NSMethodSignature *sig = [delegate_ methodSignatureForSelector:sel]) - return sig; - return nil; +- (void) _rightButtonClicked { + [delegate_ queue]; } +#endif -- (void) forwardInvocation:(NSInvocation*)inv { - SEL sel = [inv selector]; - if (delegate_ != nil && [delegate_ respondsToSelector:sel]) - [inv invokeWithTarget:delegate_]; +- (bool) isLoading { + return false; } @end /* }}} */ -/* Browser Implementation {{{ */ -@implementation BrowserView -- (void) dealloc { - WebView *webview = [webview_ webView]; - [webview setFrameLoadDelegate:nil]; - [webview setResourceLoadDelegate:nil]; - [webview setUIDelegate:nil]; - - [webview_ setDelegate:nil]; - [webview_ setGestureDelegate:nil]; - - /*WebFrame *frame = [webview mainFrame]; - [frame loadHTMLString:@"" baseURL:[NSURL URLWithString:@"http://cydia.saurik.com/"]];*/ +/* Cydia Book {{{ */ +@interface CYBook : RVBook < + ProgressDelegate +> { + _transient Database *database_; + UINavigationBar *overlay_; + UINavigationBar *underlay_; + UIProgressIndicator *indicator_; + UITextLabel *prompt_; + UIProgressBar *progress_; + UINavigationButton *cancel_; + bool updating_; + bool dropped_; +} - //[webview_ removeFromSuperview]; - //[Documents_ addObject:[webview_ autorelease]]; - [webview_ release]; +- (id) initWithFrame:(CGRect)frame database:(Database *)database; +- (void) update; +- (BOOL) updating; +- (void) setUpdate:(NSDate *)date; - [indirect_ setDelegate:nil]; - [indirect_ release]; +@end - [scroller_ setDelegate:nil]; +@implementation CYBook - [scroller_ release]; - [urls_ release]; +- (void) dealloc { + [overlay_ release]; [indicator_ release]; - if (title_ != nil) - [title_ release]; + [prompt_ release]; + [progress_ release]; + [cancel_ release]; [super dealloc]; } -- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy { - [self loadRequest:[NSURLRequest - requestWithURL:url - cachePolicy:policy - timeoutInterval:30.0 - ]]; -} - -- (void) loadURL:(NSURL *)url { - [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy]; -} - -- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request { - NSMutableURLRequest *copy = [request mutableCopy]; - - [copy addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"]; - [copy addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"]; - [copy addValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"]; - - if (Role_ != nil) - [copy addValue:Role_ forHTTPHeaderField:@"X-Role"]; - - return copy; +- (NSString *) getTitleForPage:(RVPage *)page { + return [super getTitleForPage:page]; } -- (void) loadRequest:(NSURLRequest *)request { - pushed_ = true; - [webview_ loadRequest:request]; +- (BOOL) updating { + return updating_; } -- (void) reloadURL { - if ([urls_ count] == 0) +- (void) dropBar { + if (dropped_) return; - NSURL *url = [[[urls_ lastObject] retain] autorelease]; - [urls_ removeLastObject]; - [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData]; -} + dropped_ = true; -- (WebView *) webView { - return [webview_ webView]; -} + [UIView beginAnimations:nil context:NULL]; -- (void) view:(UIView *)sender didSetFrame:(CGRect)frame { - [scroller_ setContentSize:frame.size]; -} + CGRect ovrframe = [overlay_ frame]; + ovrframe.origin.y = 0; + [overlay_ setFrame:ovrframe]; -- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old { - [self view:sender didSetFrame:frame]; -} + CGRect barframe = [navbar_ frame]; + barframe.origin.y += ovrframe.size.height; + [navbar_ setFrame:barframe]; -- (void) pushPage:(RVPage *)page { - [self setBackButtonTitle:title_]; - [page setDelegate:delegate_]; - [book_ pushPage:page]; -} + CGRect trnframe = [transition_ frame]; + trnframe.origin.y += ovrframe.size.height; + trnframe.size.height -= ovrframe.size.height; + [transition_ setFrame:trnframe]; -- (RVPage *) _pageForPackage:(NSString *)name { - if (Package *package = [database_ packageWithName:name]) { - PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; - [view setPackage:package]; - return view; - } else { - UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:@"Cannot Locate Package" - buttons:[NSArray arrayWithObjects:@"Close", nil] - defaultButtonIndex:0 - delegate:self - context:@"missing" - ] autorelease]; + [UIView endAnimations]; +} - [sheet setBodyText:[NSString stringWithFormat: - @"The package %@ cannot be found in your current sources. I might recommend installing more sources." - , name]]; +- (void) raiseBar { + if (!dropped_) + return; + dropped_ = false; - [sheet popupAlertAnimated:YES]; - return nil; - } -} + [UIView beginAnimations:nil context:NULL]; -- (BOOL) getSpecial:(NSString *)href { - RVPage *page = nil; + CGRect ovrframe = [overlay_ frame]; + ovrframe.origin.y = -ovrframe.size.height; + [overlay_ setFrame:ovrframe]; - if ( - [href hasPrefix:@"http://ax.phobos.apple.com/"] || - [href hasPrefix:@"http://phobos.apple.com/"] || - [href hasPrefix:@"http://www.youtube.com/watch?"] || - [href hasPrefix:@"tel:"] - ) - [delegate_ openURL:[NSURL URLWithString:href]]; - else if ([href hasPrefix:@"mailto:"]) { - [delegate_ openURL:[NSURL URLWithString:href]]; - } else if ([href isEqualToString:@"cydia://add-source"]) - page = [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease]; - else if ([href isEqualToString:@"cydia://sources"]) - page = [[[SourceTable alloc] initWithBook:book_ database:database_] autorelease]; - else if ([href isEqualToString:@"cydia://packages"]) - page = [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease]; - else if ([href hasPrefix:@"cydia://files/"]) { - NSString *name = [href substringFromIndex:14]; + CGRect barframe = [navbar_ frame]; + barframe.origin.y -= ovrframe.size.height; + [navbar_ setFrame:barframe]; - if (Package *package = [database_ packageWithName:name]) { - FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease]; - [files setPackage:package]; - page = files; - } - } else if ([href hasPrefix:@"apptapp://package/"]) - page = [self _pageForPackage:[href substringFromIndex:18]]; - else if ([href hasPrefix:@"cydia://package/"]) - page = [self _pageForPackage:[href substringFromIndex:16]]; - else if (![href hasPrefix:@"apptapp:"] && ![href hasPrefix:@"cydia:"]) - return false; + CGRect trnframe = [transition_ frame]; + trnframe.origin.y -= ovrframe.size.height; + trnframe.size.height += ovrframe.size.height; + [transition_ setFrame:trnframe]; - if (page != nil) - [self pushPage:page]; - return true; + [UIView commitAnimations]; } -- (void) webView:(WebView *)sender willClickElement:(id)element { - if ([[element localName] isEqualToString:@"img"]) - do if ((element = [element parentNode]) == nil) - return; - while (![[element localName] isEqualToString:@"a"]); - if (![element respondsToSelector:@selector(href)]) - return; - NSString *href = [element href]; - if (href == nil) - return; - [self getSpecial:href]; +- (void) setUpdate:(NSDate *)date { + [self update]; } -- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource { - NSURL *url = [request URL]; - if ([self getSpecial:[url absoluteString]]) - return nil; +- (void) update { + [self dropBar]; - if (!pushed_) { - pushed_ = true; - [book_ pushPage:self]; - } + [indicator_ startAnimation]; + [prompt_ setText:UCLocalize("UPDATING_DATABASE")]; + [progress_ setProgress:0]; - return [self _addHeadersToRequest:request]; -} + updating_ = true; + [overlay_ addSubview:cancel_]; -- (BOOL) isSpecialScheme:(NSString *)scheme { - return - [scheme isEqualToString:@"apptapp"] || - [scheme isEqualToString:@"cydia"] || - [scheme isEqualToString:@"mailto"] || - [scheme isEqualToString:@"tel"]; + [NSThread + detachNewThreadSelector:@selector(_update) + toTarget:self + withObject:nil + ]; } -- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request { - if (request != nil) { - NSURL *url = [request URL]; - NSString *scheme = [url scheme]; - NSString *absolute = [url absoluteString]; - if ( - [self isSpecialScheme:scheme] || - [absolute hasPrefix:@"http://ax.phobos.apple.com/"] || - [absolute hasPrefix:@"http://phobos.apple.com/"] || - [absolute hasPrefix:@"http://www.yahoo.com/watch?"] - ) - return nil; - } - - [self setBackButtonTitle:title_]; +- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { + NSString *context([sheet context]); - BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease]; - [browser setDelegate:delegate_]; + if ([context isEqualToString:@"refresh"]) + [sheet dismiss]; +} - if (request != nil) { - [browser loadRequest:[self _addHeadersToRequest:request]]; - [book_ pushPage:browser]; - } +- (void) _update_ { + updating_ = false; - return [browser webView]; -} + [indicator_ stopAnimation]; -- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame { - if ([frame parentFrame] != nil) - return; + [self raiseBar]; - title_ = [title retain]; - [self setTitle:title]; + [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0]; } -- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame { - if ([frame parentFrame] != nil) - return; +- (id) initWithFrame:(CGRect)frame database:(Database *)database { + if ((self = [super initWithFrame:frame]) != nil) { + database_ = database; - reloading_ = false; - loading_ = true; - [indicator_ startAnimation]; - [self reloadButtons]; + CGRect ovrrect([navbar_ bounds]); + ovrrect.size.height = [UINavigationBar defaultSize].height; + ovrrect.origin.y = -ovrrect.size.height; - if (title_ != nil) { - [title_ release]; - title_ = nil; - } + overlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect]; + [overlay_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; + [self addSubview:overlay_]; - [self setTitle:@"Loading"]; + ovrrect.origin.y = frame.size.height; + underlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect]; + [underlay_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; + [self addSubview:underlay_]; - WebView *webview = [webview_ webView]; - NSString *href = [webview mainFrameURL]; - [urls_ addObject:[NSURL URLWithString:href]]; + [underlay_ setTintColor:[UIColor colorWithRed:0.23 green:0.23 blue:0.23 alpha:1]]; - CGRect webrect = [scroller_ bounds]; - webrect.size.height = 0; - [webview_ setFrame:webrect]; + [overlay_ setBarStyle:1]; + [underlay_ setBarStyle:1]; - [scroller_ scrollPointVisibleAtTopLeft:CGPointZero]; -} + int barstyle([overlay_ _barStyle:NO]); + bool ugly(barstyle == 0); -- (void) _finishLoading { - if (!reloading_) { - loading_ = false; - [indicator_ stopAnimation]; - [self reloadButtons]; - } -} + UIProgressIndicatorStyle style = ugly ? + UIProgressIndicatorStyleMediumBrown : + UIProgressIndicatorStyleMediumWhite; -- (BOOL) webView:(WebView *)sender shouldScrollToPoint:(struct CGPoint)point forFrame:(WebFrame *)frame { - _trace(); - return [webview_ webView:sender shouldScrollToPoint:point forFrame:frame]; -} + CGSize indsize([UIProgressIndicator defaultSizeForStyle:style]); + unsigned indoffset = (ovrrect.size.height - indsize.height) / 2; + CGRect indrect = {{indoffset, indoffset}, indsize}; -- (void) webView:(WebView *)sender didReceiveViewportArguments:(id)arguments forFrame:(WebFrame *)frame { - return [webview_ webView:sender didReceiveViewportArguments:arguments forFrame:frame]; -} + indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect]; + [indicator_ setStyle:style]; + [overlay_ addSubview:indicator_]; -- (void) webView:(WebView *)sender needsScrollNotifications:(id)notifications forFrame:(WebFrame *)frame { - return [webview_ webView:sender needsScrollNotifications:notifications forFrame:frame]; -} + CGSize prmsize = {215, indsize.height + 4}; -- (void) webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame { - return [webview_ webView:sender didCommitLoadForFrame:frame]; -} + CGRect prmrect = {{ + indoffset * 2 + indsize.width, + unsigned(ovrrect.size.height - prmsize.height) / 2 - 1 + }, prmsize}; -- (void) webView:(WebView *)sender didReceiveDocTypeForFrame:(WebFrame *)frame { - return [webview_ webView:sender didReceiveDocTypeForFrame:frame]; -} + UIFont *font([UIFont systemFontOfSize:15]); -- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame { - if ([frame parentFrame] == nil) - [self _finishLoading]; - return [webview_ webView:sender didFinishLoadForFrame:frame]; -} + prompt_ = [[UITextLabel alloc] initWithFrame:prmrect]; -- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { - if ([frame parentFrame] != nil) - return; - [self _finishLoading]; + [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]]; + [prompt_ setBackgroundColor:[UIColor clearColor]]; + [prompt_ setFont:font]; - [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@", - [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString], - [[error localizedDescription] stringByAddingPercentEscapes] - ]]]; -} + [overlay_ addSubview:prompt_]; -- (id) initWithBook:(RVBook *)book database:(Database *)database { - if ((self = [super initWithBook:book]) != nil) { - database_ = database; - loading_ = false; + CGSize prgsize = {75, 100}; - struct CGRect bounds = [self bounds]; + CGRect prgrect = {{ + ovrrect.size.width - prgsize.width - 10, + (ovrrect.size.height - prgsize.height) / 2 + } , prgsize}; - UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:bounds] autorelease]; - [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]]; - [self addSubview:pinstripe]; + progress_ = [[UIProgressBar alloc] initWithFrame:prgrect]; + [progress_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; + [overlay_ addSubview:progress_]; - scroller_ = [[UIScroller alloc] initWithFrame:bounds]; - [self addSubview:scroller_]; + [progress_ setStyle:0]; - [scroller_ setScrollingEnabled:YES]; - [scroller_ setAdjustForContentSizeChange:YES]; - [scroller_ setClipsSubviews:YES]; - [scroller_ setAllowsRubberBanding:YES]; - [scroller_ setScrollDecelerationFactor:0.99]; - [scroller_ setDelegate:self]; + cancel_ = [[UINavigationButton alloc] initWithTitle:UCLocalize("CANCEL") style:UINavigationButtonStyleHighlighted]; + [progress_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; + [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside]; - CGRect webrect = [scroller_ bounds]; - webrect.size.height = 0; + CGRect frame = [cancel_ frame]; + frame.origin.x = ovrrect.size.width - frame.size.width - 5; + frame.origin.y = (ovrrect.size.height - frame.size.height) / 2; + [cancel_ setFrame:frame]; - webview_ = [Documents_ lastObject]; - if (webview_ != nil) { - webview_ = [webview_ retain]; - [Documents_ removeLastObject]; - [webview_ setFrame:webrect]; - } else { - webview_ = [[UIWebDocumentView alloc] initWithFrame:webrect]; + [cancel_ setBarStyle:barstyle]; + } return self; +} - [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)]; +- (void) _onCancel { + updating_ = false; + [cancel_ removeFromSuperview]; +} - [webview_ setTilingEnabled:YES]; - [webview_ setTileMinificationFilter:kCAFilterNearest]; - [webview_ setAutoresizes:YES]; +- (void) _update { _pooled + Status status; + status.setDelegate(self); + [database_ updateWithStatus:status]; - [webview_ setViewportSize:CGSizeMake(980, -1) forDocumentTypes:0x10]; - [webview_ setViewportSize:CGSizeMake(320, -1) forDocumentTypes:0x2]; - [webview_ setViewportSize:CGSizeMake(320, -1) forDocumentTypes:0x8]; + [self + performSelectorOnMainThread:@selector(_update_) + withObject:nil + waitUntilDone:NO + ]; +} - [webview_ _setDocumentType:0x4]; +- (void) setProgressError:(NSString *)error withTitle:(NSString *)title { + [prompt_ setText:[NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), UCLocalize("ERROR"), error]]; +} - [webview_ setZoomsFocusedFormControl:YES]; - [webview_ setContentsPosition:7]; - [webview_ setEnabledGestures:0xa]; - [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:0x4]; - [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:0x7]; - [webview_ setSmoothsFonts:YES]; - } +/* + 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]; - [webview_ setDelegate:self]; - [webview_ setGestureDelegate:self]; - [scroller_ addSubview:webview_]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite]; - indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 12, indsize.width, indsize.height)]; - [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite]; + [sheet setBodyText:error]; + [sheet popupAlertAnimated:YES]; - Package *package([database_ packageWithName:@"cydia"]); - NSString *application = package == nil ? @"Cydia" : [NSString - stringWithFormat:@"Cydia/%@", - [package installed] - ]; + [self reloadButtons]; +*/ - indirect_ = [[IndirectDelegate alloc] initWithDelegate:self]; +- (void) setProgressTitle:(NSString *)title { + [self + performSelectorOnMainThread:@selector(_setProgressTitle:) + withObject:title + waitUntilDone:YES + ]; +} - WebView *webview = [webview_ webView]; - [webview setApplicationNameForUserAgent:application]; - [webview setFrameLoadDelegate:self]; - [webview setResourceLoadDelegate:indirect_]; - [webview setUIDelegate:self]; +- (void) setProgressPercent:(float)percent { + [self + performSelectorOnMainThread:@selector(_setProgressPercent:) + withObject:[NSNumber numberWithFloat:percent] + waitUntilDone:YES + ]; +} - //[webview _setLayoutInterval:0.5]; +- (void) startProgress { +} - urls_ = [[NSMutableArray alloc] initWithCapacity:16]; +- (void) addProgressOutput:(NSString *)output { + [self + performSelectorOnMainThread:@selector(_addProgressOutput:) + withObject:output + waitUntilDone:YES + ]; +} - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [scroller_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [pinstripe setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - } return self; +- (bool) isCancelling:(size_t)received { + return !updating_; } -- (void) didFinishGesturesInView:(UIView *)view forEvent:(id)event { - [webview_ redrawScaledDocument]; +- (void) _setProgressTitle:(NSString *)title { + [prompt_ setText:title]; } -- (void) _rightButtonClicked { - reloading_ = true; - [self reloadURL]; +- (void) _setProgressPercent:(NSNumber *)percent { + [progress_ setProgress:[percent floatValue]]; } -- (NSString *) _rightButtonTitle { - return @"Reload"; +- (void) _addProgressOutput:(NSString *)output { } -- (NSString *) rightButtonTitle { - return loading_ ? @"" : [self _rightButtonTitle]; +@end +/* }}} */ +/* Cydia:// Protocol {{{ */ +@interface CydiaURLProtocol : NSURLProtocol { } -- (NSString *) title { - return nil; +@end + +@implementation CydiaURLProtocol + ++ (BOOL) canInitWithRequest:(NSURLRequest *)request { + NSURL *url([request URL]); + if (url == nil) + return NO; + NSString *scheme([[url scheme] lowercaseString]); + if (scheme == nil || ![scheme isEqualToString:@"cydia"]) + return NO; + return YES; } -- (NSString *) backButtonTitle { - return @"Browser"; ++ (NSURLRequest *) canonicalRequestForRequest:(NSURLRequest *)request { + return request; } -- (void) setPageActive:(BOOL)active { - if (!active) - [indicator_ removeFromSuperview]; - else - [[book_ navigationBar] addSubview:indicator_]; -} +- (void) _returnPNGWithImage:(UIImage *)icon forRequest:(NSURLRequest *)request { + id client([self client]); + if (icon == nil) + [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist userInfo:nil]]; + else { + NSData *data(UIImagePNGRepresentation(icon)); -- (void) resetViewAnimated:(BOOL)animated { + NSURLResponse *response([[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:@"image/png" expectedContentLength:-1 textEncodingName:nil] autorelease]); + [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed]; + [client URLProtocol:self didLoadData:data]; + [client URLProtocolDidFinishLoading:self]; + } } -- (void) setPushed:(bool)pushed { - pushed_ = pushed; -} +- (void) startLoading { + id client([self client]); + NSURLRequest *request([self request]); -@end -/* }}} */ + NSURL *url([request URL]); + NSString *href([url absoluteString]); -@interface CYBook : RVBook < - ProgressDelegate -> { - _transient Database *database_; - UINavigationBar *overlay_; - UIProgressIndicator *indicator_; - UITextLabel *prompt_; - UIProgressBar *progress_; - UINavigationButton *cancel_; - bool updating_; - size_t received_; - NSTimeInterval last_; -} + NSString *path([href substringFromIndex:8]); + NSRange slash([path rangeOfString:@"/"]); -- (id) initWithFrame:(CGRect)frame database:(Database *)database; -- (void) update; -- (BOOL) updating; + NSString *command; + if (slash.location == NSNotFound) { + command = path; + path = nil; + } else { + command = [path substringToIndex:slash.location]; + path = [path substringFromIndex:(slash.location + 1)]; + } + + Database *database([Database sharedInstance]); + + if ([command isEqualToString:@"package-icon"]) { + if (path == nil) + goto fail; + path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + Package *package([database packageWithName:path]); + if (package == nil) + goto fail; + UIImage *icon([package icon]); + [self _returnPNGWithImage:icon forRequest:request]; + } else if ([command isEqualToString:@"source-icon"]) { + if (path == nil) + goto fail; + path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + NSString *source(Simplify(path)); + UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sources/%@.png", App_, source]]); + if (icon == nil) + icon = [UIImage applicationImageNamed:@"unknown.png"]; + [self _returnPNGWithImage:icon forRequest:request]; + } else if ([command isEqualToString:@"uikit-image"]) { + if (path == nil) + goto fail; + path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + UIImage *icon(_UIImageWithName(path)); + [self _returnPNGWithImage:icon forRequest:request]; + } else if ([command isEqualToString:@"section-icon"]) { + if (path == nil) + goto fail; + path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + NSString *section(Simplify(path)); + UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]]); + if (icon == nil) + icon = [UIImage applicationImageNamed:@"unknown.png"]; + [self _returnPNGWithImage:icon forRequest:request]; + } else fail: { + [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorResourceUnavailable userInfo:nil]]; + } +} + +- (void) stopLoading { +} @end +/* }}} */ -/* Install View {{{ */ -@interface InstallView : RVPage { +/* Sections View {{{ */ +@interface SectionsView : RVPage { _transient Database *database_; NSMutableArray *sections_; NSMutableArray *filtered_; - UITransitionView *transition_; UITable *list_; UIView *accessory_; BOOL editing_; @@ -4727,7 +6734,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @end -@implementation InstallView +@implementation SectionsView - (void) dealloc { [list_ setDataSource:nil]; @@ -4735,7 +6742,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [sections_ release]; [filtered_ release]; - [transition_ release]; [list_ release]; [accessory_ release]; [super dealloc]; @@ -4779,24 +6785,25 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (row == 0) { section = nil; name = nil; - title = @"All Packages"; + title = UCLocalize("ALL_PACKAGES"); } else { section = [filtered_ objectAtIndex:(row - 1)]; name = [section name]; - if (name != nil) - title = name; - else { + if (name != nil) { + name = [NSString stringWithString:name]; + title = [[NSBundle mainBundle] localizedStringForKey:Simplify(name) value:nil table:@"Sections"]; + } else { name = @""; - title = @"(No Section)"; + title = UCLocalize("NO_SECTION"); } } - PackageTable *table = [[[PackageTable alloc] + PackageTable *table = [[[FilteredPackageTable alloc] initWithBook:book_ database:database_ title:title - filter:@selector(isVisiblyUninstalledInSection:) + filter:@selector(isVisibleInSection:) with:name ] autorelease]; @@ -4812,14 +6819,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { sections_ = [[NSMutableArray arrayWithCapacity:16] retain]; filtered_ = [[NSMutableArray arrayWithCapacity:16] retain]; - transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]]; - [self addSubview:transition_]; - - list_ = [[UITable alloc] initWithFrame:[transition_ bounds]]; - [transition_ transition:0 toView:list_]; + list_ = [[UITable alloc] initWithFrame:[self bounds]]; + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [self addSubview:list_]; UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:@"Name" + initWithTitle:UCLocalize("NAME") identifier:@"name" width:[self frame].size.width ] autorelease]; @@ -4832,8 +6837,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self reloadData]; - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -4843,46 +6847,85 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [sections_ removeAllObjects]; [filtered_ removeAllObjects]; - NSMutableArray *filtered = [NSMutableArray arrayWithCapacity:[packages count]]; - NSMutableDictionary *sections = [NSMutableDictionary dictionaryWithCapacity:32]; +#if 0 + typedef __gnu_cxx::hash_map SectionMap; + SectionMap sections; + sections.resize(64); +#else + NSMutableDictionary *sections([NSMutableDictionary dictionaryWithCapacity:32]); +#endif - for (size_t i(0); i != [packages count]; ++i) { - Package *package([packages objectAtIndex:i]); + _trace(); + for (Package *package in packages) { NSString *name([package section]); + NSString *key(name == nil ? @"" : name); - if (name != nil) { - Section *section([sections objectForKey:name]); +#if 0 + Section **section; + + _profile(SectionsView$reloadData$Section) + section = §ions[key]; + if (*section == nil) { + _profile(SectionsView$reloadData$Section$Allocate) + *section = [[[Section alloc] initWithName:name localize:YES] autorelease]; + _end + } + _end + + [*section addToCount]; + + _profile(SectionsView$reloadData$Filter) + if (![package valid] || ![package visible]) + continue; + _end + + [*section addToRow]; +#else + Section *section; + + _profile(SectionsView$reloadData$Section) + section = [sections objectForKey:key]; if (section == nil) { - section = [[[Section alloc] initWithName:name] autorelease]; - [sections setObject:section forKey:name]; + _profile(SectionsView$reloadData$Section$Allocate) + section = [[[Section alloc] initWithName:name localize:YES] autorelease]; + [sections setObject:section forKey:key]; + _end } - } + _end - if ([package valid] && [package installed] == nil && [package visible]) - [filtered addObject:package]; + [section addToCount]; + + _profile(SectionsView$reloadData$Filter) + if (![package valid] || ![package visible]) + continue; + _end + + [section addToRow]; +#endif } + _trace(); +#if 0 + for (SectionMap::const_iterator i(sections.begin()), e(sections.end()); i != e; ++i) + [sections_ addObject:i->second]; +#else [sections_ addObjectsFromArray:[sections allValues]]; - [sections_ sortUsingSelector:@selector(compareByName:)]; +#endif - [filtered sortUsingSelector:@selector(compareBySection:)]; + [sections_ sortUsingSelector:@selector(compareByLocalized:)]; - Section *section = nil; - for (size_t offset = 0, count = [filtered count]; offset != count; ++offset) { - Package *package = [filtered objectAtIndex:offset]; - NSString *name = [package section]; - - if (section == nil || name != nil && ![[section name] isEqualToString:name]) { - section = name == nil ? - [[[Section alloc] initWithName:nil] autorelease] : - [sections objectForKey:name]; - [filtered_ addObject:section]; - } + for (Section *section in sections_) { + size_t count([section row]); + if (count == 0) + continue; - [section addToCount]; + section = [[[Section alloc] initWithName:[section name] localized:[section localized]] autorelease]; + [section setCount:count]; + [filtered_ addObject:section]; } [list_ reloadData]; + _trace(); } - (void) resetView { @@ -4897,24 +6940,22 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) _rightButtonClicked { if ((editing_ = !editing_)) [list_ reloadData]; - else { + else [delegate_ updateData]; - } - - [book_ setTitle:[self title] forPage:self]; + [book_ reloadTitleForPage:self]; [book_ reloadButtonsForPage:self]; } - (NSString *) title { - return editing_ ? @"Section Visibility" : @"Install by Section"; + return editing_ ? UCLocalize("SECTION_VISIBILITY") : UCLocalize("SECTIONS"); } - (NSString *) backButtonTitle { - return @"Sections"; + return UCLocalize("SECTIONS"); } -- (NSString *) rightButtonTitle { - return [sections_ count] == 0 ? nil : editing_ ? @"Done" : @"Edit"; +- (id) rightButtonTitle { + return [sections_ count] == 0 ? nil : editing_ ? UCLocalize("DONE") : UCLocalize("EDIT"); } - (UINavigationButtonStyle) rightButtonStyle { @@ -4932,11 +6973,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { _transient Database *database_; NSMutableArray *packages_; NSMutableArray *sections_; - UISectionList *list_; + UITableView *list_; unsigned upgrades_; } -- (id) initWithBook:(RVBook *)book database:(Database *)database; +- (id) initWithBook:(RVBook *)book database:(Database *)database delegate:(id)delegate; - (void) reloadData; @end @@ -4944,7 +6985,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @implementation ChangesView - (void) dealloc { - [[list_ table] setDelegate:nil]; + [list_ setDelegate:nil]; [list_ setDataSource:nil]; [packages_ release]; @@ -4953,46 +6994,49 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [super dealloc]; } -- (int) numberOfSectionsInSectionList:(UISectionList *)list { - return [sections_ count]; +- (NSInteger) numberOfSectionsInTableView:(UITableView *)list { + NSInteger count([sections_ count]); + return count == 0 ? 1 : count; } -- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section { +- (NSString *) tableView:(UITableView *)list titleForHeaderInSection:(NSInteger)section { + if ([sections_ count] == 0) + return nil; return [[sections_ objectAtIndex:section] name]; } -- (int) sectionList:(UISectionList *)list rowForSection:(int)section { - return [[sections_ objectAtIndex:section] row]; -} - -- (int) numberOfRowsInTable:(UITable *)table { - return [packages_ count]; +- (NSInteger) tableView:(UITableView *)list numberOfRowsInSection:(NSInteger)section { + if ([sections_ count] == 0) + return 0; + return [[sections_ objectAtIndex:section] count]; } -- (float) table:(UITable *)table heightForRow:(int)row { - return [PackageCell heightForPackage:[packages_ objectAtIndex:row]]; +- (Package *) packageAtIndexPath:(NSIndexPath *)path { + Section *section([sections_ objectAtIndex:[path section]]); + NSInteger row([path row]); + return [packages_ objectAtIndex:([section row] + row)]; } -- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing { - if (reusing == nil) - reusing = [[[PackageCell alloc] init] autorelease]; - [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]]; - return reusing; +- (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path { + PackageCell *cell([table dequeueReusableCellWithIdentifier:@"Package"]); + if (cell == nil) + cell = [[[PackageCell alloc] init] autorelease]; + [cell setPackage:[self packageAtIndexPath:path]]; + return cell; } -- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row { - return NO; +- (CGFloat) tableView:(UITableView *)table heightForRowAtIndexPath:(NSIndexPath *)path { + return 73; + return [PackageCell heightForPackage:[self packageAtIndexPath:path]]; } -- (void) tableRowSelected:(NSNotification *)notification { - int row = [[notification object] selectedRow]; - if (row == INT_MAX) - return; - Package *package = [packages_ objectAtIndex:row]; - PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; +- (NSIndexPath *) tableView:(UITableView *)table willSelectRowAtIndexPath:(NSIndexPath *)path { + Package *package([self packageAtIndexPath:path]); + PackageView *view([delegate_ packageView]); [view setDelegate:delegate_]; [view setPackage:package]; [book_ pushPage:view]; + return path; } - (void) _leftButtonClicked { @@ -5004,92 +7048,106 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [delegate_ distUpgrade]; } -- (id) initWithBook:(RVBook *)book database:(Database *)database { +- (id) initWithBook:(RVBook *)book database:(Database *)database delegate:(id)delegate { if ((self = [super initWithBook:book]) != nil) { database_ = database; packages_ = [[NSMutableArray arrayWithCapacity:16] retain]; sections_ = [[NSMutableArray arrayWithCapacity:16] retain]; - list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:NO]; + list_ = [[UITableView alloc] initWithFrame:[self bounds] style:UITableViewStylePlain]; + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [self addSubview:list_]; - [list_ setShouldHideHeaderInShortLists:NO]; + //XXX:[list_ setShouldHideHeaderInShortLists:NO]; [list_ setDataSource:self]; + [list_ setDelegate:self]; //[list_ setSectionListStyle:1]; - UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:@"Name" - identifier:@"name" - width:[self frame].size.width - ] autorelease]; - - UITable *table = [list_ table]; - [table setSeparatorStyle:1]; - [table addTableColumn:column]; - [table setDelegate:self]; - [table setReusesTableCells:YES]; - + delegate_ = delegate; [self reloadData]; - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } +- (void) _reloadPackages:(NSArray *)packages { + _trace(); + for (Package *package in packages) + if ( + [package uninstalled] && [package valid] && [package visible] || + [package upgradableAndEssential:YES] + ) + [packages_ addObject:package]; + + _trace(); + [packages_ radixSortUsingFunction:reinterpret_cast(&PackageChangesRadix) withContext:NULL]; + _trace(); +} + - (void) reloadData { NSArray *packages = [database_ packages]; [packages_ removeAllObjects]; [sections_ removeAllObjects]; - for (size_t i(0); i != [packages count]; ++i) { - Package *package([packages objectAtIndex:i]); - - if ( - [package installed] == nil && [package valid] && [package visible] || - [package upgradableAndEssential:NO] - ) - [packages_ addObject:package]; - } - - [packages_ sortUsingSelector:@selector(compareForChanges:)]; + UIProgressHUD *hud([delegate_ addProgressHUD]); + // XXX: localize + [hud setText:@"Loading Changes"]; + NSLog(@"HUD:%@::%@", delegate_, hud); + [self yieldToSelector:@selector(_reloadPackages:) withObject:packages]; + [delegate_ removeProgressHUD:hud]; - Section *upgradable = [[[Section alloc] initWithName:@"Available 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; upgrades_ = 0; bool unseens = false; - CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle); + CFDateFormatterRef formatter(CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle)); for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) { Package *package = [packages_ objectAtIndex:offset]; - if ([package upgradableAndEssential:YES]) { - ++upgrades_; - [upgradable addToCount]; - } else { + BOOL uae = [package upgradableAndEssential:YES]; + + if (!uae) { unseens = true; - NSDate *seen = [package seen]; + NSDate *seen; - NSString *name; + _profile(ChangesView$reloadData$Remember) + seen = [package seen]; + _end - if (seen == nil) - name = [@"n/a ?" retain]; - else { - name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen); - } + if (section == nil || last != seen && (seen == nil || [seen compare:last] != NSOrderedSame)) { + last = seen; + + NSString *name; + if (seen == nil) + name = UCLocalize("UNKNOWN"); + else { + name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen); + [name autorelease]; + } - if (section == nil || ![[section name] isEqualToString:name]) { - section = [[[Section alloc] initWithName:name row:offset] autorelease]; - [sections_ addObject:section]; + _profile(ChangesView$reloadData$Allocate) + name = [NSString stringWithFormat:UCLocalize("NEW_AT"), name]; + section = [[[Section alloc] initWithName:name row:offset localize:NO] autorelease]; + [sections_ addObject:section]; + _end } - [name release]; [section addToCount]; + } else if ([package ignored]) + [ignored addToCount]; + else { + ++upgrades_; + [upgradable addToCount]; } } + _trace(); CFRelease(formatter); @@ -5100,6 +7158,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [sections_ removeLastObject]; } + if ([ignored count] != 0) + [sections_ insertObject:ignored atIndex:0]; if (upgrades_ != 0) [sections_ insertObject:upgradable atIndex:0]; @@ -5112,15 +7172,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) leftButtonTitle { - return [(CYBook *)book_ updating] ? nil : @"Refresh"; + return [(CYBook *)book_ updating] ? nil : UCLocalize("REFRESH"); } -- (NSString *) rightButtonTitle { - return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade (%u)", upgrades_]; +- (id) rightButtonTitle { + return upgrades_ == 0 ? nil : [NSString stringWithFormat:UCLocalize("PARENTHETICAL"), UCLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]]; } - (NSString *) title { - return @"Changes"; + return UCLocalize("CHANGES"); } @end @@ -5133,11 +7193,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @interface SearchView : RVPage { UIView *accessory_; UISearchField *field_; - UITransitionView *transition_; - PackageTable *table_; - UIPreferencesTable *advanced_; - UIView *dimmed_; - bool flipped_; + FilteredPackageTable *table_; bool reload_; } @@ -5153,33 +7209,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [accessory_ release]; [field_ release]; - [transition_ release]; [table_ release]; - [advanced_ release]; - [dimmed_ release]; [super dealloc]; } -- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table { - return 1; -} - -- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group { - switch (group) { - case 0: return @"Advanced Search (Coming Soon!)"; - - default: _assert(false); - } -} - -- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group { - switch (group) { - case 0: return 0; - - default: _assert(false); - } -} - - (void) _showKeyboard:(BOOL)show { CGSize keysize = [UIKeyboard defaultSize]; CGRect keydown = [book_ pageBounds]; @@ -5210,21 +7243,26 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (show) [animator performSelector:@selector(startAnimation:) withObject:animation afterDelay:delay]; - [delegate_ showKeyboard:show]; + //[delegate_ showKeyboard:show]; } - (void) textFieldDidBecomeFirstResponder:(UITextField *)field { [self _showKeyboard:YES]; + [table_ setObject:[field_ text] forFilter:@selector(isUnfilteredAndSelectedForBy:)]; + [self reloadData]; } - (void) textFieldDidResignFirstResponder:(UITextField *)field { [self _showKeyboard:NO]; + [table_ setObject:[field_ text] forFilter:@selector(isUnfilteredAndSearchedForBy:)]; + [self reloadData]; } - (void) keyboardInputChanged:(UIFieldEditor *)editor { if (reload_) { NSString *text([field_ text]); [field_ setClearButtonStyle:(text == nil || [text length] == 0 ? 0 : 2)]; + [table_ setObject:text forFilter:@selector(isUnfilteredAndSelectedForBy:)]; [self reloadData]; reload_ = false; } @@ -5252,24 +7290,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if ((self = [super initWithBook:book]) != nil) { CGRect pageBounds = [book_ pageBounds]; - /*UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:pageBounds] autorelease]; - [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]]; - [self addSubview:pinstripe];*/ - - transition_ = [[UITransitionView alloc] initWithFrame:pageBounds]; - [self addSubview:transition_]; - - advanced_ = [[UIPreferencesTable alloc] initWithFrame:pageBounds]; - - [advanced_ setReusesTableCells:YES]; - [advanced_ setDataSource:self]; - [advanced_ reloadData]; - - dimmed_ = [[UIView alloc] initWithFrame:pageBounds]; - CGColor dimmed(space_, 0, 0, 0, 0.5); - [dimmed_ setBackgroundColor:[UIColor colorWithCGColor:dimmed]]; - - table_ = [[PackageTable alloc] + table_ = [[FilteredPackageTable alloc] initWithBook:book database:database title:nil @@ -5277,90 +7298,59 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { with:nil ]; + [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [self addSubview:table_]; + [table_ setShouldHideHeaderInShortLists:NO]; - [transition_ transition:0 toView:table_]; - CGRect cnfrect = {{ -#ifdef __OBJC2__ - 6 + -#endif - 1, 38}, {17, 18}}; + CGRect cnfrect = {{7, 38}, {17, 18}}; CGRect area; - area.origin.x = /*cnfrect.origin.x + cnfrect.size.width + 4 +*/ 10; - area.origin.y = 1; - area.size.width = -#ifdef __OBJC2__ - 8 + -#endif - [self bounds].size.width - area.origin.x - 18; + area.origin.x = 10; + area.origin.y = 1; + area.size.width = [self bounds].size.width - area.origin.x * 2; area.size.height = [UISearchField defaultHeight]; field_ = [[UISearchField alloc] initWithFrame:area]; + [field_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; UIFont *font = [UIFont systemFontOfSize:16]; [field_ setFont:font]; - [field_ setPlaceholder:@"Package Names & Descriptions"]; + [field_ setPlaceholder:UCLocalize("SEARCH_EX")]; [field_ setDelegate:self]; [field_ setPaddingTop:5]; - UITextInputTraits *traits = [field_ textInputTraits]; - [traits setAutocapitalizationType:0]; - [traits setAutocorrectionType:1]; - [traits setReturnKeyType:6]; + UITextInputTraits *traits([field_ textInputTraits]); + [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone]; + [traits setAutocorrectionType:UITextAutocorrectionTypeNo]; + [traits setReturnKeyType:UIReturnKeySearch]; CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height}}; accessory_ = [[UIView alloc] initWithFrame:accrect]; + [accessory_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; [accessory_ addSubview:field_]; - /*UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease]; - [configure setShowPressFeedback:YES]; - [configure setImage:[UIImage applicationImageNamed:@"advanced.png"]]; - [configure addTarget:self action:@selector(configurePushed) forEvents:1]; - [accessory_ addSubview:configure];*/ - - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [table_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } -- (void) flipPage { -#ifndef __OBJC2__ - LKAnimation *animation = [LKTransition animation]; - [animation setType:@"oglFlip"]; - [animation setTimingFunction:[LKTimingFunction functionWithName:@"easeInEaseOut"]]; - [animation setFillMode:@"extended"]; - [animation setTransitionFlags:3]; - [animation setDuration:10]; - [animation setSpeed:0.35]; - [animation setSubtype:(flipped_ ? @"fromLeft" : @"fromRight")]; - [[transition_ _layer] addAnimation:animation forKey:0]; - [transition_ transition:0 toView:(flipped_ ? (UIView *) table_ : (UIView *) advanced_)]; - flipped_ = !flipped_; -#endif -} - -- (void) configurePushed { - [field_ resignFirstResponder]; - [self flipPage]; -} - - (void) resetViewAnimated:(BOOL)animated { - if (flipped_) - [self flipPage]; [table_ resetViewAnimated:animated]; } +- (void) _reloadData { +} + - (void) reloadData { - if (flipped_) - [self flipPage]; - [table_ setObject:[field_ text]]; - [table_ reloadData]; + _profile(SearchView$reloadData) + [table_ reloadData]; + _end + PrintTimes(); [table_ resetCursor]; } @@ -5373,7 +7363,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) backButtonTitle { - return @"Search"; + return UCLocalize("SEARCH"); } - (void) setDelegate:(id)delegate { @@ -5383,232 +7373,248 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @end /* }}} */ +/* Settings View {{{ */ +@interface SettingsView : RVPage { + _transient Database *database_; + NSString *name_; + Package *package_; + UIPreferencesTable *table_; + _UISwitchSlider *subscribedSwitch_; + _UISwitchSlider *ignoredSwitch_; + UIPreferencesControlTableCell *subscribedCell_; + UIPreferencesControlTableCell *ignoredCell_; +} -@implementation CYBook +- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package; + +@end + +@implementation SettingsView - (void) dealloc { - [overlay_ release]; - [indicator_ release]; - [prompt_ release]; - [progress_ release]; - [cancel_ release]; + [table_ setDataSource:nil]; + + [name_ release]; + if (package_ != nil) + [package_ release]; + [table_ release]; + [subscribedSwitch_ release]; + [ignoredSwitch_ release]; + [subscribedCell_ release]; + [ignoredCell_ release]; [super dealloc]; } -- (NSString *) getTitleForPage:(RVPage *)page { - return Simplify([super getTitleForPage:page]); -} +- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table { + if (package_ == nil) + return 0; -- (BOOL) updating { - return updating_; + return 2; } -- (void) update { - [UIView beginAnimations:nil context:NULL]; - - CGRect ovrframe = [overlay_ frame]; - ovrframe.origin.y = 0; - [overlay_ setFrame:ovrframe]; - - CGRect barframe = [navbar_ frame]; - barframe.origin.y += ovrframe.size.height; - [navbar_ setFrame:barframe]; - - CGRect trnframe = [transition_ frame]; - trnframe.origin.y += ovrframe.size.height; - trnframe.size.height -= ovrframe.size.height; - [transition_ setFrame:trnframe]; - - [UIView endAnimations]; +- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group { + if (package_ == nil) + return nil; - [indicator_ startAnimation]; - [prompt_ setText:@"Updating Database"]; - [progress_ setProgress:0]; + switch (group) { + case 0: return nil; + case 1: return nil; - received_ = 0; - last_ = [NSDate timeIntervalSinceReferenceDate]; - updating_ = true; - [overlay_ addSubview:cancel_]; + _nodefault + } - [NSThread - detachNewThreadSelector:@selector(_update) - toTarget:self - withObject:nil - ]; + return nil; } -- (void) _update_ { - updating_ = false; +- (BOOL) preferencesTable:(UIPreferencesTable *)table isLabelGroup:(int)group { + if (package_ == nil) + return NO; - [indicator_ stopAnimation]; + switch (group) { + case 0: return NO; + case 1: return YES; - [UIView beginAnimations:nil context:NULL]; + _nodefault + } - CGRect ovrframe = [overlay_ frame]; - ovrframe.origin.y = -ovrframe.size.height; - [overlay_ setFrame:ovrframe]; + return NO; +} - CGRect barframe = [navbar_ frame]; - barframe.origin.y -= ovrframe.size.height; - [navbar_ setFrame:barframe]; +- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group { + if (package_ == nil) + return 0; - CGRect trnframe = [transition_ frame]; - trnframe.origin.y -= ovrframe.size.height; - trnframe.size.height += ovrframe.size.height; - [transition_ setFrame:trnframe]; + switch (group) { + case 0: return 1; + case 1: return 1; - [UIView commitAnimations]; + _nodefault + } - [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0]; + return 0; } -- (id) initWithFrame:(CGRect)frame database:(Database *)database { - if ((self = [super initWithFrame:frame]) != nil) { - database_ = database; +- (void) onSomething:(UIPreferencesControlTableCell *)cell withKey:(NSString *)key { + if (package_ == nil) + return; - CGRect ovrrect = [navbar_ bounds]; - ovrrect.size.height = [UINavigationBar defaultSize].height; - ovrrect.origin.y = -ovrrect.size.height; + _UISwitchSlider *slider([cell control]); + BOOL value([slider value] != 0); + NSMutableDictionary *metadata([package_ metadata]); - overlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect]; - [self addSubview:overlay_]; + BOOL before; + if (NSNumber *number = [metadata objectForKey:key]) + before = [number boolValue]; + else + before = NO; - [overlay_ setBarStyle:1]; - int barstyle = [overlay_ _barStyle:NO]; - bool ugly = barstyle == 0; + if (value != before) { + [metadata setObject:[NSNumber numberWithBool:value] forKey:key]; + Changed_ = true; + [delegate_ updateData]; + } +} - UIProgressIndicatorStyle style = ugly ? - kUIProgressIndicatorStyleMediumBrown : - kUIProgressIndicatorStyleMediumWhite; +- (void) onSubscribed:(UIPreferencesControlTableCell *)cell { + [self onSomething:cell withKey:@"IsSubscribed"]; +} - CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style]; - unsigned indoffset = (ovrrect.size.height - indsize.height) / 2; - CGRect indrect = {{indoffset, indoffset}, indsize}; +- (void) onIgnored:(UIPreferencesControlTableCell *)cell { + [self onSomething:cell withKey:@"IsIgnored"]; +} - indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect]; - [indicator_ setStyle:style]; - [overlay_ addSubview:indicator_]; +- (id) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group { + if (package_ == nil) + return nil; - CGSize prmsize = {215, indsize.height + 4}; + switch (group) { + case 0: switch (row) { + case 0: + return subscribedCell_; + case 1: + return ignoredCell_; + _nodefault + } break; - CGRect prmrect = {{ - indoffset * 2 + indsize.width, -#ifdef __OBJC2__ - -1 + -#endif - unsigned(ovrrect.size.height - prmsize.height) / 2 - }, prmsize}; + case 1: switch (row) { + case 0: { + UIPreferencesControlTableCell *cell([[[UIPreferencesControlTableCell alloc] init] autorelease]); + [cell setShowSelection:NO]; + [cell setTitle:UCLocalize("SHOW_ALL_CHANGES_EX")]; + return cell; + } - UIFont *font = [UIFont systemFontOfSize:15]; + _nodefault + } break; - prompt_ = [[UITextLabel alloc] initWithFrame:prmrect]; + _nodefault + } - [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]]; - [prompt_ setBackgroundColor:[UIColor clearColor]]; - [prompt_ setFont:font]; + return nil; +} - [overlay_ addSubview:prompt_]; +- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package { + if ((self = [super initWithBook:book])) { + database_ = database; + name_ = [package retain]; - CGSize prgsize = {75, 100}; + table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]]; + [self addSubview:table_]; - CGRect prgrect = {{ - ovrrect.size.width - prgsize.width - 10, - (ovrrect.size.height - prgsize.height) / 2 - } , prgsize}; + subscribedSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)]; + [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:UIControlEventTouchUpInside]; - progress_ = [[UIProgressBar alloc] initWithFrame:prgrect]; - [progress_ setStyle:0]; - [overlay_ addSubview:progress_]; + ignoredSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)]; + [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:UIControlEventTouchUpInside]; - cancel_ = [[UINavigationButton alloc] initWithTitle:@"Cancel" style:UINavigationButtonStyleHighlighted]; - [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside]; + subscribedCell_ = [[UIPreferencesControlTableCell alloc] init]; + [subscribedCell_ setShowSelection:NO]; + [subscribedCell_ setTitle:UCLocalize("SHOW_ALL_CHANGES")]; + [subscribedCell_ setControl:subscribedSwitch_]; - CGRect frame = [cancel_ frame]; - frame.size.width = 65; - frame.origin.x = ovrrect.size.width - frame.size.width - 5; - frame.origin.y = (ovrrect.size.height - frame.size.height) / 2; - [cancel_ setFrame:frame]; + ignoredCell_ = [[UIPreferencesControlTableCell alloc] init]; + [ignoredCell_ setShowSelection:NO]; + [ignoredCell_ setTitle:UCLocalize("IGNORE_UPGRADES")]; + [ignoredCell_ setControl:ignoredSwitch_]; - [cancel_ setBarStyle:barstyle]; + [table_ setDataSource:self]; + [self reloadData]; } return self; } -- (void) _onCancel { - updating_ = false; - [cancel_ removeFromSuperview]; +- (void) resetViewAnimated:(BOOL)animated { + [table_ resetViewAnimated:animated]; } -- (void) _update { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +- (void) reloadData { + if (package_ != nil) + [package_ autorelease]; + package_ = [database_ packageWithName:name_]; + if (package_ != nil) { + [package_ retain]; + [subscribedSwitch_ setValue:([package_ subscribed] ? 1 : 0) animated:NO]; + [ignoredSwitch_ setValue:([package_ ignored] ? 1 : 0) animated:NO]; + } - Status status; - status.setDelegate(self); + [table_ reloadData]; +} - [database_ updateWithStatus:status]; +- (NSString *) title { + return UCLocalize("SETTINGS"); +} - [self - performSelectorOnMainThread:@selector(_update_) - withObject:nil - waitUntilDone:NO - ]; +@end +/* }}} */ - [pool release]; +/* Signature View {{{ */ +@interface SignatureView : CydiaBrowserView { + _transient Database *database_; + NSString *package_; } -- (void) setProgressError:(NSString *)error forPackage:(NSString *)id { - [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]]; -} +- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package; -- (void) setProgressTitle:(NSString *)title { - [self - performSelectorOnMainThread:@selector(_setProgressTitle:) - withObject:title - waitUntilDone:YES - ]; -} +@end -- (void) setProgressPercent:(float)percent { - [self - performSelectorOnMainThread:@selector(_setProgressPercent:) - withObject:[NSNumber numberWithFloat:percent] - waitUntilDone:YES - ]; -} +@implementation SignatureView -- (void) startProgress { +- (void) dealloc { + [package_ release]; + [super dealloc]; } -- (void) addProgressOutput:(NSString *)output { - [self - performSelectorOnMainThread:@selector(_addProgressOutput:) - withObject:output - waitUntilDone:YES - ]; +- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { + // XXX: dude! + [super webView:sender didClearWindowObject:window forFrame:frame]; } -- (bool) isCancelling:(size_t)received { - NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate]; - if (received_ != received) { - received_ = received; - last_ = now; - } else if (now - last_ > 15) - return true; - return !updating_; +- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package { + if ((self = [super initWithBook:book]) != nil) { + database_ = database; + package_ = [package retain]; + [self reloadData]; + } return self; } -- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { - [sheet dismiss]; +- (void) resetViewAnimated:(BOOL)animated { } -- (void) _setProgressTitle:(NSString *)title { - [prompt_ setText:title]; +- (void) reloadData { + [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"signature" ofType:@"html"]]]; } -- (void) _setProgressPercent:(NSNumber *)percent { - [progress_ setProgress:[percent floatValue]]; +@end +/* }}} */ + +@interface CydiaViewController : UIViewController { } -- (void) _addProgressOutput:(NSString *)output { +@end + +@implementation CydiaViewController + +- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orientation { + return NO; // XXX: return YES; } @end @@ -5620,13 +7626,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { CydiaDelegate > { UIWindow *window_; + CydiaViewController *root_; UIView *underlay_; UIView *overlay_; CYBook *book_; - UIToolbar *buttonbar_; - ConfirmationView *confirm_; + NSArray *items_; + UITabBar *toolbar_; + + RVBook *confirm_; NSMutableArray *essential_; NSMutableArray *broken_; @@ -5634,70 +7643,129 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { Database *database_; ProgressView *progress_; - unsigned tag_; + int tag_; UIKeyboard *keyboard_; UIProgressHUD *hud_; - InstallView *install_; + SectionsView *sections_; ChangesView *changes_; ManageView *manage_; SearchView *search_; + +#if RecyclePackageViews + NSMutableArray *details_; +#endif } +- (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class; +- (void) setPage:(RVPage *)page; + @end +static _finline void _setHomePage(Cydia *self) { + [self setPage:[self _pageForURL:[NSURL URLWithString:CydiaURL(@"")] withClass:[HomeView class]]]; +} + @implementation Cydia +- (UIView *) rotatingContentViewForWindow:(UIWindow *)window { + return window_; +} + - (void) _loaded { if ([broken_ count] != 0) { int count = [broken_ count]; UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")] + initWithTitle:(count == 1 ? UCLocalize("HALFINSTALLED_PACKAGE") : [NSString stringWithFormat:UCLocalize("HALFINSTALLED_PACKAGES"), count]) buttons:[NSArray arrayWithObjects: - @"Forcibly Clear", - @"Ignore (Temporary)", + UCLocalize("FORCIBLY_CLEAR"), + UCLocalize("TEMPORARY_IGNORE"), nil] defaultButtonIndex:0 delegate:self context:@"fixhalf" ] autorelease]; - [sheet setBodyText:@"When the shell scripts associated with packages fail, they are left in a bad state known as either half-configured or half-installed. These errors don't go away and instead continue to cause issues. These scripts can be deleted and the packages forcibly removed."]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + + [sheet setBodyText:UCLocalize("HALFINSTALLED_PACKAGE_EX")]; [sheet popupAlertAnimated:YES]; } else if (!Ignored_ && [essential_ count] != 0) { int count = [essential_ count]; UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")] - buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil] + initWithTitle:(count == 1 ? UCLocalize("ESSENTIAL_UPGRADE") : [NSString stringWithFormat:UCLocalize("ESSENTIAL_UPGRADES"), count]) + buttons:[NSArray arrayWithObjects: + UCLocalize("UPGRADE_ESSENTIAL"), + UCLocalize("COMPLETE_UPGRADE"), + UCLocalize("TEMPORARY_IGNORE"), + nil] defaultButtonIndex:0 delegate:self context:@"upgrade" ] autorelease]; - [sheet setBodyText:@"One or more essential packages are currently out of date. If these upgrades are not performed you are likely to encounter errors."]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + + [sheet setBodyText:UCLocalize("ESSENTIAL_UPGRADE_EX")]; [sheet popupAlertAnimated:YES]; } } +- (void) _saveConfig { + if (Changed_) { + _trace(); + NSString *error(nil); + if (NSData *data = [NSPropertyListSerialization dataFromPropertyList:Metadata_ format:NSPropertyListBinaryFormat_v1_0 errorDescription:&error]) { + _trace(); + NSError *error(nil); + if (![data writeToFile:@"/var/lib/cydia/metadata.plist" options:NSAtomicWrite error:&error]) + NSLog(@"failure to save metadata data: %@", error); + _trace(); + } else { + NSLog(@"failure to serialize metadata: %@", error); + return; + } + + Changed_ = false; + } +} + +- (void) _updateData { + [self _saveConfig]; + + /* XXX: this is just stupid */ + if (tag_ != 1 && sections_ != nil) + [sections_ reloadData]; + if (tag_ != 2 && changes_ != nil) + [changes_ reloadData]; + if (tag_ != 4 && search_ != nil) + [search_ reloadData]; + + [book_ reloadData]; +} + - (void) _reloadData { - /*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_]; - [hud setText:@"Reloading Data"]; - [overlay_ addSubview:hud]; - [hud show:YES];*/ + UIView *block(); + + static bool loaded(false); + UIProgressHUD *hud([self addProgressHUD]); + [hud setText:(loaded ? UCLocalize("RELOADING_DATA") : UCLocalize("LOADING_DATA"))]; - [database_ reloadData]; + [database_ yieldToSelector:@selector(reloadData) withObject:nil]; + _trace(); + + [self removeProgressHUD:hud]; size_t changes(0); [essential_ removeAllObjects]; [broken_ removeAllObjects]; - NSArray *packages = [database_ packages]; - for (int i(0), e([packages count]); i != e; ++i) { - Package *package = [packages objectAtIndex:i]; + NSArray *packages([database_ packages]); + for (Package *package in packages) { if ([package half]) [broken_ addObject:package]; if ([package upgradableAndEssential:NO]) { @@ -5709,50 +7777,48 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (changes != 0) { NSString *badge([[NSNumber numberWithInt:changes] stringValue]); - [buttonbar_ setBadgeValue:badge forButton:3]; - if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)]) - [buttonbar_ setBadgeAnimated:YES forButton:3]; - [self setApplicationBadge:badge]; + [[[toolbar_ items] objectAtIndex:2] setBadgeValue:badge]; + if ([toolbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)]) + [[[toolbar_ items] objectAtIndex:2] setAnimatedBadge:YES]; + if ([self respondsToSelector:@selector(setApplicationBadge:)]) + [self setApplicationBadge:badge]; + else + [self setApplicationBadgeString:badge]; } else { - [buttonbar_ setBadgeValue:nil forButton:3]; - if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)]) - [buttonbar_ setBadgeAnimated:NO forButton:3]; - [self removeApplicationBadge]; + [[[toolbar_ items] objectAtIndex:2] setBadgeValue:nil]; + if ([toolbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)]) + [[[toolbar_ items] objectAtIndex:2] setAnimatedBadge:NO]; + if ([self respondsToSelector:@selector(removeApplicationBadge)]) + [self removeApplicationBadge]; + else // XXX: maybe use setApplicationBadgeString also? + [self setApplicationIconBadgeNumber:0]; } - [self updateData]; + Queuing_ = false; + [[[toolbar_ items] objectAtIndex:3] setBadgeValue:nil]; - if ([packages count] == 0); - else if (Loaded_) + [self _updateData]; + + if (loaded || ManualRefresh) loaded: [self _loaded]; else { - Loaded_ = YES; - [book_ update]; - } + loaded = true; - /*[hud show:NO]; - [hud removeFromSuperview];*/ -} + NSDate *update([Metadata_ objectForKey:@"LastUpdate"]); -- (void) _saveConfig { - if (Changed_) { - _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES); - Changed_ = false; + if (update != nil) { + NSTimeInterval interval([update timeIntervalSinceNow]); + if (interval <= 0 && interval > -(15*60)) + goto loaded; + } + + [book_ setUpdate:update]; } } - (void) updateData { - [self _saveConfig]; - - /* XXX: this is just stupid */ - if (tag_ != 2) - [install_ reloadData]; - if (tag_ != 3) - [changes_ reloadData]; - if (tag_ != 5) - [search_ reloadData]; - - [book_ reloadData]; + [database_ setVisible]; + [self _updateData]; } - (void) update_ { @@ -5760,14 +7826,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) syncData { - FILE *file = fopen("/etc/apt/sources.list.d/cydia.list", "w"); + FILE *file(fopen("/etc/apt/sources.list.d/cydia.list", "w")); _assert(file != NULL); - NSArray *keys = [Sources_ allKeys]; - - for (int i(0), e([keys count]); i != e; ++i) { - NSString *key = [keys objectAtIndex:i]; - NSDictionary *source = [Sources_ objectForKey:key]; + for (NSString *key in [Sources_ allKeys]) { + NSDictionary *source([Sources_ objectForKey:key]); fprintf(file, "%s %s %s\n", [[source objectForKey:@"Type"] UTF8String], @@ -5784,7 +7847,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { detachNewThreadSelector:@selector(update_) toTarget:self withObject:nil - title:@"Updating Sources" + title:UCLocalize("UPDATING_SOURCES") ]; } @@ -5803,33 +7866,51 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { _error->Discard(); } -- (void) perform { - [database_ prepare]; +- (void) popUpBook:(RVBook *)book { + [underlay_ popSubview:book]; +} - if ([database_ cache]->BrokenCount() == 0) - confirm_ = [[ConfirmationView alloc] initWithView:underlay_ database:database_ delegate:self]; - else { - NSMutableArray *broken = [NSMutableArray arrayWithCapacity:16]; - NSArray *packages = [database_ packages]; +- (CGRect) popUpBounds { + return [underlay_ bounds]; +} - for (size_t i(0); i != [packages count]; ++i) { - Package *package = [packages objectAtIndex:i]; - if ([package broken]) - [broken addObject:[package name]]; - } +- (bool) perform { + if (![database_ prepare]) + return false; - UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:[NSString stringWithFormat:@"%d Broken Packages", [database_ cache]->BrokenCount()] - buttons:[NSArray arrayWithObjects:@"Okay", nil] - defaultButtonIndex:0 - delegate:self - context:@"broken" - ] autorelease]; + confirm_ = [[RVBook alloc] initWithFrame:[self popUpBounds]]; + [confirm_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [confirm_ setDelegate:self]; - [sheet setBodyText:[NSString stringWithFormat:@"The following packages have unmet dependencies:\n\n%@", [broken componentsJoinedByString:@"\n"]]]; - [sheet popupAlertAnimated:YES]; + ConfirmationView *page([[[ConfirmationView alloc] initWithBook:confirm_ database:database_] autorelease]); + [page setDelegate:self]; - [self _reloadData]; + [confirm_ setPage:page]; + [self popUpBook:confirm_]; + + return true; +} + +- (void) queue { + @synchronized (self) { + [self perform]; + } +} + +- (void) clearPackage:(Package *)package { + @synchronized (self) { + [package clear]; + [self resolve]; + [self perform]; + } +} + +- (void) installPackages:(NSArray *)packages { + @synchronized (self) { + for (Package *package in packages) + [package install]; + [self resolve]; + [self perform]; } } @@ -5851,16 +7932,30 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) distUpgrade { @synchronized (self) { - [database_ upgrade]; + if (![database_ upgrade]) + return; [self perform]; } } - (void) cancel { + [self slideUp:[[[UIActionSheet alloc] + initWithTitle:nil + buttons:[NSArray arrayWithObjects:UCLocalize("CONTINUE_QUEUING"), UCLocalize("CANCEL_CLEAR"), nil] + defaultButtonIndex:1 + delegate:self + context:@"cancel" + ] autorelease]]; +} + +- (void) complete { @synchronized (self) { - [confirm_ release]; - confirm_ = nil; [self _reloadData]; + + if (confirm_ != nil) { + [confirm_ release]; + confirm_ = nil; + } } } @@ -5872,37 +7967,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { detachNewThreadSelector:@selector(perform) toTarget:database_ withObject:nil - title:@"Running" - ]; -} - -- (void) bootstrap_ { - [database_ update]; - [database_ upgrade]; - [database_ prepare]; - [database_ perform]; -} - -- (void) bootstrap { - [progress_ - detachNewThreadSelector:@selector(bootstrap_) - toTarget:self - withObject:nil - title:@"Bootstrap Install" + title:UCLocalize("RUNNING") ]; } - (void) progressViewIsComplete:(ProgressView *)progress { - @synchronized (self) { - [self _reloadData]; - - if (confirm_ != nil) { - [underlay_ addSubview:overlay_]; - [confirm_ removeFromSuperview]; - [confirm_ release]; - confirm_ = nil; - } + if (confirm_ != nil) { + [underlay_ addSubview:overlay_]; + [confirm_ popFromSuperviewAnimated:NO]; } + + [self complete]; } - (void) setPage:(RVPage *)page { @@ -5912,205 +7987,173 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class { - BrowserView *browser = [[[_class alloc] initWithBook:book_ database:database_] autorelease]; + CydiaBrowserView *browser = [[[_class alloc] initWithBook:book_] autorelease]; [browser loadURL:url]; return browser; } -- (void) _setHomePage { - [self setPage:[self _pageForURL:[NSURL URLWithString:@"http://cydia.saurik.com/"] withClass:[HomeView class]]]; +- (SectionsView *) sectionsView { + if (sections_ == nil) + sections_ = [[SectionsView alloc] initWithBook:book_ database:database_]; + return sections_; +} + +- (ChangesView *) changesView { + if (changes_ == nil) + changes_ = [[ChangesView alloc] initWithBook:book_ database:database_ delegate:self]; + return changes_; +} + +- (ManageView *) manageView { + if (manage_ == nil) + manage_ = (ManageView *) [[self + _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]] + withClass:[ManageView class] + ] retain]; + return manage_; +} + +- (SearchView *) searchView { + if (search_ == nil) + search_ = [[SearchView alloc] initWithBook:book_ database:database_]; + return search_; } -- (void) buttonBarItemTapped:(id)sender { - unsigned tag = [sender tag]; +- (void) tabBar:(UITabBar *)sender didSelectItem:(UITabBarItem *)item { + int tag = [item tag]; if (tag == tag_) { [book_ resetViewAnimated:YES]; return; - } else if (tag_ == 2 && tag != 2) - [install_ resetView]; + } else if (tag_ == 1) + [[self sectionsView] resetView]; switch (tag) { - case 1: [self _setHomePage]; break; + case 0: _setHomePage(self); break; - case 2: [self setPage:install_]; break; - case 3: [self setPage:changes_]; break; - case 4: [self setPage:manage_]; break; - case 5: [self setPage:search_]; break; + case 1: [self setPage:[self sectionsView]]; break; + case 2: [self setPage:[self changesView]]; break; + case 3: [self setPage:[self manageView]]; break; + case 4: [self setPage:[self searchView]]; break; - default: _assert(false); + _nodefault } - - tag_ = tag; -} - -- (void) applicationWillSuspend { - [database_ clean]; - [super applicationWillSuspend]; + + tag_ = tag; } - (void) askForSettings { - UIActionSheet *role = [[[UIActionSheet alloc] - initWithTitle:@"Who Are You?" + NSString *parenthetical(UCLocalize("PARENTHETICAL")); + + CYActionSheet *role([[[CYActionSheet alloc] + initWithTitle:UCLocalize("WHO_ARE_YOU") buttons:[NSArray arrayWithObjects: - @"User (Graphical Only)", - @"Hacker (+ Command Line)", - @"Developer (No Filters)", + [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:@"Not all of the packages available via Cydia are designed to be used by all users. Please categorize yourself so that Cydia can apply helpful filters.\n\nThis choice can be changed from \"Settings\" under the \"Manage\" tab."]; - [role popupAlertAnimated:YES]; -} - -- (void) finish { - if (hud_ != nil) { - [self setStatusBarShowsProgress:NO]; + ] autorelease]); - [hud_ show:NO]; - [hud_ removeFromSuperview]; - [hud_ autorelease]; - hud_ = nil; + [role setBodyText:UCLocalize("ROLE_EX")]; - pid_t pid = ExecFork(); - if (pid == 0) { - execlp("launchctl", "launchctl", "stop", "com.apple.SpringBoard", NULL); - perror("launchctl stop"); - } + int button([role yieldToPopupAlertAnimated:YES]); - return; - } + switch (button) { + case 1: Role_ = @"User"; break; + case 2: Role_ = @"Hacker"; break; + case 3: Role_ = @"Developer"; break; - if (Role_ == nil) { - [self askForSettings]; - return; + _nodefault } - overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]]; + Settings_ = [NSMutableDictionary dictionaryWithObjectsAndKeys: + Role_, @"Role", + nil]; - CGRect screenrect = [UIHardware fullScreenApplicationContentRect]; - book_ = [[CYBook alloc] initWithFrame:CGRectMake( - 0, 0, screenrect.size.width, screenrect.size.height - 48 - ) database:database_]; + [Metadata_ setObject:Settings_ forKey:@"Settings"]; - [book_ setDelegate:self]; + Changed_ = true; - [overlay_ addSubview:book_]; + [role dismiss]; +} - NSArray *buttonitems = [NSArray arrayWithObjects: - [NSDictionary dictionaryWithObjectsAndKeys: - @"buttonBarItemTapped:", kUIButtonBarButtonAction, - @"home-up.png", kUIButtonBarButtonInfo, - @"home-dn.png", kUIButtonBarButtonSelectedInfo, - [NSNumber numberWithInt:1], kUIButtonBarButtonTag, - self, kUIButtonBarButtonTarget, - @"Home", kUIButtonBarButtonTitle, - @"0", kUIButtonBarButtonType, - nil], - - [NSDictionary dictionaryWithObjectsAndKeys: - @"buttonBarItemTapped:", kUIButtonBarButtonAction, - @"install-up.png", kUIButtonBarButtonInfo, - @"install-dn.png", kUIButtonBarButtonSelectedInfo, - [NSNumber numberWithInt:2], kUIButtonBarButtonTag, - self, kUIButtonBarButtonTarget, - @"Sections", kUIButtonBarButtonTitle, - @"0", kUIButtonBarButtonType, - nil], - - [NSDictionary dictionaryWithObjectsAndKeys: - @"buttonBarItemTapped:", kUIButtonBarButtonAction, - @"changes-up.png", kUIButtonBarButtonInfo, - @"changes-dn.png", kUIButtonBarButtonSelectedInfo, - [NSNumber numberWithInt:3], kUIButtonBarButtonTag, - self, kUIButtonBarButtonTarget, - @"Changes", kUIButtonBarButtonTitle, - @"0", kUIButtonBarButtonType, - nil], - - [NSDictionary dictionaryWithObjectsAndKeys: - @"buttonBarItemTapped:", kUIButtonBarButtonAction, - @"manage-up.png", kUIButtonBarButtonInfo, - @"manage-dn.png", kUIButtonBarButtonSelectedInfo, - [NSNumber numberWithInt:4], kUIButtonBarButtonTag, - self, kUIButtonBarButtonTarget, - @"Manage", kUIButtonBarButtonTitle, - @"0", kUIButtonBarButtonType, - nil], - - [NSDictionary dictionaryWithObjectsAndKeys: - @"buttonBarItemTapped:", kUIButtonBarButtonAction, - @"search-up.png", kUIButtonBarButtonInfo, - @"search-dn.png", kUIButtonBarButtonSelectedInfo, - [NSNumber numberWithInt:5], kUIButtonBarButtonTag, - self, kUIButtonBarButtonTarget, - @"Search", kUIButtonBarButtonTitle, - @"0", kUIButtonBarButtonType, - nil], - nil]; +- (void) setPackageView:(PackageView *)view { + WebThreadLock(); + [view setPackage:nil]; +#if RecyclePackageViews + if ([details_ count] < 3) + [details_ addObject:view]; +#endif + WebThreadUnlock(); +} - buttonbar_ = [[UIToolbar alloc] - initInView:overlay_ - withFrame:CGRectMake( - 0, screenrect.size.height - ButtonBarHeight_, - screenrect.size.width, ButtonBarHeight_ - ) - withItemList:buttonitems - ]; +- (PackageView *) _packageView { + return [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; +} - [buttonbar_ setDelegate:self]; - [buttonbar_ setBarStyle:1]; - [buttonbar_ setButtonBarTrackingMode:2]; +- (PackageView *) packageView { +#if RecyclePackageViews + PackageView *view; + size_t count([details_ count]); - int buttons[5] = {1, 2, 3, 4, 5}; - [buttonbar_ registerButtonGroup:0 withButtons:buttons withCount:5]; - [buttonbar_ showButtonGroup:0 withDuration:0]; + if (count == 0) { + view = [self _packageView]; + renew: + [details_ addObject:[self _packageView]]; + } else { + view = [[[details_ lastObject] retain] autorelease]; + [details_ removeLastObject]; + if (count == 1) + goto renew; + } - for (int i = 0; i != 5; ++i) - [[buttonbar_ viewWithTag:(i + 1)] setFrame:CGRectMake( - i * 64 + 2, 1, 60, ButtonBarHeight_ - )]; + return view; +#else + return [self _packageView]; +#endif +} - [buttonbar_ showSelectionForButton:1]; - [overlay_ addSubview:buttonbar_]; +- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { + NSString *context([sheet context]); - [UIKeyboard initImplementationNow]; - CGSize keysize = [UIKeyboard defaultSize]; - CGRect keyrect = {{0, [overlay_ bounds].size.height}, keysize}; - keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect]; - [[UIKeyboardImpl sharedInstance] setSoundsEnabled:(Sounds_Keyboard_ ? YES : NO)]; - [overlay_ addSubview:keyboard_]; + if ([context isEqualToString:@"missing"]) + [sheet dismiss]; + else if ([context isEqualToString:@"cancel"]) { + bool clear; - install_ = [[InstallView alloc] initWithBook:book_ database:database_]; - changes_ = [[ChangesView alloc] initWithBook:book_ database:database_]; - search_ = [[SearchView alloc] initWithBook:book_ database:database_]; + switch (button) { + case 1: + clear = false; + break; - manage_ = (ManageView *) [[self - _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]] - withClass:[ManageView class] - ] retain]; + case 2: + clear = true; + break; - if (!bootstrap_) - [underlay_ addSubview:overlay_]; + _nodefault + } - [self reloadData]; + [sheet dismiss]; - if (bootstrap_) - [self bootstrap]; - else - [self _setHomePage]; -} + @synchronized (self) { + if (clear) + [self _reloadData]; + else { + Queuing_ = true; + [[[toolbar_ items] objectAtIndex:3] setBadgeValue:UCLocalize("Q_D")]; + [book_ reloadData]; + } -- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { - NSString *context = [sheet context]; - if ([context isEqualToString:@"fixhalf"]) + if (confirm_ != nil) { + [confirm_ release]; + confirm_ = nil; + } + } + } else if ([context isEqualToString:@"fixhalf"]) { switch (button) { case 1: @synchronized (self) { - for (int i = 0, e = [broken_ count]; i != e; ++i) { - Package *broken = [broken_ objectAtIndex:i]; + for (Package *broken in broken_) { [broken remove]; NSString *id = [broken id]; @@ -6130,42 +8173,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self _loaded]; break; - default: - _assert(false); - } - else if ([context isEqualToString:@"role"]) { - switch (button) { - case 1: Role_ = @"User"; break; - case 2: Role_ = @"Hacker"; break; - case 3: Role_ = @"Developer"; break; - - default: - Role_ = nil; - _assert(false); + _nodefault } - bool reset = Settings_ != nil; - - Settings_ = [NSMutableDictionary dictionaryWithObjectsAndKeys: - Role_, @"Role", - nil]; - - [Metadata_ setObject:Settings_ forKey:@"Settings"]; - - Changed_ = true; - - if (reset) - [self updateData]; - else - [self finish]; - } else if ([context isEqualToString:@"upgrade"]) + [sheet dismiss]; + } else if ([context isEqualToString:@"upgrade"]) { switch (button) { case 1: @synchronized (self) { - for (int i = 0, e = [essential_ count]; i != e; ++i) { - Package *essential = [essential_ objectAtIndex:i]; + for (Package *essential in essential_) [essential install]; - } [self resolve]; [self perform]; @@ -6173,21 +8190,27 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { break; case 2: + [self distUpgrade]; + break; + + case 3: Ignored_ = YES; break; - default: - _assert(false); + _nodefault } - [sheet dismiss]; + [sheet dismiss]; + } +} + +- (void) system:(NSString *)command { _pooled + system([command UTF8String]); } -- (void) reorganize { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - system("/usr/libexec/cydia/free.sh"); - [self performSelectorOnMainThread:@selector(finish) withObject:nil waitUntilDone:NO]; - [pool release]; +- (void) applicationWillSuspend { + [database_ clean]; + [super applicationWillSuspend]; } - (void) applicationSuspend:(__GSEvent *)event { @@ -6206,41 +8229,128 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (UIProgressHUD *) addProgressHUD { - UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_]; + UIProgressHUD *hud([[[UIProgressHUD alloc] initWithWindow:window_] autorelease]); + [hud setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + + [window_ setUserInteractionEnabled:NO]; [hud show:YES]; - [underlay_ addSubview:hud]; + [progress_ addSubview:hud]; return hud; } +- (void) removeProgressHUD:(UIProgressHUD *)hud { + [hud show:NO]; + [hud removeFromSuperview]; + [window_ setUserInteractionEnabled:YES]; +} + +- (RVPage *) pageForPackage:(NSString *)name { + if (Package *package = [database_ packageWithName:name]) { + PackageView *view([self packageView]); + [view setPackage:package]; + return view; + } else { + NSURL *url([NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"unknown" ofType:@"html"]]); + url = [NSURL URLWithString:[[url absoluteString] stringByAppendingString:[NSString stringWithFormat:@"?%@", name]]]; + return [self _pageForURL:url withClass:[CydiaBrowserView class]]; + } +} + +- (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag { + if (tag != NULL) + *tag = -1; + + 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; + NSString *path([url absoluteString]); + if ([path length] < 8) + return nil; + path = [path substringFromIndex:8]; + if (![path hasPrefix:@"/"]) + path = [@"/" stringByAppendingString:path]; + + 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:[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:[CydiaBrowserView class]]; + else if ([path hasPrefix:@"/launch/"]) + [self launchApplicationWithIdentifier:[path substringFromIndex:8] suspended:NO]; + else if ([path hasPrefix:@"/package-settings/"]) + return [[[SettingsView alloc] initWithBook:book_ database:database_ package:[path substringFromIndex:18]] autorelease]; + else if ([path hasPrefix:@"/package-signature/"]) + return [[[SignatureView alloc] initWithBook:book_ database:database_ package:[path substringFromIndex:19]] autorelease]; + else if ([path hasPrefix:@"/package/"]) + return [self pageForPackage:[path substringFromIndex:9]]; + else if ([path hasPrefix:@"/files/"]) { + NSString *name = [path substringFromIndex:7]; + + if (Package *package = [database_ packageWithName:name]) { + FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease]; + [files setPackage:package]; + return files; + } + } + + return nil; +} + +- (void) applicationOpenURL:(NSURL *)url { + [super applicationOpenURL:url]; + int tag; + if (RVPage *page = [self pageForURL:url hasTag:&tag]) { + [self setPage:page]; + tag_ = tag; + [toolbar_ setSelectedItem:(tag_ == -1 ? nil : [items_ objectAtIndex:tag_])]; + } +} + - (void) applicationDidFinishLaunching:(id)unused { + [BrowserView _initialize]; + + [NSURLProtocol registerClass:[CydiaURLProtocol class]]; + Font12_ = [[UIFont systemFontOfSize:12] retain]; Font12Bold_ = [[UIFont boldSystemFontOfSize:12] retain]; Font14_ = [[UIFont systemFontOfSize:14] retain]; Font18Bold_ = [[UIFont boldSystemFontOfSize:18] retain]; Font22Bold_ = [[UIFont boldSystemFontOfSize:22] retain]; - _assert(pkgInitConfig(*_config)); - _assert(pkgInitSystem(*_config, _system)); - - confirm_ = nil; - tag_ = 1; + tag_ = 0; essential_ = [[NSMutableArray alloc] initWithCapacity:4]; broken_ = [[NSMutableArray alloc] initWithCapacity:4]; - CGRect screenrect = [UIHardware fullScreenApplicationContentRect]; - window_ = [[UIWindow alloc] initWithContentRect:screenrect]; + UIScreen *screen([UIScreen mainScreen]); + window_ = [[UIWindow alloc] initWithFrame:[screen bounds]]; [window_ orderFront:self]; [window_ makeKey:self]; - [window_ _setHidden:NO]; + [window_ setHidden:NO]; + + root_ = [[CydiaViewController alloc] init]; + [window_ addSubview:[root_ view]]; + + database_ = [Database sharedInstance]; + + progress_ = [[ProgressView alloc] initWithFrame:[[root_ view] bounds] database:database_ delegate:self]; + [progress_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [[root_ view] addSubview:progress_]; - database_ = [[Database alloc] init]; - progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self]; [database_ setDelegate:progress_]; - [window_ setContentView:progress_]; underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]]; + [underlay_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [progress_ setContentView:underlay_]; [progress_ resetView]; @@ -6249,34 +8359,119 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { readlink("/Applications", NULL, 0) == -1 && errno == EINVAL || readlink("/Library/Ringtones", 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*/ + readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL || + //readlink("/var/lib", NULL, 0) == -1 && errno == EINVAL || + false ) { [self setIdleTimerDisabled:YES]; hud_ = [self addProgressHUD]; - [hud_ setText:@"Reorganizing\n\nWill Automatically\nRestart When Done"]; - + [hud_ setText:@"Reorganizing\n\nWill Automatically\nClose When Done"]; [self setStatusBarShowsProgress:YES]; - [NSThread - detachNewThreadSelector:@selector(reorganize) - toTarget:self - withObject:nil - ]; - } else - [self finish]; + [self yieldToSelector:@selector(system:) withObject:@"/usr/libexec/cydia/free.sh"]; + + [self setStatusBarShowsProgress:NO]; + [self removeProgressHUD:hud_]; + hud_ = nil; + + if (ExecFork() == 0) { + execlp("launchctl", "launchctl", "stop", "com.apple.SpringBoard", NULL); + perror("launchctl stop"); + } + + return; + } + + if (Role_ == nil) + [self askForSettings]; + + _trace(); + overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]]; + [overlay_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + + CGRect screenrect = [UIHardware fullScreenApplicationContentRect]; + + book_ = [[CYBook alloc] initWithFrame:CGRectMake( + 0, 0, screenrect.size.width, screenrect.size.height - 48 + ) database:database_]; + + [book_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [overlay_ addSubview:book_]; + + [book_ setDelegate:self]; + + items_ = [[NSArray arrayWithObjects: + [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home.png"] tag:0] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("SECTIONS") image:[UIImage applicationImageNamed:@"install.png"] tag:1] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage applicationImageNamed:@"changes.png"] tag:2] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("MANAGE") image:[UIImage applicationImageNamed:@"manage.png"] tag:3] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage applicationImageNamed:@"search.png"] tag:4] autorelease], + nil] retain]; + + toolbar_ = [[UITabBar alloc] + initWithFrame:CGRectMake( + 0, screenrect.size.height - ButtonBarHeight_, + screenrect.size.width, ButtonBarHeight_ + ) + ]; + + [toolbar_ setItems:items_]; + + [toolbar_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)]; + [overlay_ addSubview:toolbar_]; + + [toolbar_ setDelegate:self]; + + /*int buttons[5] = {1, 2, 3, 4, 5}; + [toolbar_ registerButtonGroup:0 withButtons:buttons withCount:5]; + [toolbar_ showButtonGroup:0 withDuration:0]; + + for (int i = 0; i != 5; ++i) { + UIView *button([toolbar_ viewWithTag:(i + 1)]); + + [button setFrame:CGRectMake( + i * (screenrect.size.width / 5) + (screenrect.size.width / 5 - ButtonBarWidth_) / 2, 1, + ButtonBarWidth_, ButtonBarHeight_ + )]; + + [button setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; + }*/ + + [toolbar_ setSelectedItem:[items_ objectAtIndex:0]]; + + [UIKeyboard initImplementationNow]; + /*CGSize keysize = [UIKeyboard defaultSize]; + CGRect keyrect = {{0, [overlay_ bounds].size.height}, keysize}; + keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect]; + [overlay_ addSubview:keyboard_];*/ + + [underlay_ addSubview:overlay_]; + + [self reloadData]; + +#if RecyclePackageViews + details_ = [[NSMutableArray alloc] initWithCapacity:4]; + [details_ addObject:[self _packageView]]; + [details_ addObject:[self _packageView]]; +#endif + + PrintTimes(); + + _setHomePage(self); } - (void) showKeyboard:(BOOL)show { - CGSize keysize = [UIKeyboard defaultSize]; + CGSize keysize([UIKeyboard defaultSize]); CGRect keydown = {{0, [overlay_ bounds].size.height}, keysize}; - CGRect keyup = keydown; + CGRect keyup(keydown); keyup.origin.y -= keysize.height; - UIFrameAnimation *animation = [[[UIFrameAnimation alloc] initWithTarget:keyboard_] autorelease]; + UIFrameAnimation *animation([[[UIFrameAnimation alloc] initWithTarget:keyboard_] autorelease]); [animation setSignificantRectFields:2]; if (show) { @@ -6297,93 +8492,108 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) slideUp:(UIActionSheet *)alert { - if (Advanced_) - [alert presentSheetFromButtonBar:buttonbar_]; - else - [alert presentSheetInView:overlay_]; + [alert setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [alert presentSheetInView:overlay_]; } @end -void AddPreferences(NSString *plist) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSMutableDictionary *settings = [[[NSMutableDictionary alloc] initWithContentsOfFile:plist] autorelease]; - _assert(settings != NULL); - NSMutableArray *items = [settings objectForKey:@"items"]; - - bool cydia(false); - - for (size_t i(0); i != [items count]; ++i) { - NSMutableDictionary *item([items objectAtIndex:i]); - NSString *label = [item objectForKey:@"label"]; - if (label != nil && [label isEqualToString:@"Cydia"]) { - cydia = true; - break; - } - } - - if (!cydia) { - for (size_t i(0); i != [items count]; ++i) { - NSDictionary *item([items objectAtIndex:i]); - NSString *label = [item objectForKey:@"label"]; - if (label != nil && [label isEqualToString:@"General"]) { - [items insertObject:[NSDictionary dictionaryWithObjectsAndKeys: - @"CydiaSettings", @"bundle", - @"PSLinkCell", @"cell", - [NSNumber numberWithBool:YES], @"hasIcon", - [NSNumber numberWithBool:YES], @"isController", - @"Cydia", @"label", - nil] atIndex:(i + 1)]; - - break; - } - } - - _assert([settings writeToFile:plist atomically:YES] == YES); - } - - [pool release]; -} - /*IMP alloc_; id Alloc_(id self, SEL selector) { id object = alloc_(self, selector); - fprintf(stderr, "[%s]A-%p\n", self->isa->name, object); + lprintf("[%s]A-%p\n", self->isa->name, object); return object; }*/ /*IMP dealloc_; id Dealloc_(id self, SEL selector) { id object = dealloc_(self, selector); - fprintf(stderr, "[%s]D-%p\n", self->isa->name, object); + lprintf("[%s]D-%p\n", self->isa->name, object); return object; }*/ -int main(int argc, char *argv[]) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +Class $WebDefaultUIKitDelegate; - bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0; +MSHook(void, UIWebDocumentView$_setUIKitDelegate$, UIWebDocumentView *self, SEL _cmd, id delegate) { + if (delegate == nil && $WebDefaultUIKitDelegate != nil) + delegate = [$WebDefaultUIKitDelegate sharedUIKitDelegate]; + return _UIWebDocumentView$_setUIKitDelegate$(self, _cmd, delegate); +} - App_ = [[NSBundle mainBundle] bundlePath]; - Home_ = NSHomeDirectory(); +int main(int argc, char *argv[]) { _pooled + _trace(); + + if (Class $UIDevice = objc_getClass("UIDevice")) { + UIDevice *device([$UIDevice currentDevice]); + IsWildcat_ = [device respondsToSelector:@selector(isWildcat)] && [device isWildcat]; + } else + IsWildcat_ = false; + + PackageName = reinterpret_cast(method_getImplementation(class_getInstanceMethod([Package class], @selector(cyname)))); + + /* Library Hacks {{{ */ + class_addMethod(objc_getClass("WebScriptObject"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &WebScriptObject$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16"); + class_addMethod(objc_getClass("DOMNodeList"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &DOMNodeList$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16"); + + $WebDefaultUIKitDelegate = objc_getClass("WebDefaultUIKitDelegate"); + Method UIWebDocumentView$_setUIKitDelegate$(class_getInstanceMethod([WebView class], @selector(_setUIKitDelegate:))); + if (UIWebDocumentView$_setUIKitDelegate$ != NULL) { + _UIWebDocumentView$_setUIKitDelegate$ = reinterpret_cast(method_getImplementation(UIWebDocumentView$_setUIKitDelegate$)); + method_setImplementation(UIWebDocumentView$_setUIKitDelegate$, reinterpret_cast(&$UIWebDocumentView$_setUIKitDelegate$)); + } + /* }}} */ + /* Set Locale {{{ */ Locale_ = CFLocaleCopyCurrent(); + Languages_ = [NSLocale preferredLanguages]; + //CFStringRef locale(CFLocaleGetIdentifier(Locale_)); + //NSLog(@"%@", [Languages_ description]); + + const char *lang; + if (Languages_ == nil || [Languages_ count] == 0) + // XXX: consider just setting to C and then falling through? + lang = NULL; + else { + lang = [[Languages_ objectAtIndex:0] UTF8String]; + setenv("LANG", lang, true); + } - { - NSString *plist = [Home_ stringByAppendingString:@"/Library/Preferences/com.apple.preferences.sounds.plist"]; - if (NSDictionary *sounds = [NSDictionary dictionaryWithContentsOfFile:plist]) - if (NSNumber *keyboard = [sounds objectForKey:@"keyboard"]) - Sounds_Keyboard_ = [keyboard boolValue]; + //std::setlocale(LC_ALL, lang); + NSLog(@"Setting Language: %s", lang); + /* }}} */ + + apr_app_initialize(&argc, const_cast(&argv), NULL); + + /* Parse Arguments {{{ */ + bool substrate(false); + + if (argc != 0) { + char **args(argv); + int arge(1); + + for (int argi(1); argi != argc; ++argi) + if (strcmp(argv[argi], "--") == 0) { + arge = argi; + argv[argi] = argv[0]; + argv += argi; + argc -= argi; + break; + } + + for (int argi(1); argi != arge; ++argi) + if (strcmp(args[argi], "--substrate") == 0) + substrate = true; + else + fprintf(stderr, "unknown argument: %s\n", args[argi]); } + /* }}} */ + + App_ = [[NSBundle mainBundle] bundlePath]; + Home_ = NSHomeDirectory(); + Advanced_ = YES; setuid(0); setgid(0); - if (unlink("/var/cache/apt/pkgcache.bin") == -1) - _assert(errno == ENOENT); - if (unlink("/var/cache/apt/srcpkgcache.bin") == -1) - _assert(errno == ENOENT); - /*Method alloc = class_getClassMethod([NSObject class], @selector(alloc)); alloc_ = alloc->method_imp; alloc->method_imp = (IMP) &Alloc_;*/ @@ -6392,36 +8602,82 @@ int main(int argc, char *argv[]) { dealloc_ = dealloc->method_imp; dealloc->method_imp = (IMP) &Dealloc_;*/ - if (NSDictionary *sysver = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"]) { - if (NSString *prover = [sysver valueForKey:@"ProductVersion"]) { - Firmware_ = strdup([prover UTF8String]); - NSArray *versions = [prover componentsSeparatedByString:@"."]; - int count = [versions count]; - Major_ = count > 0 ? [[versions objectAtIndex:0] intValue] : 0; - Minor_ = count > 1 ? [[versions objectAtIndex:1] intValue] : 0; - BugFix_ = count > 2 ? [[versions objectAtIndex:2] intValue] : 0; - } + /* System Information {{{ */ + size_t size; + + int maxproc; + size = sizeof(maxproc); + if (sysctlbyname("kern.maxproc", &maxproc, &size, NULL, 0) == -1) + perror("sysctlbyname(\"kern.maxproc\", ?)"); + else if (maxproc < 64) { + maxproc = 64; + if (sysctlbyname("kern.maxproc", NULL, NULL, &maxproc, sizeof(maxproc)) == -1) + perror("sysctlbyname(\"kern.maxproc\", #)"); } - size_t size; + sysctlbyname("kern.osversion", NULL, &size, NULL, 0); + char *osversion = new char[size]; + if (sysctlbyname("kern.osversion", osversion, &size, NULL, 0) == -1) + perror("sysctlbyname(\"kern.osversion\", ?)"); + else + System_ = [NSString stringWithUTF8String:osversion]; + sysctlbyname("hw.machine", NULL, &size, NULL, 0); char *machine = new char[size]; - sysctlbyname("hw.machine", machine, &size, NULL, 0); - Machine_ = machine; + if (sysctlbyname("hw.machine", machine, &size, NULL, 0) == -1) + perror("sysctlbyname(\"hw.machine\", ?)"); + else + Machine_ = machine; + + if (CFMutableDictionaryRef dict = IOServiceMatching("IOPlatformExpertDevice")) { + if (io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, dict)) { + if (CFTypeRef serial = IORegistryEntryCreateCFProperty(service, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault, 0)) { + SerialNumber_ = [NSString stringWithString:(NSString *)serial]; + CFRelease(serial); + } + + if (CFTypeRef ecid = IORegistryEntrySearchCFProperty(service, kIODeviceTreePlane, CFSTR("unique-chip-id"), kCFAllocatorDefault, kIORegistryIterateRecursively)) { + NSData *data((NSData *) ecid); + size_t length([data length]); + uint8_t bytes[length]; + [data getBytes:bytes]; + char string[length * 2 + 1]; + for (size_t i(0); i != length; ++i) + sprintf(string + i * 2, "%.2X", bytes[length - i - 1]); + ChipID_ = [NSString stringWithUTF8String:string]; + CFRelease(ecid); + } + + IOObjectRelease(service); + } + } UniqueID_ = [[UIDevice currentDevice] uniqueIdentifier]; - /*AddPreferences(@"/Applications/Preferences.app/Settings-iPhone.plist"); - AddPreferences(@"/Applications/Preferences.app/Settings-iPod.plist");*/ + if (NSDictionary *system = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"]) + Build_ = [system objectForKey:@"ProductBuildVersion"]; + if (NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:@"/Applications/MobileSafari.app/Info.plist"]) { + Product_ = [info objectForKey:@"SafariProductVersion"]; + Safari_ = [info objectForKey:@"CFBundleVersion"]; + } + /* }}} */ + /* Load Database {{{ */ + _trace(); + Metadata_ = [[[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"] autorelease]; + _trace(); + SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease]; + _trace(); - if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL) - Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2]; + if (Metadata_ == NULL) + Metadata_ = [NSMutableDictionary dictionaryWithCapacity:2]; else { Settings_ = [Metadata_ objectForKey:@"Settings"]; Packages_ = [Metadata_ objectForKey:@"Packages"]; Sections_ = [Metadata_ objectForKey:@"Sections"]; Sources_ = [Metadata_ objectForKey:@"Sources"]; + + Token_ = [Metadata_ objectForKey:@"Token"]; } if (Settings_ != nil) @@ -6441,14 +8697,32 @@ int main(int argc, char *argv[]) { Sources_ = [[[NSMutableDictionary alloc] initWithCapacity:0] autorelease]; [Metadata_ setObject:Sources_ forKey:@"Sources"]; } + /* }}} */ +#if RecycleWebViews Documents_ = [[[NSMutableArray alloc] initWithCapacity:4] autorelease]; +#endif + + Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil]; + + if (substrate && access("/Library/MobileSubstrate/DynamicLibraries/SimulatedKeyEvents.dylib", F_OK) == 0) + dlopen("/Library/MobileSubstrate/DynamicLibraries/SimulatedKeyEvents.dylib", RTLD_LAZY | RTLD_GLOBAL); + if (substrate && access("/Applications/WinterBoard.app/WinterBoard.dylib", F_OK) == 0) + dlopen("/Applications/WinterBoard.app/WinterBoard.dylib", RTLD_LAZY | RTLD_GLOBAL); + /*if (substrate && access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0) + dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);*/ - if (access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0) - dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL); + int version([[NSString stringWithContentsOfFile:@"/var/lib/cydia/firmware.ver"] intValue]); - if (access("/User", F_OK) != 0) + if (access("/tmp/.cydia.fw", F_OK) == 0) { + unlink("/tmp/.cydia.fw"); + goto firmware; + } else if (access("/User", F_OK) != 0 || version < 2) { + firmware: + _trace(); system("/usr/libexec/cydia/firmware.sh"); + _trace(); + } _assert([[NSFileManager defaultManager] createDirectoryAtPath:@"/var/cache/apt/archives/partial" @@ -6457,28 +8731,56 @@ int main(int argc, char *argv[]) { error:NULL ]); + if (access("/tmp/cydia.chk", F_OK) == 0) { + if (unlink("/var/cache/apt/pkgcache.bin") == -1) + _assert(errno == ENOENT); + if (unlink("/var/cache/apt/srcpkgcache.bin") == -1) + _assert(errno == ENOENT); + } + + /* APT Initialization {{{ */ + _assert(pkgInitConfig(*_config)); + _assert(pkgInitSystem(*_config, _system)); + + if (lang != NULL) + _config->Set("APT::Acquire::Translation", lang); + _config->Set("Acquire::http::Timeout", 15); + _config->Set("Acquire::http::MaxParallel", 3); + /* }}} */ + /* Color Choices {{{ */ space_ = CGColorSpaceCreateDeviceRGB(); Blue_.Set(space_, 0.2, 0.2, 1.0, 1.0); Blueish_.Set(space_, 0x19/255.f, 0x32/255.f, 0x50/255.f, 1.0); Black_.Set(space_, 0.0, 0.0, 0.0, 1.0); Off_.Set(space_, 0.9, 0.9, 0.9, 1.0); - Red_.Set(space_, 1.0, 0.0, 0.0, 1.0); White_.Set(space_, 1.0, 1.0, 1.0, 1.0); Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0); + Green_.Set(space_, 0.0, 0.5, 0.0, 1.0); + Purple_.Set(space_, 0.0, 0.0, 0.7, 1.0); + Purplish_.Set(space_, 0.4, 0.4, 0.8, 1.0); + + InstallingColor_ = [UIColor colorWithRed:0.88f green:1.00f blue:0.88f alpha:1.00f]; + RemovingColor_ = [UIColor colorWithRed:1.00f green:0.88f blue:0.88f alpha:1.00f]; + /* }}}*/ + /* UIKit Configuration {{{ */ + void (*$GSFontSetUseLegacyFontMetrics)(BOOL)(reinterpret_cast(dlsym(RTLD_DEFAULT, "GSFontSetUseLegacyFontMetrics"))); + if ($GSFontSetUseLegacyFontMetrics != NULL) + $GSFontSetUseLegacyFontMetrics(YES); + + // XXX: I have a feeling this was important + //UIKeyboardDisableAutomaticAppearance(); + /* }}} */ + + Colon_ = UCLocalize("COLON_DELIMITED"); + Error_ = UCLocalize("ERROR"); + Warning_ = UCLocalize("WARNING"); - Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil]; - - SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease]; - - UIApplicationUseLegacyEvents(YES); - UIKeyboardDisableAutomaticAppearance(); - + _trace(); int value = UIApplicationMain(argc, argv, @"Cydia", @"Cydia"); CGColorSpaceRelease(space_); CFRelease(Locale_); - [pool release]; return value; }