X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/b27f0a944413d129aee4db862fcafd0aa77d7050..9d7f5e2d9bf78f970b62600b732d397eb1bdcc6f:/Cydia.mm?ds=inline diff --git a/Cydia.mm b/Cydia.mm index 4ebced76..827b0204 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -35,23 +35,27 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +// XXX: wtf/FastMalloc.h... wtf? +#define USE_SYSTEM_MALLOC 1 + /* #include Directives {{{ */ +#import "UICaboodle.h" + +#include #include #include #include #include #include -#include -#include -#import "BrowserView.h" -#import "ResetView.h" -#import "UICaboodle.h" +#import +#import -#include -#include +#include +#import +#include #include #include @@ -66,12 +70,23 @@ #include #include #include +#include #include +#include #include #include +#include +#include + +#include +#include #include +#include +#include + #include +#include extern "C" { #include @@ -83,44 +98,215 @@ extern "C" { #include #include + +#include + +#import "BrowserView.h" +#import "ResetView.h" + +#import "substrate.h" /* }}} */ -/* iPhoneOS 2.0 Compatibility {{{ */ -#ifdef __OBJC2__ -@interface UICGColor : NSObject { +//#define _finline __attribute__((force_inline)) +#define _finline inline + +struct timeval _ltv; +bool _itv; + +#define _limit(count) do { \ + static size_t _count(0); \ + if (++_count == count) \ + exit(0); \ +} while (false) + +/* Profiler {{{ */ +#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; } -- (id) initWithCGColor:(CGColorRef)color; -@end +#define _profile(name) { \ + static ProfileTime name(#name); \ + ProfileTimer _ ## name(name); + +#define _end } +/* }}} */ +/* Objective-C Handle<> {{{ */ +template +class _H { + typedef _H This_; + + private: + Type_ *value_; + + _finline void Retain_() { + if (value_ != nil) + [value_ retain]; + } + + _finline void Clear_() { + if (value_ != nil) + [value_ release]; + } + + public: + _finline _H(Type_ *value = NULL, bool mended = false) : + value_(value) + { + if (!mended) + Retain_(); + } + + _finline ~_H() { + Clear_(); + } + + _finline This_ &operator =(Type_ *value) { + if (value_ != value) { + Clear_(); + value_ = value; + Retain_(); + } return this; + } +}; +/* }}} */ + +#define _pooled _H _pool([[NSAutoreleasePool alloc] init], true); -@interface UIFont { +void NSLogPoint(const char *fix, const CGPoint &point) { + NSLog(@"%s(%g,%g)", fix, point.x, point.y); } -- (UIFont *) fontWithSize:(CGFloat)size; -@end +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); +} -@interface NSObject (iPhoneOS) -- (CGColorRef) cgColor; -- (CGColorRef) CGColor; -- (void) set; +@interface NSObject (Cydia) +- (id) yieldToSelector:(SEL)selector withObject:(id)object; +- (id) yieldToSelector:(SEL)selector; @end -@implementation NSObject (iPhoneOS) +@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]); + + [context removeAllObjects]; + if (value != nil) + [context addObject:value]; + + stopped = true; -- (CGColorRef) cgColor { - return [self CGColor]; + [self + performSelectorOnMainThread:@selector(doNothing) + withObject:nil + waitUntilDone:NO + ]; } -- (CGColorRef) CGColor { - return (CGColorRef) self; +- (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]; } -- (void) set { - [[[[objc_getClass("UICGColor") alloc] initWithCGColor:[self CGColor]] autorelease] set]; +- (id) yieldToSelector:(SEL)selector { + return [self yieldToSelector:selector withObject:nil]; } @end +/* NSForcedOrderingSearch doesn't work on the iPhone */ +static const NSStringCompareOptions MatchCompareOptions_ = NSLiteralSearch | NSCaseInsensitiveSearch; +static const NSStringCompareOptions BaseCompareOptions_ = NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch; +static const NSStringCompareOptions ForcedCompareOptions_ = BaseCompareOptions_; +static const NSStringCompareOptions LaxCompareOptions_ = BaseCompareOptions_ | NSCaseInsensitiveSearch; + +/* iPhoneOS 2.0 Compatibility {{{ */ +#ifdef __OBJC2__ @interface UITextView (iPhoneOS) - (void) setTextSize:(float)size; @end @@ -135,6 +321,219 @@ extern "C" { #endif /* }}} */ +extern NSString * const kCAFilterNearest; + +/* Information Dictionaries {{{ */ +@interface NSMutableArray (Cydia) +- (void) addInfoDictionary:(NSDictionary *)info; +@end + +@implementation NSMutableArray (Cydia) + +- (void) addInfoDictionary:(NSDictionary *)info { + [self addObject:info]; +} + +@end + +@interface NSMutableDictionary (Cydia) +- (void) addInfoDictionary:(NSDictionary *)info; +@end + +@implementation NSMutableDictionary (Cydia) + +- (void) addInfoDictionary:(NSDictionary *)info { + NSString *bundle = [info objectForKey:@"CFBundleIdentifier"]; + [self setObject:info forKey:bundle]; +} + +@end +/* }}} */ +/* Pop Transitions {{{ */ +@interface PopTransitionView : UITransitionView { +} + +@end + +@implementation PopTransitionView + +- (void) transitionViewDidComplete:(UITransitionView *)view fromView:(UIView *)from toView:(UIView *)to { + if (from != nil && to == nil) + [self removeFromSuperview]; +} + +@end + +@implementation UIView (PopUpView) + +- (void) popFromSuperviewAnimated:(BOOL)animated { + [[self superview] transition:(animated ? UITransitionPushFromTop : UITransitionNone) toView:nil]; +} + +- (void) popSubview:(UIView *)view { + UITransitionView *transition([[[PopTransitionView alloc] initWithFrame:[self bounds]] autorelease]); + [transition setDelegate:transition]; + [self addSubview:transition]; + + UIView *blank = [[[UIView alloc] initWithFrame:[transition bounds]] autorelease]; + [transition transition:UITransitionNone toView:blank]; + [transition transition:UITransitionPushFromBottom toView:view]; +} + +@end +/* }}} */ + +#define lprintf(args...) fprintf(stderr, args) + +#define ForRelease 0 +#define ForSaurik (0 && !ForRelease) +#define LogBrowser (1 && !ForRelease) +#define ManualRefresh (1 && !ForRelease) +#define ShowInternals (0 && !ForRelease) +#define IgnoreInstall (0 && !ForRelease) +#define RecycleWebViews 0 +#define AlwaysReload (1 && !ForRelease) + +#if ForRelease +#undef _trace +#define _trace(args...) +#undef _profile +#define _profile(name) { +#undef _end +#define _end } +#define PrintTimes() do {} while (false) +#endif + +/* Radix Sort {{{ */ +@interface NSMutableArray (Radix) +- (void) radixSortUsingSelector:(SEL)selector withObject:(id)object; +- (void) radixSortUsingFunction:(uint32_t (*)(id, void *))function withArgument:(void *)argument; +@end + +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; + + 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 { + NSInvocation *invocation([NSInvocation invocationWithMethodSignature:[NSMethodSignature signatureWithObjCTypes:"L12@0:4@8"]]); + [invocation setSelector:selector]; + [invocation setArgument:&object atIndex:2]; + + 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]); + [invocation setTarget:object]; + + [invocation invoke]; + [invocation getReturnValue:&item.key]; + } + + RadixSort_(self, count, swap); +} + +- (void) radixSortUsingFunction:(uint32_t (*)(id, void *))function withArgument:(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 +/* }}} */ + +/* 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 +/* }}} */ + typedef enum { kUIControlEventMouseDown = 1 << 0, kUIControlEventMouseMovedInside = 1 << 2, // mouse moved inside control target @@ -144,23 +543,47 @@ typedef enum { kUIControlAllEvents = (kUIControlEventMouseDown | kUIControlEventMouseMovedInside | kUIControlEventMouseMovedOutside | kUIControlEventMouseUpInside | kUIControlEventMouseUpOutside) } UIControlEventMasks; +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 @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 { @@ -193,8 +616,148 @@ typedef enum { return result == NSOrderedSame ? value : result; } +- (NSString *) stringByCachingURLWithCurrentCDN { + return [self + stringByReplacingOccurrencesOfString:@"://" + withString:@"://ne.edgecastcdn.net/8003A4/" + options:0 + /* XXX: this is somewhat inaccurate */ + range:NSMakeRange(0, 10) + ]; +} + +- (NSString *) stringByAddingPercentEscapesIncludingReserved { + return [(id)CFURLCreateStringByAddingPercentEscapes( + kCFAllocatorDefault, + (CFStringRef) self, + NULL, + CFSTR(";/?:@&=+$,"), + kCFStringEncodingUTF8 + ) autorelease]; +} + @end +static inline NSString *CYLocalizeEx(NSString *key, NSString *value = nil) { + return [[NSBundle mainBundle] localizedStringForKey:key value:value table:nil]; +} + +#define CYLocalize(key) CYLocalizeEx(@ key) + +class CYString { + private: + char *data_; + size_t size_; + CFStringRef cache_; + + _finline void clear_() { + if (cache_ != nil) + CFRelease(cache_); + } + + 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_(nil) + { + } + + _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))); + memcpy(temp, data, size); + 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 id() { + if (cache_ == NULL) { + if (size_ == 0) + return nil; + cache_ = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(data_), size_, kCFStringEncodingUTF8, NO, kCFAllocatorNull); + } return (id) cache_; + } +}; + +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 { private: @@ -213,7 +776,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); } @@ -242,15 +805,15 @@ class Pcre { }; /* }}} */ /* Mime Addresses {{{ */ -Pcre email_r("^\"?(.*)\"? <([^>]*)>$"); - @interface Address : NSObject { NSString *name_; - NSString *email_; + NSString *address_; } - (NSString *) name; -- (NSString *) email; +- (NSString *) address; + +- (void) setAddress:(NSString *)address; + (Address *) addressWithString:(NSString *)string; - (Address *) initWithString:(NSString *)string; @@ -260,8 +823,8 @@ Pcre email_r("^\"?(.*)\"? <([^>]*)>$"); - (void) dealloc { [name_ release]; - if (email_ != nil) - [email_ release]; + if (address_ != nil) + [address_ release]; [super dealloc]; } @@ -269,30 +832,48 @@ Pcre email_r("^\"?(.*)\"? <([^>]*)>$"); return name_; } -- (NSString *) email { - return email_; +- (NSString *) address { + return address_; +} + +- (void) setAddress:(NSString *)address { + if (address_ != nil) + [address_ autorelease]; + if (address == nil) + address_ = nil; + else + address_ = [address retain]; } + (Address *) addressWithString:(NSString *)string { return [[[Address alloc] initWithString:string] autorelease]; } ++ (NSArray *) _attributeKeys { + return [NSArray arrayWithObjects:@"address", @"name", nil]; +} + +- (NSArray *) attributeKeys { + return [[self class] _attributeKeys]; +} + ++ (BOOL) isKeyExcludedFromWebScript:(const char *)name { + return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name]; +} + - (Address *) initWithString:(NSString *)string { if ((self = [super init]) != nil) { const char *data = [string UTF8String]; size_t size = [string length]; - if (email_r(data, size)) { - name_ = [email_r[1] retain]; - email_ = [email_r[2] retain]; - } else { - name_ = [[NSString alloc] - initWithBytes:data - length:size - encoding:kCFStringEncodingUTF8 - ]; + static Pcre address_r("^\"?(.*)\"? <([^>]*)>$"); - email_ = nil; + if (address_r(data, size)) { + name_ = [address_r[1] retain]; + address_ = [address_r[2] retain]; + } else { + name_ = [string retain]; + address_ = nil; } } return self; } @@ -335,76 +916,35 @@ class CGColor { return color_; } }; +/* }}} */ -class GSFont { - private: - GSFontRef font_; - - public: - ~GSFont() { - CFRelease(font_); - } -}; -/* }}} */ -/* Right Alignment {{{ */ -@interface UIRightTextLabel : UITextLabel { - float _savedRightEdgeX; - BOOL _sizedtofit_flag; -} - -- (void) setFrame:(CGRect)frame; -- (void) setText:(NSString *)text; -- (void) realignText; -@end - -@implementation UIRightTextLabel - -- (void) setFrame:(CGRect)frame { - [super setFrame:frame]; - if (_sizedtofit_flag == NO) { - _savedRightEdgeX = frame.origin.x; - [self realignText]; - } -} - -- (void) setText:(NSString *)text { - [super setText:text]; - [self realignText]; -} - -- (void) realignText { - CGRect oldFrame = [self frame]; - - _sizedtofit_flag = YES; - [self sizeToFit]; // shrink down size so I can right align it - - CGRect newFrame = [self frame]; - - oldFrame.origin.x = _savedRightEdgeX - newFrame.size.width; - oldFrame.size.width = newFrame.size.width; - [super setFrame:oldFrame]; - _sizedtofit_flag = NO; -} - -@end -/* }}} */ +extern "C" void UISetColor(CGColorRef color); /* Random Global Variables {{{ */ static const int PulseInterval_ = 50000; static const int ButtonBarHeight_ = 48; -static const float KeyboardTime_ = 0.4f; -static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist"; +static const float KeyboardTime_ = 0.3f; -#ifndef Cydia_ -#define Cydia_ "" -#endif +#define SpringBoard_ "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist" +#define SandboxTemplate_ "/usr/share/sandbox/SandboxTemplate.sb" +#define NotifyConfig_ "/etc/notify.conf" + +static bool Queuing_; +static CGColor Blue_; static CGColor Blueish_; static CGColor Black_; -static CGColor Clear_; -static CGColor Red_; +static CGColor Off_; 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_; @@ -412,35 +952,43 @@ static BOOL Advanced_; static BOOL Loaded_; static BOOL Ignored_; -const char *Firmware_ = NULL; -const char *Machine_ = NULL; -const char *SerialNumber_ = NULL; +static UIFont *Font12_; +static UIFont *Font12Bold_; +static UIFont *Font14_; +static UIFont *Font18Bold_; +static UIFont *Font22Bold_; -unsigned Major_; -unsigned Minor_; -unsigned BugFix_; +static const char *Machine_ = NULL; +static const NSString *UniqueID_ = nil; +static const NSString *Build_ = nil; +static const NSString *Product_ = nil; +static const NSString *Safari_ = nil; CFLocaleRef Locale_; CGColorSpaceRef space_; -#define FW_LEAST(major, minor, bugfix) \ - (major < Major_ || major == Major_ && \ - (minor < Minor_ || minor == Minor_ && \ - bugfix <= BugFix_)) - bool bootstrap_; bool reload_; +static NSDictionary *SectionMap_; static NSMutableDictionary *Metadata_; -static NSMutableDictionary *Packages_; +static _transient NSMutableDictionary *Settings_; +static _transient NSString *Role_; +static _transient NSMutableDictionary *Packages_; +static _transient NSMutableDictionary *Sections_; +static _transient NSMutableDictionary *Sources_; static bool Changed_; static NSDate *now_; +#if RecycleWebViews +static NSMutableArray *Documents_; +#endif + NSString *GetLastUpdate() { NSDate *update = [Metadata_ objectForKey:@"LastUpdate"]; if (update == nil) - return @"Never or Unknown"; + return CYLocalize("NEVER_OR_UNKNOWN"); CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle); CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update); @@ -455,7 +1003,12 @@ 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; @@ -464,7 +1017,7 @@ 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) { @@ -474,41 +1027,36 @@ NSString *StripVersion(NSString *version) { return version; } -static const float TextViewOffset_ = 22; - -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]; - - [text setBackgroundColor:Clear_]; - - CGRect frame = [text frame]; - [text setFrame:frame]; - CGRect rect = [text visibleTextRect]; - frame.size.height = rect.size.height; - [text setFrame:frame]; - - return text; +NSString *LocalizeSection(NSString *section) { + return section; } NSString *Simplify(NSString *title) { const char *data = [title UTF8String]; size_t size = [title length]; - Pcre title_r("^(.*?)( \\(.*\\))?$"); + static Pcre square_r("^\\[(.*)\\]$"); + if (square_r(data, size)) + return Simplify(square_r[1]); + + static Pcre paren_r("^\\((.*)\\)$"); + if (paren_r(data, size)) + return Simplify(paren_r[1]); + + static Pcre title_r("^(.*?) \\(.*\\)$"); if (title_r(data, size)) - return title_r[1]; - else - return title; + return Simplify(title_r[1]); + + return title; } /* }}} */ +bool isSectionVisible(NSString *section) { + NSDictionary *metadata = [Sections_ objectForKey:section]; + NSNumber *hidden = metadata == nil ? nil : [metadata objectForKey:@"Hidden"]; + return hidden == nil || ![hidden boolValue]; +} + /* Delegate Prototypes {{{ */ @class Package; @class Source; @@ -531,7 +1079,9 @@ NSString *Simplify(NSString *title) { - (void) setProgressError:(NSString *)error forPackage:(NSString *)id; - (void) setProgressTitle:(NSString *)title; - (void) setProgressPercent:(float)percent; +- (void) startProgress; - (void) addProgressOutput:(NSString *)output; +- (bool) isCancelling:(size_t)received; @end @protocol ConfigurationDelegate @@ -539,11 +1089,25 @@ NSString *Simplify(NSString *title) { - (void) setConfigurationData:(NSString *)data; @end +@class PackageView; + @protocol CydiaDelegate +- (void) setPackageView:(PackageView *)view; +- (void) clearPackage:(Package *)package; - (void) installPackage:(Package *)package; - (void) removePackage:(Package *)package; -- (void) slideUp:(UIAlertSheet *)alert; +- (void) slideUp:(UIActionSheet *)alert; - (void) distUpgrade; +- (void) updateData; +- (void) syncData; +- (void) askForSettings; +- (UIProgressHUD *) addProgressHUD; +- (void) removeProgressHUD:(UIProgressHUD *)hud; +- (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag; +- (RVPage *) pageForPackage:(NSString *)name; +- (void) openMailToURL:(NSURL *)url; +- (void) clearFirstResponder; +- (PackageView *) packageView; @end /* }}} */ @@ -572,6 +1136,7 @@ class Status : } virtual void Fetch(pkgAcquire::ItemDesc &item) { + //NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]); [delegate_ setProgressTitle:[NSString stringWithUTF8String:("Downloading " + item.ShortDesc).c_str()]]; } @@ -585,8 +1150,19 @@ class Status : ) return; + 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(_setProgressError:) - withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()], nil] + withObject:[NSArray arrayWithObjects: + [NSString stringWithUTF8String:error.c_str()], + source, + nil] waitUntilDone:YES ]; } @@ -600,10 +1176,11 @@ class Status : ); [delegate_ setProgressPercent:percent]; - return value; + return [delegate_ isCancelling:CurrentBytes] ? false : value; } virtual void Start() { + [delegate_ startProgress]; } virtual void Stop() { @@ -619,8 +1196,8 @@ class Progress : protected: virtual void Update() { - [delegate_ setProgressTitle:[NSString stringWithUTF8String:Op.c_str()]]; - [delegate_ setProgressPercent:(Percent / 100)]; + /*[delegate_ setProgressTitle:[NSString stringWithUTF8String:Op.c_str()]]; + [delegate_ setProgressPercent:(Percent / 100)];*/ } public: @@ -634,13 +1211,18 @@ class Progress : } virtual void Done() { - [delegate_ setProgressPercent:1]; + //[delegate_ setProgressPercent:1]; } }; /* }}} */ /* Database Interface {{{ */ @interface Database : NSObject { + NSZone *zone_; + apr_pool_t *pool_; + + unsigned era_; + pkgCacheFile cache_; pkgDepCache::Policy *policy_; pkgRecords *records_; @@ -662,6 +1244,9 @@ class Progress : FILE *input_; } ++ (Database *) sharedInstance; +- (unsigned) era; + - (void) _readCydia:(NSNumber *)fd; - (void) _readStatus:(NSNumber *)fd; - (void) _readOutput:(NSNumber *)fd; @@ -670,13 +1255,14 @@ 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; @@ -697,6 +1283,7 @@ class Progress : NSString *description_; NSString *label_; NSString *origin_; + NSString *support_; NSString *uri_; NSString *distribution_; @@ -705,89 +1292,153 @@ class Progress : NSString *defaultIcon_; + NSDictionary *record_; BOOL trusted_; } - (Source *) initWithMetaIndex:(metaIndex *)index; +- (NSComparisonResult) compareByNameAndType:(Source *)source; + +- (NSString *) supportForPackage:(NSString *)package; + +- (NSDictionary *) record; - (BOOL) trusted; - (NSString *) uri; - (NSString *) distribution; - (NSString *) type; +- (NSString *) key; +- (NSString *) host; +- (NSString *) name; - (NSString *) description; - (NSString *) label; - (NSString *) origin; - (NSString *) version; - (NSString *) defaultIcon; + @end @implementation Source -- (void) dealloc { - [uri_ release]; - [distribution_ release]; - [type_ release]; +#define _clear(field) \ + if (field != nil) \ + [field release]; \ + field = nil; - 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]; +- (void) _clear { + _clear(uri_) + _clear(distribution_) + _clear(type_) + + _clear(description_) + _clear(label_) + _clear(origin_) + _clear(support_) + _clear(version_) + _clear(defaultIcon_) + _clear(record_) +} +- (void) dealloc { + [self _clear]; [super dealloc]; } -- (Source *) initWithMetaIndex:(metaIndex *)index { - if ((self = [super init]) != nil) { - trusted_ = index->IsTrusted(); ++ (NSArray *) _attributeKeys { + return [NSArray arrayWithObjects:@"description", @"distribution", @"host", @"key", @"label", @"name", @"origin", @"trusted", @"type", @"uri", @"version", nil]; +} - uri_ = [[NSString stringWithUTF8String:index->GetURI().c_str()] retain]; - distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain]; - type_ = [[NSString stringWithUTF8String:index->GetType()] retain]; +- (NSArray *) attributeKeys { + return [[self class] _attributeKeys]; +} - description_ = nil; - label_ = nil; - origin_ = nil; - version_ = nil; - defaultIcon_ = nil; - - 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; ++ (BOOL) isKeyExcludedFromWebScript:(const char *)name { + return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name]; +} - 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]; - } +- (void) setMetaIndex:(metaIndex *)index { + [self _clear]; + + trusted_ = index->IsTrusted(); + + uri_ = [[NSString stringWithUTF8String:index->GetURI().c_str()] retain]; + distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain]; + type_ = [[NSString stringWithUTF8String:index->GetType()] retain]; + + debReleaseIndex *dindex(dynamic_cast(index)); + if (dindex != NULL) { + std::ifstream release(dindex->MetaIndexFile("Release").c_str()); + std::string line; + while (std::getline(release, line)) { + std::string::size_type colon(line.find(':')); + if (colon == std::string::npos) + continue; + + std::string name(line.substr(0, colon)); + std::string value(line.substr(colon + 1)); + while (!value.empty() && value[0] == ' ') + value = value.substr(1); + + if (name == "Default-Icon") + defaultIcon_ = [[NSString stringWithUTF8String:value.c_str()] retain]; + else if (name == "Description") + description_ = [[NSString stringWithUTF8String:value.c_str()] retain]; + else if (name == "Label") + label_ = [[NSString stringWithUTF8String:value.c_str()] retain]; + else if (name == "Origin") + origin_ = [[NSString stringWithUTF8String:value.c_str()] retain]; + else if (name == "Support") + support_ = [[NSString stringWithUTF8String:value.c_str()] retain]; + else if (name == "Version") + version_ = [[NSString stringWithUTF8String:value.c_str()] retain]; } + } + + record_ = [Sources_ objectForKey:[self key]]; + if (record_ != nil) + record_ = [record_ retain]; +} + +- (Source *) initWithMetaIndex:(metaIndex *)index { + if ((self = [super init]) != nil) { + [self setMetaIndex:index]; } return self; } +- (NSComparisonResult) compareByNameAndType:(Source *)source { + NSDictionary *lhr = [self record]; + NSDictionary *rhr = [source record]; + + if (lhr != rhr) + return lhr == nil ? NSOrderedDescending : NSOrderedAscending; + + NSString *lhs = [self name]; + NSString *rhs = [source name]; + + if ([lhs length] != 0 && [rhs length] != 0) { + unichar lhc = [lhs characterAtIndex:0]; + unichar rhc = [rhs characterAtIndex:0]; + + if (isalpha(lhc) && !isalpha(rhc)) + return NSOrderedAscending; + else if (!isalpha(lhc) && isalpha(rhc)) + return NSOrderedDescending; + } + + return [lhs compare:rhs options:LaxCompareOptions_]; +} + +- (NSString *) supportForPackage:(NSString *)package { + return support_ == nil ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package]; +} + +- (NSDictionary *) record { + return record_; +} + - (BOOL) trusted { return trusted_; } @@ -804,12 +1455,24 @@ class Progress : return type_; } +- (NSString *) key { + return [NSString stringWithFormat:@"%@:%@:%@", type_, uri_, distribution_]; +} + +- (NSString *) host { + return [[[NSURL URLWithString:[self uri]] host] lowercaseString]; +} + +- (NSString *) name { + return origin_ == nil ? [self host] : origin_; +} + - (NSString *) description { return description_; } - (NSString *) label { - return label_; + return label_ == nil ? [self host] : label_; } - (NSString *) origin { @@ -862,36 +1525,9 @@ 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_; + pkgCache::PkgIterator iterator_; _transient Database *database_; pkgCache::VerIterator version_; @@ -900,31 +1536,56 @@ NSString *Scour(const char *field, const char *begin, const char *end) { Source *source_; bool cached_; + CYString section_; + NSString *section$_; + bool essential_; + NSString *latest_; NSString *installed_; NSString *id_; - NSString *name_; - NSString *tagline_; - NSString *icon_; - NSString *website_; - Address *author_; + CYString name_; + CYString tagline_; + CYString icon_; + CYString depiction_; + CYString homepage_; + + CYString sponsor_; + Address *sponsor$_; + + CYString author_; + Address *author$_; + + CYString support_; + NSArray *tags_; + NSString *role_; NSArray *relationships_; + NSMutableDictionary *metadata_; } -- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database; -+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database; +- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator 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; - (NSString *) section; +- (NSString *) simpleSection; + +- (NSString *) longSection; +- (NSString *) shortSection; + +- (NSString *) uri; + - (Address *) maintainer; - (size_t) size; - (NSString *) description; -- (NSString *) index; +- (unichar) index; +- (NSMutableDictionary *) metadata; - (NSDate *) seen; +- (BOOL) subscribed; +- (BOOL) ignored; - (NSString *) latest; - (NSString *) installed; @@ -933,6 +1594,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) { - (BOOL) upgradableAndEssential:(BOOL)essential; - (BOOL) essential; - (BOOL) broken; +- (BOOL) unfiltered; +- (BOOL) visible; - (BOOL) half; - (BOOL) halfConfigured; @@ -943,115 +1606,320 @@ NSString *Scour(const char *field, const char *begin, const char *end) { - (NSString *) id; - (NSString *) name; - (NSString *) tagline; -- (NSString *) icon; -- (NSString *) website; +- (UIImage *) icon; +- (NSString *) homepage; +- (NSString *) depiction; - (Address *) author; +- (NSString *) support; + +- (NSArray *) files; - (NSArray *) relationships; +- (NSArray *) warnings; +- (NSArray *) applications; - (Source *) source; +- (NSString *) role; - (BOOL) matches:(NSString *)text; +- (bool) hasSupportingRole; +- (BOOL) hasTag:(NSString *)tag; +- (NSString *) primaryPurpose; +- (NSArray *) purposes; +- (bool) isCommercial; + +- (uint32_t) compareByPrefix; - (NSComparisonResult) compareByName:(Package *)package; -- (NSComparisonResult) compareBySection:(Package *)package; -- (NSComparisonResult) compareBySectionAndName:(Package *)package; -- (NSComparisonResult) compareForChanges:(Package *)package; +- (uint32_t) compareBySection:(NSArray *)sections; + +- (uint32_t) compareForChanges; - (void) install; - (void) remove; -- (NSNumber *) isSearchedForBy:(NSString *)search; -- (NSNumber *) isInstalledInSection:(NSString *)section; -- (NSNumber *) isUninstalledInSection:(NSString *)section; +- (bool) isUnfilteredAndSearchedForBy:(NSString *)search; +- (bool) isInstalledAndVisible:(NSNumber *)number; +- (bool) isVisiblyUninstalledInSection:(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; +} + @implementation Package - (void) dealloc { if (source_ != nil) [source_ release]; + if (section$_ != nil) + [section$_ release]; [latest_ release]; if (installed_ != nil) [installed_ release]; [id_ release]; - if (name_ != nil) - [name_ release]; - [tagline_ release]; - if (icon_ != nil) - [icon_ release]; - if (website_ != nil) - [website_ release]; - if (author_ != nil) - [author_ release]; + if (sponsor$_ != nil) + [sponsor$_ release]; + if (author$_ != nil) + [author$_ release]; + if (tags_ != nil) + [tags_ release]; + if (role_ != nil) + [role_ release]; if (relationships_ != nil) [relationships_ release]; + if (metadata_ != nil) + [metadata_ release]; [super dealloc]; } -- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database { ++ (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:@"applications", @"author", @"depiction", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"longSection", @"maintainer", @"mode", @"name", @"purposes", @"section", @"shortSection", @"simpleSection", @"size", @"source", @"sponsor", @"support", @"tagline", @"warnings", nil]; +} + +- (NSArray *) attributeKeys { + return [[self class] _attributeKeys]; +} + ++ (BOOL) isKeyExcludedFromWebScript:(const char *)name { + return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name]; +} + +- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database { if ((self = [super init]) != nil) { + _profile(Package$initWithIterator) + @synchronized (database) { + era_ = [database era]; + iterator_ = iterator; database_ = database; - version_ = [database_ policy]->GetCandidateVer(iterator_); - latest_ = version_.end() ? nil : [StripVersion([NSString stringWithUTF8String:version_.VerStr()]) retain]; + _profile(Package$initWithIterator$Control) + _end - if (!version_.end()) - file_ = version_.FileList(); - else { - pkgCache &cache([database_ cache]); - file_ = pkgCache::VerFileIterator(cache, cache.VerFileP); - } + _profile(Package$initWithIterator$Version) + version_ = [database_ policy]->GetCandidateVer(iterator_); + _end - pkgCache::VerIterator current = iterator_.CurrentVer(); - installed_ = current.end() ? nil : [StripVersion([NSString stringWithUTF8String:current.VerStr()]) retain]; - - id_ = [[[NSString stringWithUTF8String:iterator_.Name()] lowercaseString] retain]; - - 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]; - website_ = Scour("Homepage", begin, end); - if (website_ == nil) - website_ = Scour("Website", begin, end); - if (website_ != nil) - website_ = [website_ retain]; - NSString *author = Scour("Author", begin, end); - if (author != nil) - author_ = [Address addressWithString:author]; - } + NSString *latest = version_.end() ? nil : [NSString stringWithUTF8String:version_.VerStr()]; - NSMutableDictionary *metadata = [Packages_ objectForKey:id_]; - if (metadata == nil || [metadata count] == 0) { - metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys: - now_, @"FirstSeen", - nil]; + _profile(Package$initWithIterator$Latest) + latest_ = latest == nil ? nil : [StripVersion(latest) retain]; + _end - [Packages_ setObject:metadata forKey:id_]; - Changed_ = true; - } - } return self; + pkgCache::VerIterator current; + NSString *installed; + + _profile(Package$initWithIterator$Current) + current = iterator_.CurrentVer(); + installed = current.end() ? nil : [NSString stringWithUTF8String:current.VerStr()]; + _end + + _profile(Package$initWithIterator$Installed) + installed_ = [StripVersion(installed) retain]; + _end + + _profile(Package$initWithIterator$File) + if (!version_.end()) + file_ = version_.FileList(); + else { + pkgCache &cache([database_ cache]); + file_ = pkgCache::VerFileIterator(cache, cache.VerFileP); + } + _end + + _profile(Package$initWithIterator$Name) + id_ = [[NSString stringWithUTF8String:iterator_.Name()] retain]; + _end + + if (!file_.end()) + _profile(Package$initWithIterator$Parse) + pkgRecords::Parser *parser; + + _profile(Package$initWithIterator$Parse$Lookup) + parser = &[database_ records]->Lookup(file_); + _end + + const char *begin, *end; + parser->GetRec(begin, end); + + CYString website; + CYString tag; + + struct { + const char *name_; + CYString *value_; + } names[] = { + {"name", &name_}, + {"icon", &icon_}, + {"depiction", &depiction_}, + {"homepage", &homepage_}, + {"website", &website}, + {"support", &support_}, + {"sponsor", &sponsor_}, + {"author", &author_}, + {"tag", &tag}, + }; + + while (begin != end) + if (*begin == '\n') { + ++begin; + continue; + } else if (isblank(*begin)) next: { + begin = static_cast(memchr(begin + 1, '\n', end - begin - 1)); + if (begin == NULL) + break; + } else if (const char *colon = static_cast(memchr(begin, ':', end - begin))) { + const char *name(begin); + size_t size(colon - begin); + + begin = static_cast(memchr(begin, '\n', end - begin)); + + { + const char *stop(begin == NULL ? end : begin); + while (stop[-1] == '\r') + --stop; + while (++colon != stop && isblank(*colon)); + + for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i) + if (strncasecmp(names[i].name_, name, size) == 0) { + CYString &value(*names[i].value_); + + _profile(Package$initWithIterator$Parse$Value) + value.set(pool, colon, stop - colon); + _end + + break; + } + } + + if (begin == NULL) + break; + ++begin; + } else goto next; + + _profile(Package$initWithIterator$Parse$Tagline) + tagline_.set(pool, parser->ShortDesc()); + _end + + _profile(Package$initWithIterator$Parse$Retain) + if (!homepage_.empty()) + homepage_ = website; + if (homepage_ == depiction_) + homepage_.clear(); + if (!tag.empty()) + tags_ = [[tag componentsSeparatedByString:@", "] retain]; + _end + _end + + _profile(Package$initWithIterator$Tags) + if (tags_ != nil) + for (NSString *tag in tags_) + if ([tag hasPrefix:@"role::"]) { + role_ = [[tag substringFromIndex:6] retain]; + break; + } + _end + + NSString *solid(latest == nil ? installed : latest); + bool changed(false); + + NSString *key([id_ lowercaseString]); + + _profile(Package$initWithIterator$Metadata) + metadata_ = [Packages_ objectForKey:key]; + if (metadata_ == nil) { + metadata_ = [[NSMutableDictionary dictionaryWithObjectsAndKeys: + now_, @"FirstSeen", + nil] mutableCopy]; + + if (solid != nil) + [metadata_ setObject:solid forKey:@"LastVersion"]; + changed = true; + } else { + NSDate *first([metadata_ objectForKey:@"FirstSeen"]); + NSDate *last([metadata_ objectForKey:@"LastSeen"]); + NSString *version([metadata_ objectForKey:@"LastVersion"]); + + if (first == nil) { + first = last == nil ? now_ : last; + [metadata_ setObject:first forKey:@"FirstSeen"]; + changed = true; + } + + if (solid != nil) + if (version == nil) { + [metadata_ setObject:solid forKey:@"LastVersion"]; + changed = true; + } else if (![version isEqualToString:solid]) { + [metadata_ setObject:solid forKey:@"LastVersion"]; + last = now_; + [metadata_ setObject:last forKey:@"LastSeen"]; + changed = true; + } + } + + metadata_ = [metadata_ retain]; + + if (changed) { + [Packages_ setObject:metadata_ forKey:key]; + Changed_ = true; + } + _end + + _profile(Package$initWithIterator$Section) + section_.set(pool, iterator_.Section()); + _end + + essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"]; + } _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 { return [[[Package alloc] - initWithIterator:iterator + initWithIterator:iterator + withZone:zone + inPool:pool database:database ] autorelease]; } @@ -1061,15 +1929,58 @@ NSString *Scour(const char *field, const char *begin, const char *end) { } - (NSString *) section { - const char *section = iterator_.Section(); - return section == NULL ? nil : [[NSString stringWithUTF8String:section] stringByReplacingCharacter:'_' withCharacter:' ']; + if (section$_ == nil) { + if (section_.empty()) + return nil; + + 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; + } + + section$_ = [[name stringByReplacingCharacter:'_' withCharacter:' '] retain]; + } return section$_; +} + +- (NSString *) simpleSection { + if (NSString *section = [self section]) + return Simplify(section); + else + return nil; +} + +- (NSString *) longSection { + return LocalizeSection(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 { @@ -1088,7 +1999,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]; } @@ -1096,13 +2007,46 @@ 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"; +- (unichar) index { + _profile(Package$index) + NSString *name([self name]); + if ([name length] == 0) + return '#'; + unichar character([name characterAtIndex:0]); + if (!isalpha(character)) + return '#'; + return toupper(character); + _end +} + +- (NSMutableDictionary *) metadata { + if (metadata_ == nil) + metadata_ = [[Packages_ objectForKey:[id_ lowercaseString]] retain]; + return metadata_; } - (NSDate *) seen { - return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"]; + NSDictionary *metadata([self metadata]); + if ([self subscribed]) + if (NSDate *last = [metadata objectForKey:@"LastSeen"]) + return last; + return [metadata objectForKey:@"FirstSeen"]; +} + +- (BOOL) subscribed { + NSDictionary *metadata([self metadata]); + if (NSNumber *subscribed = [metadata objectForKey:@"IsSubscribed"]) + return [subscribed boolValue]; + else + return false; +} + +- (BOOL) ignored { + NSDictionary *metadata([self metadata]); + if (NSNumber *ignored = [metadata objectForKey:@"IsIgnored"]) + return [ignored boolValue]; + else + return false; } - (NSString *) latest { @@ -1120,22 +2064,31 @@ NSString *Scour(const char *field, const char *begin, const char *end) { - (BOOL) upgradableAndEssential:(BOOL)essential { pkgCache::VerIterator current = iterator_.CurrentVer(); + bool value; if (current.end()) - return essential && [self essential]; - else { - pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_); - return !candidate.end() && candidate != current; - } + value = essential && [self essential] && [self visible]; + else + value = !version_.end() && version_ != current;// && (!essential || ![database_ cache][iterator_].Keep()); + return value; } - (BOOL) essential { - return (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES; + return essential_; } - (BOOL) broken { return [database_ cache][iterator_].InstBroken(); } +- (BOOL) unfiltered { + NSString *section = [self section]; + return section == nil || isSectionVisible(section); +} + +- (BOOL) visible { + return [self hasSupportingRole] && [self unfiltered]; +} + - (BOOL) half { unsigned char current = iterator_->CurrentState; return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled; @@ -1160,28 +2113,28 @@ 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"; + return @"NEW_INSTALL"; default: _assert(false); } @@ -1202,58 +2155,244 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return tagline_; } -- (NSString *) icon { - return icon_; +- (UIImage *) icon { + NSString *section = [self simpleSection]; + + UIImage *icon(nil); + if (icon_ != nil) + 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 { + return homepage_; +} + +- (NSString *) depiction { + return depiction_; } -- (NSString *) website { - return website_; +- (Address *) 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 support_ != nil ? support_ : [[self source] supportForPackage:id_]; +} + +- (NSArray *) files { + NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", 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:CYLocalize("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 _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 (!_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:CYLocalize("FILES_INSTALLED_TO"), @"Cydia.app"]]; + if (_private) + [warnings addObject:[NSString stringWithFormat:CYLocalize("FILES_INSTALLED_TO"), @"/private"]]; + if (stash) + [warnings addObject:[NSString stringWithFormat:CYLocalize("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_; } +- (NSString *) role { + return role_; +} + - (BOOL) matches:(NSString *)text { if (text == nil) return NO; 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 tagline] rangeOfString:text options:MatchCompareOptions_]; if (range.location != NSNotFound) return YES; return NO; } -- (NSComparisonResult) compareByName:(Package *)package { - NSString *lhs = [self name]; - NSString *rhs = [package name]; +- (bool) hasSupportingRole { + if (role_ == nil) + return true; + if ([role_ isEqualToString:@"enduser"]) + return true; + if ([Role_ isEqualToString:@"User"]) + return false; + if ([role_ isEqualToString:@"hacker"]) + return true; + if ([Role_ isEqualToString:@"Hacker"]) + return false; + if ([role_ isEqualToString:@"developer"]) + return true; + if ([Role_ isEqualToString:@"Developer"]) + return false; + _assert(false); +} - if ([lhs length] != 0 && [rhs length] != 0) { - unichar lhc = [lhs characterAtIndex:0]; +- (BOOL) hasTag:(NSString *)tag { + return tags_ == nil ? NO : [tags_ containsObject:tag]; +} + +- (NSString *) primaryPurpose { + for (NSString *tag in tags_) + if ([tag hasPrefix:@"purpose::"]) + return [tag substringFromIndex:9]; + return nil; +} + +- (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; +} + +- (bool) isCommercial { + return [self hasTag:@"cydia::commercial"]; +} + +- (uint32_t) compareByPrefix { + return 0; +} + +- (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]; if (isalpha(lhc) && !isalpha(rhc)) @@ -1262,63 +2401,52 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return NSOrderedDescending; } - return [lhs caseInsensitiveCompare:rhs]; -} + return [lhs compare:rhs options:LaxCompareOptions_];*/ -- (NSComparisonResult) compareBySection:(Package *)package { - NSString *lhs = [self section]; - NSString *rhs = [package section]; + return [lhs compare:rhs]; +} - if (lhs == NULL && rhs != NULL) - return NSOrderedAscending; - else if (lhs != NULL && rhs == NULL) - return NSOrderedDescending; - else if (lhs != NULL && rhs != NULL) { - NSComparisonResult result = [lhs caseInsensitiveCompare:rhs]; - 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 { @@ -1340,22 +2468,40 @@ NSString *Scour(const char *field, const char *begin, const char *end) { [database_ cache]->MarkDelete(iterator_, true); } -- (NSNumber *) isSearchedForBy:(NSString *)search { - return [NSNumber numberWithBool:([self valid] && [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 } -- (NSNumber *) isInstalledInSection:(NSString *)section { - return [NSNumber numberWithBool:([self installed] != nil && (section == nil || [section isEqualToString:[self section]]))]; +- (bool) isInstalledAndVisible:(NSNumber *)number { + return (![number boolValue] || [self visible]) && [self installed] != nil; } -- (NSNumber *) isUninstalledInSection:(NSString *)name { +- (bool) isVisiblyUninstalledInSection:(NSString *)name { NSString *section = [self section]; - return [NSNumber numberWithBool:([self valid] && [self installed] == nil && ( - (name == nil || - section == nil && [name length] == 0 || - [name isEqualToString:section]) - ))]; + return + [self visible] && + [self installed] == nil && ( + name == nil || + section == nil && [name length] == 0 || + [name isEqualToString:section] + ); +} + +- (bool) isVisibleInSource:(Source *)source { + return [self source] == source && [self visible]; } @end @@ -1363,28 +2509,73 @@ 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; +- (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; + @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]; + + if ([lhs length] != 0 && [rhs length] != 0) { + unichar lhc = [lhs characterAtIndex:0]; + unichar rhc = [rhs characterAtIndex:0]; + + if (isalpha(lhc) && !isalpha(rhc)) + return NSOrderedAscending; + else if (!isalpha(lhc) && isalpha(rhc)) + return NSOrderedDescending; + } + + return [lhs compare:rhs options:LaxCompareOptions_]; +} + +- (Section *) initWithName:(NSString *)name { + return [self initWithName:name row:0]; +} + - (Section *) initWithName:(NSString *)name row:(size_t)row { if ((self = [super init]) != nil) { name_ = [name retain]; + index_ = '\0'; + row_ = row; + localized_ = LocalizeSection(name_); + } return self; +} + +/* XXX: localize the index thingees */ +- (Section *) initWithIndex:(unichar)index row:(size_t)row { + if ((self = [super init]) != nil) { + name_ = [(index == '#' ? @"123" : [NSString stringWithCharacters:&index length:1]) retain]; + index_ = index; row_ = row; } return self; } @@ -1393,6 +2584,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return name_; } +- (unichar) index { + return index_; +} + - (size_t) row { return row_; } @@ -1401,52 +2596,85 @@ 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 /* }}} */ +static int Finish_; +static NSArray *Finishes_; + /* 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; + static Pcre finish_r("^finish:([^:]*)$"); + while (std::getline(is, line)) { const char *data(line.c_str()); - //size_t size = line.size(); - fprintf(stderr, "C:%s\n", data); + size_t size = line.size(); + lprintf("C:%s\n", data); + + if (finish_r(data, size)) { + NSString *finish = finish_r[1]; + int index = [Finishes_ indexOfObject:finish]; + if (index != INT_MAX && index > Finish_) + Finish_ = index; + } } - [pool release]; _assert(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; - Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$"); - Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$"); + static Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$"); + static Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$"); while (std::getline(is, line)) { const char *data(line.c_str()); size_t size = line.size(); - fprintf(stderr, "S:%s\n", data); + lprintf("S:%s\n", data); if (conffile_r(data, size)) { [delegate_ setConfigurationData:conffile_r[1]]; @@ -1467,31 +2695,27 @@ NSString *Scour(const char *field, const char *begin, const char *end) { 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); } - [pool release]; _assert(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); } @@ -1503,7 +2727,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { 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 { @@ -1514,6 +2738,9 @@ NSString *Scour(const char *field, const char *begin, const char *end) { fetcher_ = NULL; lock_ = NULL; + zone_ = NSCreateZone(1024 * 1024, 256 * 1024, NO); + apr_pool_create(&pool_, NULL); + sources_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain]; packages_ = [[NSMutableArray arrayWithCapacity:16] retain]; @@ -1523,7 +2750,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { cydiafd_ = fds[1]; _config->Set("APT::Keep-Fds::", cydiafd_); - setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 0"] UTF8String], _not(int)); + setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 1"] UTF8String], _not(int)); [NSThread detachNewThreadSelector:@selector(_readCydia:) @@ -1578,11 +2805,87 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return *fetcher_; } +- (pkgSourceList &) list { + return *list_; +} + - (NSArray *) packages { return packages_; } -- (void) reloadData { +- (NSArray *) sources { + return [sources_ allValues]; +} + +- (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()]]; + + Package *package([self packageWithName:[NSString stringWithUTF8String:start.TargetPkg().Name()]]); + [failure addObject:[package 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; +} + +- (void) reloadData { _pooled + @synchronized (self) { + ++era_; + } + _error->Discard(); delete list_; @@ -1601,12 +2904,16 @@ NSString *Scour(const char *field, const char *begin, const char *end) { cache_.Close(); + apr_pool_clear(pool_); + NSRecycleZone(zone_); + + _trace(); if (!cache_.Open(progress_, true)) { std::string error; if (!_error->PopMessage(error)) _assert(false); _error->Discard(); - fprintf(stderr, "cache_.Open():[%s]\n", error.c_str()); + 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)]; @@ -1619,6 +2926,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return; } + _trace(); now_ = [[NSDate date] retain]; @@ -1651,11 +2959,16 @@ NSString *Scour(const char *field, const char *begin, const char *end) { } [packages_ removeAllObjects]; + _trace(); for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator) - if (Package *package = [Package packageWithIterator:iterator database:self]) + if (Package *package = [Package packageWithIterator:iterator withZone:zone_ inPool:pool_ database:self]) [packages_ addObject:package]; - + _trace(); [packages_ sortUsingSelector:@selector(compareByName:)]; + _trace(); + + _config->Set("Acquire::http::Timeout", 15); + _config->Set("Acquire::http::MaxParallel", 4); } - (void) configure { @@ -1686,7 +2999,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { 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()); + lprintf("ArchiveCleaner: %s\n", error.c_str()); } } @@ -1714,18 +3027,52 @@ NSString *Scour(const char *field, const char *begin, const char *end) { [before addObject:[NSString stringWithUTF8String:(*source)->GetURI().c_str()]]; } - if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue) + if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue) { + _trace(); + return; + } + + bool failed = false; + for (pkgAcquire::ItemIterator item = fetcher_->ItemsBegin(); item != fetcher_->ItemsEnd(); item++) { + if ((*item)->Status == pkgAcquire::Item::StatDone && (*item)->Complete) + continue; + + std::string uri = (*item)->DescURI(); + std::string error = (*item)->ErrorText; + + 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] + waitUntilDone:YES + ]; + } + + if (failed) { + _trace(); return; + } _system->UnLock(); pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_); - if (result == pkgPackageManager::Failed) + if (_error->PendingError()) { + _trace(); return; - if (_error->PendingError()) + } + + if (result == pkgPackageManager::Failed) { + _trace(); return; - if (result != pkgPackageManager::Completed) + } + + if (result != pkgPackageManager::Completed) { + _trace(); return; + } NSMutableArray *after = [NSMutableArray arrayWithCapacity:16]; { pkgSourceList list; @@ -1790,60 +3137,29 @@ NSString *Scour(const char *field, const char *begin, const char *end) { @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:blue]; -} - -@protocol ConfirmationViewDelegate -- (void) cancel; -- (void) confirm; -@end - -@interface ConfirmationView : UIView { - Database *database_; - id delegate_; +/* PopUp Windows {{{ */ +@interface PopUpView : UIView { + _transient id delegate_; UITransitionView *transition_; UIView *overlay_; - UINavigationBar *navbar_; - UIPreferencesTable *table_; - NSMutableDictionary *fields_; - UIAlertSheet *essential_; } - (void) cancel; - -- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate; +- (id) initWithView:(UIView *)view delegate:(id)delegate; @end -@implementation ConfirmationView +@implementation PopUpView - (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]; [super dealloc]; } - (void) cancel { - [transition_ transition:7 toView:nil]; - [delegate_ cancel]; + [transition_ transition:UITransitionPushFromTop toView:nil]; } - (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to { @@ -1851,141 +3167,188 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString [self removeFromSuperview]; } -- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button { - switch (button) { - case 0: - if (essential_ != nil) - [essential_ popupAlertAnimated:YES]; - else - [delegate_ confirm]; - break; +- (id) initWithView:(UIView *)view delegate:(id)delegate { + if ((self = [super initWithFrame:[view bounds]]) != nil) { + delegate_ = delegate; - case 1: - [self cancel]; - break; - } -} + transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]]; + [self addSubview:transition_]; -- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button { - NSString *context = [sheet context]; + overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]]; - if ([context isEqualToString:@"remove"]) - switch (button) { - case 1: - [self cancel]; - break; - case 2: - [delegate_ confirm]; - break; - default: - _assert(false); - } - else if ([context isEqualToString:@"unable"]) - [self cancel]; + [view addSubview:self]; - [sheet dismiss]; -} + [transition_ setDelegate:self]; -- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table { - return 2; + UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease]; + [transition_ transition:UITransitionNone toView:blank]; + [transition_ transition:UITransitionPushFromBottom toView:overlay_]; + } return self; } -- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group { - switch (group) { - case 0: return @"Statistics"; - case 1: return @"Modifications"; +@end +/* }}} */ - default: _assert(false); - } +#if 0 +/* Mail Composition {{{ */ +@interface MailToView : PopUpView { + MailComposeController *controller_; } -- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group { - switch (group) { - case 0: return 3; - case 1: return [fields_ count]; +- (id) initWithView:(UIView *)view delegate:(id)delegate url:(NSURL *)url; - default: _assert(false); - } -} +@end -- (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_; - } -} +@implementation MailToView -- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group { - UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease]; - [cell setShowSelection:NO]; +- (void) dealloc { + [controller_ release]; + [super dealloc]; +} - switch (group) { - case 0: switch (row) { - case 0: { - [cell setTitle:@"Downloading"]; - [cell setValue:SizeString([database_ fetcher].FetchNeeded())]; - } break; +- (void) mailComposeControllerWillAttemptToSend:(MailComposeController *)controller { + NSLog(@"will"); +} - case 1: { - [cell setTitle:@"Resuming At"]; - [cell setValue:SizeString([database_ fetcher].PartialPresent())]; - } break; +- (void) mailComposeControllerDidAttemptToSend:(MailComposeController *)controller mailDelivery:(id)delivery { + NSLog(@"did:%@", delivery); +// [UIApp setStatusBarShowsProgress:NO]; +if ([controller error]){ +NSArray *buttons = [NSArray arrayWithObjects:CYLocalize("OK"), nil]; +UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:CYLocalize("ERROR") buttons:buttons defaultButtonIndex:0 delegate:self context:self]; +[mailAlertSheet setBodyText:[controller error]]; +[mailAlertSheet popupAlertAnimated:YES]; +} +} - case 2: { - double size([database_ cache]->UsrSize()); +- (void) showError { + NSLog(@"%@", [controller_ error]); + NSArray *buttons = [NSArray arrayWithObjects:CYLocalize("OK"), nil]; + UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:CYLocalize("ERROR") buttons:buttons defaultButtonIndex:0 delegate:self context:self]; + [mailAlertSheet setBodyText:[controller_ error]]; + [mailAlertSheet popupAlertAnimated:YES]; +} - if (size < 0) { - [cell setTitle:@"Disk Freeing"]; - [cell setValue:SizeString(-size)]; - } else { - [cell setTitle:@"Disk Using"]; - [cell setValue:SizeString(size)]; - } - } break; +- (void) deliverMessage { _pooled + setuid(501); + setgid(501); - default: _assert(false); - } break; + if (![controller_ deliverMessage]) + [self performSelectorOnMainThread:@selector(showError) withObject:nil waitUntilDone:NO]; +} - case 1: - _assert(size_t(row) < [fields_ count]); - [cell setTitle:[[fields_ allKeys] objectAtIndex:row]]; - [cell addSubview:[[fields_ allValues] objectAtIndex:row]]; - break; +- (void) mailComposeControllerCompositionFinished:(MailComposeController *)controller { + if ([controller_ needsDelivery]) + [NSThread detachNewThreadSelector:@selector(deliverMessage) toTarget:self withObject:nil]; + else + [self cancel]; +} - default: _assert(false); - } +- (id) initWithView:(UIView *)view delegate:(id)delegate url:(NSURL *)url { + if ((self = [super initWithView:view delegate:delegate]) != nil) { + controller_ = [[MailComposeController alloc] initForContentSize:[overlay_ bounds].size]; + [controller_ setDelegate:self]; + [controller_ initializeUI]; + [controller_ setupForURL:url]; - return cell; + UIView *view([controller_ view]); + [overlay_ addSubview:view]; + } return self; } -- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate { - if ((self = [super initWithFrame:[view bounds]]) != nil) { - database_ = database; - delegate_ = delegate; +@end +/* }}} */ +#endif - transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]]; - [self addSubview:transition_]; +/* Confirmation View {{{ */ +bool DepSubstrate(const pkgCache::VerIterator &iterator) { + if (!iterator.end()) + for (pkgCache::DepIterator dep(iterator.DependsList()); !dep.end(); ++dep) { + if (dep->Type != pkgCache::Dep::Depends && dep->Type != pkgCache::Dep::PreDepends) + continue; + pkgCache::PkgIterator package(dep.TargetPkg()); + if (package.end()) + continue; + if (strcmp(package.Name(), "mobilesubstrate") == 0) + return true; + } - overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]]; + return false; +} - CGSize navsize = [UINavigationBar defaultSize]; - CGRect navrect = {{0, 0}, navsize}; - CGRect bounds = [overlay_ bounds]; +@protocol ConfirmationViewDelegate +- (void) cancel; +- (void) confirm; +- (void) queue; +@end - navbar_ = [[UINavigationBar alloc] initWithFrame:navrect]; - if (Advanced_) - [navbar_ setBarStyle:1]; - [navbar_ setDelegate:self]; +@interface ConfirmationView : BrowserView { + _transient Database *database_; + UIActionSheet *essential_; + NSArray *changes_; + NSArray *issues_; + NSArray *sizes_; + BOOL substrate_; +} - UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease]; - [navbar_ pushNavigationItem:navitem]; - [navbar_ showButtonsWithLeftTitle:@"Cancel" rightTitle:@"Confirm"]; +- (id) initWithBook:(RVBook *)book database:(Database *)database; - fields_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain]; +@end - NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16]; +@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; + default: + _assert(false); + } + + [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]; @@ -1993,10 +3356,11 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString bool remove(false); + pkgDepCache::Policy *policy([database_ policy]); + pkgCacheFile &cache([database_ cache]); NSArray *packages = [database_ packages]; - for (size_t i(0), e = [packages count]; i != e; ++i) { - Package *package = [packages objectAtIndex:i]; + for (Package *package in packages) { pkgCache::PkgIterator iterator = [package iterator]; pkgDepCache::StateCache &state(cache[iterator]); @@ -2014,17 +3378,22 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString 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_ || true) { - essential_ = [[UIAlertSheet alloc] - initWithTitle:@"Removing Essentials" + NSString *parenthetical(CYLocalize("PARENTHETICAL")); + + essential_ = [[UIActionSheet alloc] + initWithTitle:CYLocalize("REMOVING_ESSENTIALS") buttons:[NSArray arrayWithObjects: - @"Cancel Operation (Safe)", - @"Force Removal (Unsafe)", + [NSString stringWithFormat:parenthetical, CYLocalize("CANCEL_OPERATION"), CYLocalize("SAFE")], + [NSString stringWithFormat:parenthetical, CYLocalize("FORCE_REMOVAL"), CYLocalize("UNSAFE")], nil] defaultButtonIndex:0 delegate:self @@ -2034,45 +3403,79 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString #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."]; + [essential_ setBodyText:CYLocalize("REMOVING_ESSENTIALS_EX")]; } else { - essential_ = [[UIAlertSheet alloc] - initWithTitle:@"Unable to Comply" - buttons:[NSArray arrayWithObjects:@"Okay", nil] + essential_ = [[UIActionSheet alloc] + initWithTitle:CYLocalize("UNABLE_TO_COMPLY") + buttons:[NSArray arrayWithObjects:CYLocalize("OKAY"), nil] defaultButtonIndex:0 delegate:self context:@"unable" ]; - [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."]; + [essential_ setBodyText:CYLocalize("UNABLE_TO_COMPLY_EX")]; } - AddTextView(fields_, installing, @"Installing"); - AddTextView(fields_, reinstalling, @"Reinstalling"); - AddTextView(fields_, upgrading, @"Upgrading"); - AddTextView(fields_, downgrading, @"Downgrading"); - AddTextView(fields_, removing, @"Removing"); + 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"]]]; + } return self; +} - table_ = [[UIPreferencesTable alloc] initWithFrame:CGRectMake( - 0, navsize.height, bounds.size.width, bounds.size.height - navsize.height - )]; +- (NSString *) backButtonTitle { + return CYLocalize("CONFIRM"); +} - [table_ setReusesTableCells:YES]; - [table_ setDataSource:self]; - [table_ reloadData]; +- (NSString *) leftButtonTitle { + return [NSString stringWithFormat:CYLocalize("SLASH_DELIMITED"), CYLocalize("CANCEL"), CYLocalize("QUEUE")]; +} - [overlay_ addSubview:navbar_]; - [overlay_ addSubview:table_]; +- (id) rightButtonTitle { + return issues_ != nil ? nil : [super rightButtonTitle]; +} - [view addSubview:self]; +- (id) _rightButtonTitle { +#if AlwaysReload || IgnoreInstall + return [super _rightButtonTitle]; +#else + return CYLocalize("CONFIRM"); +#endif +} - [transition_ setDelegate:self]; +- (void) _leftButtonClicked { + [self cancel]; +} - UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease]; - [transition_ transition:0 toView:blank]; - [transition_ transition:3 toView:overlay_]; - } return self; +#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 /* }}} */ @@ -2116,8 +3519,6 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString @end /* }}} */ /* Progress View {{{ */ -Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); - @interface ProgressView : UIView < ConfigurationDelegate, ProgressDelegate @@ -2133,6 +3534,10 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); UITextLabel *status_; UIPushButton *close_; id delegate_; + BOOL running_; + SHA1SumValue springlist_; + SHA1SumValue notifyconf_; + SHA1SumValue sandplate_; } - (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to; @@ -2145,6 +3550,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); - (void) _detachNewThreadData:(ProgressData *)data; - (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title; +- (BOOL) isRunning; + @end @protocol ProgressViewDelegate @@ -2186,10 +3593,10 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]]; if (bootstrap_) - [overlay_ setBackgroundColor:Black_]; + [overlay_ setBackgroundColor:[UIColor blackColor]]; else { background_ = [[UIView alloc] initWithFrame:[self bounds]]; - [background_ setBackgroundColor:Black_]; + [background_ setBackgroundColor:[UIColor blackColor]]; [self addSubview:background_]; } @@ -2225,11 +3632,12 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); 24 )]; - [status_ setColor:White_]; - [status_ setBackgroundColor:Clear_]; + [status_ setColor:[UIColor whiteColor]]; + [status_ setBackgroundColor:[UIColor clearColor]]; [status_ setCentersHorizontally:YES]; //[status_ setFont:font]; + _trace(); output_ = [[UITextView alloc] initWithFrame:CGRectMake( 10, @@ -2237,15 +3645,17 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); bounds.size.width - 20, bounds.size.height - navsize.height - 62 - navrect.size.height )]; + _trace(); //[output_ setTextFont:@"Courier New"]; [output_ setTextSize:12]; - [output_ setTextColor:White_]; - [output_ setBackgroundColor:Clear_]; + [output_ setTextColor:[UIColor whiteColor]]; + [output_ setBackgroundColor:[UIColor clearColor]]; [output_ setMarginTop:0]; [output_ setAllowsRubberBanding:YES]; + [output_ setEditable:NO]; [overlay_ addSubview:output_]; @@ -2253,18 +3663,16 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); 10, bounds.size.height - prgsize.height - 50, bounds.size.width - 20, - 26 + prgsize.height + 32 + prgsize.height )]; [close_ setAutosizesToFit:NO]; [close_ setDrawsShadow:YES]; [close_ setStretchBackground:YES]; - [close_ setTitle:@"Close Window"]; [close_ setEnabled:YES]; - GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22); + UIFont *bold = [UIFont boldSystemFontOfSize:22]; [close_ setTitleFont:bold]; - CFRelease(bold); [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside]; [close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0]; @@ -2280,9 +3688,12 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [transition_ transition:6 toView:view_]; } -- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button { - NSString *context = [sheet context]; - if ([context isEqualToString:@"conffile"]) { +- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { + NSString *context([sheet context]); + + if ([context isEqualToString:@"error"]) + [sheet dismiss]; + else if ([context isEqualToString:@"conffile"]) { FILE *input = [database_ input]; switch (button) { @@ -2297,31 +3708,137 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); default: _assert(false); } - } - [sheet dismiss]; + [sheet dismiss]; + } } - (void) closeButtonPushed { - [delegate_ progressViewIsComplete:self]; - [self resetView]; + running_ = NO; + + switch (Finish_) { + case 0: + [self resetView]; + break; + + case 1: + [delegate_ suspendWithAnimation:YES]; + break; + + case 2: + system("launchctl stop com.apple.SpringBoard"); + break; + + case 3: + system("launchctl unload "SpringBoard_"; launchctl load "SpringBoard_); + break; + + case 4: + system("reboot"); + break; + } } - (void) _retachThread { + UINavigationItem *item = [navbar_ topItem]; + [item setTitle:CYLocalize("COMPLETE")]; + [overlay_ addSubview:close_]; [progress_ removeFromSuperview]; [status_ removeFromSuperview]; -} -- (void) _detachNewThreadData:(ProgressData *)data { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [delegate_ progressViewIsComplete:self]; + + if (Finish_ < 4) { + FileFd file(SandboxTemplate_, FileFd::ReadOnly); + MMap mmap(file, MMap::ReadOnly); + SHA1Summation sha1; + sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); + if (!(sandplate_ == sha1.Result())) + Finish_ = 4; + } + + if (Finish_ < 4) { + FileFd file(NotifyConfig_, FileFd::ReadOnly); + MMap mmap(file, MMap::ReadOnly); + SHA1Summation sha1; + sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); + if (!(notifyconf_ == sha1.Result())) + Finish_ = 4; + } + + if (Finish_ < 3) { + FileFd file(SpringBoard_, FileFd::ReadOnly); + MMap mmap(file, MMap::ReadOnly); + SHA1Summation sha1; + sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); + if (!(springlist_ == sha1.Result())) + Finish_ = 3; + } + + switch (Finish_) { + case 0: [close_ setTitle:CYLocalize("RETURN_TO_CYDIA")]; break; + case 1: [close_ setTitle:CYLocalize("CLOSE_CYDIA")]; break; + case 2: [close_ setTitle:CYLocalize("RESTART_SPRINGBOARD")]; break; + case 3: [close_ setTitle:CYLocalize("RELOAD_SPRINGBOARD")]; break; + case 4: [close_ setTitle:CYLocalize("REBOOT_DEVICE")]; break; + } + +#define Cache_ "/User/Library/Caches/com.apple.mobile.installation.plist" + if (NSMutableDictionary *cache = [[NSMutableDictionary alloc] initWithContentsOfFile:@ Cache_]) { + [cache autorelease]; + + NSFileManager *manager = [NSFileManager defaultManager]; + NSError *error = nil; + + id 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]; + if ([info objectForKey:@"CFBundleIdentifier"] != nil) { + [info setObject:path forKey:@"Path"]; + [info setObject:@"System" forKey:@"ApplicationType"]; + [system addInfoDictionary:info]; + } + } + } + } else goto error; + + [cache writeToFile:@Cache_ atomically:YES]; + + if (chown(Cache_, info.st_uid, info.st_gid) == -1) + goto error; + if (chmod(Cache_, info.st_mode) == -1) + goto error; + + if (false) error: + lprintf("%s\n", error == nil ? strerror(errno) : [[error localizedDescription] UTF8String]); + } + + notify_post("com.apple.mobile.application_installed"); + + [delegate_ setStatusBarShowsProgress:NO]; +} + +- (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 { @@ -2336,6 +3853,33 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [overlay_ addSubview:progress_]; [overlay_ addSubview:status_]; + [delegate_ setStatusBarShowsProgress:YES]; + running_ = YES; + + { + FileFd file(SandboxTemplate_, FileFd::ReadOnly); + MMap mmap(file, MMap::ReadOnly); + SHA1Summation sha1; + sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); + sandplate_ = sha1.Result(); + } + + { + FileFd file(NotifyConfig_, FileFd::ReadOnly); + MMap mmap(file, MMap::ReadOnly); + SHA1Summation sha1; + sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); + notifyconf_ = sha1.Result(); + } + + { + FileFd file(SpringBoard_, FileFd::ReadOnly); + MMap mmap(file, MMap::ReadOnly); + SHA1Summation sha1; + sha1.Add(reinterpret_cast(mmap.Data()), mmap.Size()); + springlist_ = sha1.Result(); + } + [transition_ transition:6 toView:overlay_]; [NSThread @@ -2354,7 +3898,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); detachNewThreadSelector:selector toTarget:database_ withObject:nil - title:@"Repairing..." + title:CYLocalize("REPAIRING") ]; } @@ -2369,9 +3913,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); - (void) setProgressError:(NSString *)error forPackage:(NSString *)id { Package *package = id == nil ? nil : [database_ packageWithName:id]; - UIAlertSheet *sheet = [[[UIAlertSheet alloc] - initWithTitle:(package == nil ? @"Source Error" : [package name]) - buttons:[NSArray arrayWithObjects:@"Okay", nil] + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:(package == nil ? id : [package name]) + buttons:[NSArray arrayWithObjects:CYLocalize("OKAY"), nil] defaultButtonIndex:0 delegate:self context:@"error" @@ -2397,6 +3941,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); ]; } +- (void) startProgress { +} + - (void) addProgressOutput:(NSString *)output { [self performSelectorOnMainThread:@selector(_addProgressOutput:) @@ -2405,33 +3952,43 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); ]; } +- (bool) isCancelling:(size_t)received { + return false; +} + - (void) _setConfigurationData:(NSString *)data { + static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); + _assert(conffile_r(data)); NSString *ofile = conffile_r[1]; //NSString *nfile = conffile_r[2]; - UIAlertSheet *sheet = [[[UIAlertSheet alloc] - initWithTitle:@"Configuration Upgrade" + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:CYLocalize("CONFIGURATION_UPGRADE") buttons:[NSArray arrayWithObjects: - @"Keep My Old Copy", - @"Accept The New Copy", - // XXX: @"See What Changed", + CYLocalize("KEEP_OLD_COPY"), + CYLocalize("ACCEPT_NEW_COPY"), + // XXX: CYLocalize("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 setBodyText:[NSString stringWithFormat:@"%@\n\n%@", CYLocalize("CONFIGURATION_UPGRADE_EX"), ofile]]; [sheet popupAlertAnimated:YES]; } - (void) _setProgressTitle:(NSString *)title { - [status_ setText:[title stringByAppendingString:@"..."]]; + 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 { @@ -2445,123 +4002,96 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [output_ scrollRectToVisible:rect animated:YES]; } +- (BOOL) isRunning { + return running_; +} + @end /* }}} */ /* Package Cell {{{ */ @interface PackageCell : UITableCell { - UIImageView *icon_; - UITextLabel *name_; - UITextLabel *description_; - UITextLabel *source_; - //UIImageView *trusted_; + UIImage *icon_; + NSString *name_; + NSString *description_; + bool commercial_; + NSString *source_; + UIImage *badge_; + bool cached_; + Package *package_; #ifdef USE_BADGES - UIImageView *badge_; UITextLabel *status_; #endif - BOOL setup_; } - (PackageCell *) init; - (void) setPackage:(Package *)package; -- (void) _setSelected:(float)fraction; -- (void) setSelected:(BOOL)selected; -- (void) setSelected:(BOOL)selected withFade:(BOOL)fade; -- (void) _setSelectionFadeFraction:(float)fraction; - + (int) heightForPackage:(Package *)package; @end @implementation PackageCell +- (void) clearPackage { + if (icon_ != nil) { + [icon_ release]; + icon_ = nil; + } + + if (name_ != nil) { + [name_ release]; + name_ = nil; + } + + if (description_ != nil) { + [description_ release]; + description_ = nil; + } + + if (source_ != nil) { + [source_ release]; + source_ = nil; + } + + if (badge_ != nil) { + [badge_ release]; + badge_ = nil; + } + + [package_ release]; + package_ = nil; +} + - (void) dealloc { - [icon_ release]; - [name_ release]; - [description_ release]; - [source_ release]; + [self clearPackage]; #ifdef USE_BADGES - [badge_ release]; [status_ release]; #endif - //[trusted_ release]; [super dealloc]; } - (PackageCell *) init { if ((self = [super init]) != nil) { - GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 20); - GSFontRef large = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12); - GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14); - - icon_ = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, 30, 30)]; - - name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 8, 240, 25)]; - [name_ setBackgroundColor:Clear_]; - [name_ setFont:bold]; - - source_ = [[UITextLabel alloc] initWithFrame:CGRectMake(58, 28, 225, 20)]; - [source_ setBackgroundColor:Clear_]; - [source_ setFont:large]; - - description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 46, 280, 20)]; - [description_ setBackgroundColor:Clear_]; - [description_ setFont:small]; - - /*trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)]; - [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];*/ - #ifdef USE_BADGES - badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)]; - status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)]; - [status_ setBackgroundColor:Clear_]; + [status_ setBackgroundColor:[UIColor clearColor]]; [status_ setFont:small]; #endif - - /*[icon_ setImage:[UIImage applicationImageNamed:@"unknown.png"]]; - [icon_ zoomToScale:0.5]; - [icon_ setFrame:CGRectMake(10, 10, 30, 30)];*/ - - [self addSubview:icon_]; - [self addSubview:name_]; - [self addSubview:description_]; - [self addSubview:source_]; - - CFRelease(small); - CFRelease(large); - CFRelease(bold); } return self; } - (void) setPackage:(Package *)package { - /*if (setup_) - return; - else - setup_ = YES;*/ + [self clearPackage]; Source *source = [package source]; - UIImage *image = nil; - if (NSString *icon = [package icon]) - image = [UIImage imageAtPath:[icon substringFromIndex:6]]; - if (image == nil) if (NSString *icon = [source defaultIcon]) - image = [UIImage imageAtPath:[icon substringFromIndex:6]]; - if (image == nil) - image = [UIImage applicationImageNamed:@"unknown.png"]; - [icon_ setImage:image]; + icon_ = [[package icon] retain]; + name_ = [[package name] retain]; + description_ = [[package tagline] retain]; + commercial_ = [package isCommercial]; - /*if (image != nil) { - CGSize size = [image size]; - float scale = 30 / std::max(size.width, size.height); - [icon_ zoomToScale:scale]; - }*/ - - [icon_ setFrame:CGRectMake(10, 10, 30, 30)]; - - [name_ setText:[package name]]; - [description_ setText:[package tagline]]; + package_ = [package retain]; NSString *label = nil; bool trusted = false; @@ -2570,179 +4100,235 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); label = [source label]; trusted = [source trusted]; } else if ([[package id] isEqualToString:@"firmware"]) - label = @"Apple"; + label = CYLocalize("APPLE"); + else + label = [NSString stringWithFormat:CYLocalize("SLASH_DELIMITED"), CYLocalize("UNKNOWN"), CYLocalize("LOCAL")]; - if (label == nil) - label = @"Unknown/Local"; + NSString *from(label); - NSString *from = [NSString stringWithFormat:@"from %@", label]; + NSString *section = [package simpleSection]; + if (section != nil && ![section isEqualToString:label]) { + section = [[NSBundle mainBundle] localizedStringForKey:section value:nil table:@"Sections"]; + from = [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), from, section]; + } - NSString *section = Simplify([package section]); - if (section != nil && ![section isEqualToString:label]) - from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]]; + from = [NSString stringWithFormat:CYLocalize("FROM"), label]; + source_ = [from retain]; - [source_ setText:from]; + if (NSString *purpose = [package primaryPurpose]) + if ((badge_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Purposes/%@.png", App_, purpose]]) != nil) + badge_ = [badge_ retain]; #ifdef USE_BADGES - [badge_ removeFromSuperview]; - [status_ removeFromSuperview]; - if (NSString *mode = [package mode]) { [badge_ setImage:[UIImage applicationImageNamed: - [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png" + [mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"] ? @"removing.png" : @"installing.png" ]]; - [status_ setText:[NSString stringWithFormat:@"Queued for %@", mode]]; - [status_ setColor:Blueish_]; + [status_ setText:[NSString stringWithFormat:CYLocalize("QUEUED_FOR"), CYLocalize(mode)]]; + [status_ setColor:[UIColor colorWithCGColor:Blueish_]]; } else if ([package half]) { [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]]; - [status_ setText:@"Package Damaged"]; - [status_ setColor:Red_]; + [status_ setText:CYLocalize("PACKAGE_DAMAGED")]; + [status_ setColor:[UIColor redColor]]; } else { [badge_ setImage:nil]; [status_ setText:nil]; - goto done; } - - [self addSubview:badge_]; - [self addSubview:status_]; - done:; #endif + + cached_ = false; } -- (void) _setSelected:(float)fraction { - CGColor black(space_, - Interpolate(0.0, 1.0, fraction), - Interpolate(0.0, 1.0, fraction), - Interpolate(0.0, 1.0, fraction), - 1.0); +- (void) drawRect:(CGRect)rect { + if (!cached_) { + UIColor *color; + + if (NSString *mode = [package_ mode]) { + bool remove([mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"]); + color = remove ? RemovingColor_ : InstallingColor_; + } else + color = [UIColor whiteColor]; - CGColor gray(space_, - Interpolate(0.4, 1.0, fraction), - Interpolate(0.4, 1.0, fraction), - Interpolate(0.4, 1.0, fraction), - 1.0); + [self setBackgroundColor:color]; + cached_ = true; + } - [name_ setColor:black]; - [description_ setColor:gray]; - [source_ setColor:black]; + [super drawRect:rect]; } -- (void) setSelected:(BOOL)selected { - [self _setSelected:(selected ? 1.0 : 0.0)]; - [super setSelected:selected]; +- (void) drawBackgroundInRect:(CGRect)rect withFade:(float)fade { + if (fade == 0) { + CGContextRef context(UIGraphicsGetCurrentContext()); + [[self backgroundColor] set]; + CGRect back(rect); + back.size.height -= 1; + CGContextFillRect(context, back); + } + + [super drawBackgroundInRect:rect withFade:fade]; } -- (void) setSelected:(BOOL)selected withFade:(BOOL)fade { - if (!fade) - [self _setSelected:(selected ? 1.0 : 0.0)]; - [super setSelected:selected withFade:fade]; +- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected { + if (icon_ != nil) { + CGRect rect; + rect.size = [icon_ size]; + + rect.size.width /= 2; + rect.size.height /= 2; + + rect.origin.x = 25 - rect.size.width / 2; + rect.origin.y = 25 - rect.size.height / 2; + + [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(commercial_ ? Purple_ : Black_); + [name_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2]; + [source_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2]; + + if (!selected) + UISetColor(commercial_ ? Purplish_ : Gray_); + [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2]; + + [super drawContentInRect:rect selected:selected]; } -- (void) _setSelectionFadeFraction:(float)fraction { - [self _setSelected:fraction]; - [super _setSelectionFadeFraction:fraction]; +- (void) setSelected:(BOOL)selected withFade:(BOOL)fade { + cached_ = false; + [super setSelected:selected withFade:fade]; } + (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 96; + return height + 96; else #endif - return 73; + return height + 73; } @end /* }}} */ /* Section Cell {{{ */ -@interface SectionCell : UITableCell { - UITextLabel *name_; - UITextLabel *count_; +@interface SectionCell : UISimpleTableCell { + NSString *section_; + NSString *name_; + NSString *count_; + UIImage *icon_; + _UISwitchSlider *switch_; + BOOL editing_; } - (id) init; -- (void) setSection:(Section *)section; - -- (void) _setSelected:(float)fraction; -- (void) setSelected:(BOOL)selected; -- (void) setSelected:(BOOL)selected withFade:(BOOL)fade; -- (void) _setSelectionFadeFraction:(float)fraction; +- (void) setSection:(Section *)section editing:(BOOL)editing; @end @implementation SectionCell +- (void) clearSection { + if (section_ != nil) { + [section_ release]; + section_ = nil; + } + + if (name_ != nil) { + [name_ release]; + name_ = nil; + } + + if (count_ != nil) { + [count_ release]; + count_ = nil; + } +} + - (void) dealloc { - [name_ release]; - [count_ release]; + [self clearSection]; + [icon_ release]; + [switch_ release]; [super dealloc]; } - (id) init { if ((self = [super init]) != nil) { - GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22); - GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 12); + icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain]; - name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 9, 250, 25)]; - [name_ setBackgroundColor:Clear_]; - [name_ setFont:bold]; - - count_ = [[UITextLabel alloc] initWithFrame:CGRectMake(11, 7, 29, 32)]; - [count_ setCentersHorizontally:YES]; - [count_ setBackgroundColor:Clear_]; - [count_ setFont:small]; - [count_ setColor:White_]; + switch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(218, 9, 60, 25)]; + [switch_ addTarget:self action:@selector(onSwitch:) forEvents:kUIControlEventMouseUpInside]; + } return self; +} - UIImageView *folder = [[[UIImageView alloc] initWithFrame:CGRectMake(8, 7, 32, 32)] autorelease]; - [folder setImage:[UIImage applicationImageNamed:@"folder.png"]]; +- (void) onSwitch:(id)sender { + NSMutableDictionary *metadata = [Sections_ objectForKey:section_]; + if (metadata == nil) { + metadata = [NSMutableDictionary dictionaryWithCapacity:2]; + [Sections_ setObject:metadata forKey:section_]; + } - [self addSubview:folder]; - [self addSubview:name_]; - [self addSubview:count_]; + Changed_ = true; + [metadata setObject:[NSNumber numberWithBool:([switch_ value] == 0)] forKey:@"Hidden"]; +} - [self _setSelected:0]; +- (void) setSection:(Section *)section editing:(BOOL)editing { + if (editing != editing_) { + if (editing_) + [switch_ removeFromSuperview]; + else + [self addSubview:switch_]; + editing_ = editing; + } - CFRelease(small); - CFRelease(bold); - } return self; -} + [self clearSection]; -- (void) setSection:(Section *)section { if (section == nil) { - [name_ setText:@"All Packages"]; - [count_ setText:nil]; + name_ = [CYLocalize("ALL_PACKAGES") retain]; + count_ = nil; } else { - NSString *name = [section name]; - [name_ setText:(name == nil ? @"(No Section)" : name)]; - [count_ setText:[NSString stringWithFormat:@"%d", [section count]]]; + section_ = [section name]; + if (section_ != nil) + section_ = [section_ retain]; + name_ = [(section_ == nil ? CYLocalize("NO_SECTION") : section_) retain]; + count_ = [[NSString stringWithFormat:@"%d", [section count]] retain]; + + if (editing_) + [switch_ setValue:(isSectionVisible(section_) ? 1 : 0) animated:NO]; } } -- (void) _setSelected:(float)fraction { - CGColor black(space_, - Interpolate(0.0, 1.0, fraction), - Interpolate(0.0, 1.0, fraction), - Interpolate(0.0, 1.0, fraction), - 1.0); +- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected { + [icon_ drawInRect:CGRectMake(8, 7, 32, 32)]; - [name_ setColor:black]; -} + if (selected) + UISetColor(White_); -- (void) setSelected:(BOOL)selected { - [self _setSelected:(selected ? 1.0 : 0.0)]; - [super setSelected:selected]; -} + if (!selected) + UISetColor(Black_); + [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(editing_ ? 164 : 250) withFont:Font22Bold_ ellipsis:2]; -- (void) setSelected:(BOOL)selected withFade:(BOOL)fade { - if (!fade) - [self _setSelected:(selected ? 1.0 : 0.0)]; - [super setSelected:selected withFade:fade]; -} + CGSize size = [count_ sizeWithFont:Font14_]; -- (void) _setSelectionFadeFraction:(float)fraction { - [self _setSelected:fraction]; - [super _setSelectionFadeFraction:fraction]; + UISetColor(White_); + if (count_ != nil) + [count_ drawAtPoint:CGPointMake(13 + (29 - size.width) / 2, 16) withFont:Font12Bold_]; + + [super drawContentInRect:rect selected:selected]; } @end @@ -2785,15 +4371,14 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing { if (reusing == nil) { reusing = [[[UIImageAndTextTableCell alloc] init] autorelease]; - GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16); + UIFont *font = [UIFont systemFontOfSize:16]; [[(UIImageAndTextTableCell *)reusing titleTextLabel] setFont:font]; - CFRelease(font); } [(UIImageAndTextTableCell *)reusing setTitle:[files_ objectAtIndex:row]]; return reusing; } -- (BOOL) canSelectRow:(int)row { +- (BOOL) table:(UITable *)table canSelectRow:(int)row { return NO; } @@ -2807,7 +4392,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [self addSubview:list_]; UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:@"Name" + initWithTitle:CYLocalize("NAME") identifier:@"name" width:[self frame].size.width ] autorelease]; @@ -2837,14 +4422,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); 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:@"/."]) @@ -2881,26 +4460,21 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); } - (NSString *) title { - return @"Installed Files"; + return CYLocalize("INSTALLED_FILES"); } - (NSString *) backButtonTitle { - return @"Files"; + return CYLocalize("FILES"); } @end /* }}} */ /* Package View {{{ */ -@protocol PackageViewDelegate -- (void) performPackage:(Package *)package; -@end - -@interface PackageView : RVPage { +@interface PackageView : BrowserView { _transient Database *database_; - UIPreferencesTable *table_; Package *package_; NSString *name_; - UITextView *description_; + bool commercial_; NSMutableArray *buttons_; } @@ -2912,247 +4486,66 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @implementation PackageView - (void) dealloc { - [table_ setDataSource:nil]; - [table_ setDelegate:nil]; - if (package_ != nil) [package_ release]; if (name_ != nil) [name_ release]; - if (description_ != nil) - [description_ release]; - [table_ release]; [buttons_ release]; [super dealloc]; } -- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table { - int number = 2; - if ([package_ installed] != nil) - ++number; - if ([package_ source] != nil) - ++number; - return number; -} +/*- (void) release { + if ([self retainCount] == 1) + [delegate_ setPackageView:self]; + [super release]; +}*/ -- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group { - if (group-- == 0) - return nil; - else if ([package_ installed] != nil && group-- == 0) - return @"Installed Package"; - else if (group-- == 0) - return @"Package Details"; - else if ([package_ source] != nil && group-- == 0) - return @"Source Information"; +/* XXX: this is not safe at all... localization of /fail/ */ +- (void) _clickButtonWithName:(NSString *)name { + if ([name isEqualToString:CYLocalize("CLEAR")]) + [delegate_ clearPackage:package_]; + else if ([name isEqualToString:CYLocalize("INSTALL")]) + [delegate_ installPackage:package_]; + else if ([name isEqualToString:CYLocalize("REINSTALL")]) + [delegate_ installPackage:package_]; + else if ([name isEqualToString:CYLocalize("REMOVE")]) + [delegate_ removePackage:package_]; + else if ([name isEqualToString:CYLocalize("UPGRADE")]) + [delegate_ installPackage:package_]; else _assert(false); } -- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed { - if (description_ == nil || group != 0 || row != 1) - return proposed; - else - return [description_ visibleTextRect].size.height + TextViewOffset_; +- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { + NSString *context([sheet context]); + + if ([context isEqualToString:@"modify"]) { + int count = [buttons_ count]; + _assert(count != 0); + _assert(button <= count + 1); + + if (count != button - 1) + [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]]; + + [sheet dismiss]; + } else + [super alertSheet:sheet buttonClicked:button]; } -- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group { - if (group-- == 0) { - int number = 1; - if ([package_ author] != nil) - ++number; - if (description_ != nil) - ++number; - if ([package_ website] != nil) - ++number; - return number; - } else if ([package_ installed] != nil && group-- == 0) - return 2; - else if (group-- == 0) { - int number = 2; - if ([package_ size] != 0) - ++number; - if ([package_ maintainer] != nil) - ++number; - if ([package_ relationships] != nil) - ++number; - if ([[package_ source] trusted]) - ++number; - return number; - } else if ([package_ source] != nil && group-- == 0) { - Source *source = [package_ source]; - NSString *description = [source description]; - int number = 1; - if (description != nil && ![description isEqualToString:[source label]]) - ++number; - if ([source origin] != nil) - ++number; - return number; - } else _assert(false); -} - -- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group { - UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease]; - [cell setShowSelection:NO]; - - if (group-- == 0) { - if (false) { - } else if (row-- == 0) { - [cell setTitle:[package_ name]]; - [cell setValue:[package_ latest]]; - } else if ([package_ author] != nil && row-- == 0) { - [cell setTitle:@"Author"]; - [cell setValue:[[package_ author] name]]; - [cell setShowDisclosure:YES]; - [cell setShowSelection:YES]; - } else if (description_ != nil && row-- == 0) { - [cell addSubview:description_]; - } else if ([package_ website] != nil && row-- == 0) { - [cell setTitle:@"More Information"]; - [cell setShowDisclosure:YES]; - [cell setShowSelection:YES]; - } else _assert(false); - } else if ([package_ installed] != nil && group-- == 0) { - if (false) { - } else if (row-- == 0) { - [cell setTitle:@"Version"]; - NSString *installed([package_ installed]); - [cell setValue:(installed == nil ? @"n/a" : installed)]; - } else if (row-- == 0) { - [cell setTitle:@"Filesystem Content"]; - [cell setShowDisclosure:YES]; - [cell setShowSelection:YES]; - } else _assert(false); - } else if (group-- == 0) { - if (false) { - } else if (row-- == 0) { - [cell setTitle:@"Identifier"]; - [cell setValue:[package_ id]]; - } else if (row-- == 0) { - [cell setTitle:@"Section"]; - NSString *section([package_ section]); - [cell setValue:(section == nil ? @"n/a" : section)]; - } else if ([package_ size] != 0 && row-- == 0) { - [cell setTitle:@"Expanded Size"]; - [cell setValue:SizeString([package_ size])]; - } else if ([package_ maintainer] != nil && row-- == 0) { - [cell setTitle:@"Maintainer"]; - [cell setValue:[[package_ maintainer] name]]; - [cell setShowDisclosure:YES]; - [cell setShowSelection:YES]; - } else if ([package_ relationships] != nil && row-- == 0) { - [cell setTitle:@"Package Relationships"]; - [cell setShowDisclosure:YES]; - [cell setShowSelection:YES]; - } else if ([[package_ source] trusted] && row-- == 0) { - [cell setIcon:[UIImage applicationImageNamed:@"trusted.png"]]; - [cell setValue:@"This package has been signed."]; - } else _assert(false); - } else if ([package_ source] != nil && group-- == 0) { - Source *source = [package_ source]; - NSString *description = [source description]; - - if (false) { - } else if (row-- == 0) { - NSString *label = [source label]; - if (label == nil) - label = [source uri]; - [cell setTitle:label]; - [cell setValue:[source version]]; - } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) { - [cell setValue:description]; - } else if ([source origin] != nil && row-- == 0) { - [cell setTitle:@"Origin"]; - [cell setValue:[source origin]]; - } else _assert(false); - } else _assert(false); - - return cell; -} - -- (BOOL) canSelectRow:(int)row { - return YES; -} - -- (void) tableRowSelected:(NSNotification *)notification { - int row = [table_ selectedRow]; - if (row == INT_MAX) - return; - - #define _else else goto _label; return; } _label: - - if (true) { - if (row-- == 0) { - } else if (row-- == 0) { - } else if ([package_ author] != nil && row-- == 0) { - [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@", - [[package_ author] email], - [[NSString stringWithFormat:@"regarding apt package \"%@\"", - [package_ name] - ] stringByAddingPercentEscapes] - ]]]; - } else if (description_ != nil && row-- == 0) { - } else if ([package_ website] != nil && row-- == 0) { - NSURL *url = [NSURL URLWithString:[package_ website]]; - BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease]; - [browser setDelegate:delegate_]; - [book_ pushPage:browser]; - [browser loadURL:url]; - } _else if ([package_ installed] != nil) { - if (row-- == 0) { - } else if (row-- == 0) { - } else if (row-- == 0) { - FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease]; - [files setDelegate:delegate_]; - [files setPackage:package_]; - [book_ pushPage:files]; - } _else if (true) { - if (row-- == 0) { - } else if (row-- == 0) { - } else if (row-- == 0) { - } else if ([package_ size] != 0 && row-- == 0) { - } else if ([package_ maintainer] != nil && row-- == 0) { - [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@", - [[package_ maintainer] email], - [[NSString stringWithFormat:@"regarding apt package \"%@\"", - [package_ name] - ] stringByAddingPercentEscapes] - ]]]; - } else if ([package_ relationships] != nil && row-- == 0) { - } else if ([[package_ source] trusted] && row-- == 0) { - } _else if ([package_ source] != nil) { - Source *source = [package_ source]; - NSString *description = [source description]; - - if (row-- == 0) { - } else if (row-- == 0) { - } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) { - } else if ([source origin] != nil && row-- == 0) { - } _else _assert(false); +- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame { + return [super webView:sender didFinishLoadForFrame:frame]; } -- (void) _clickButtonWithName:(NSString *)name { - if ([name isEqualToString:@"Install"]) - [delegate_ installPackage:package_]; - else if ([name isEqualToString:@"Reinstall"]) - [delegate_ installPackage:package_]; - else if ([name isEqualToString:@"Remove"]) - [delegate_ removePackage:package_]; - else if ([name isEqualToString:@"Upgrade"]) - [delegate_ installPackage:package_]; - else _assert(false); +- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { + [super webView:sender didClearWindowObject:window forFrame:frame]; + [window setValue:package_ forKey:@"package"]; } -- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button { - int count = [buttons_ count]; - _assert(count != 0); - _assert(button <= count + 1); - - if (count != button - 1) - [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]]; - - [sheet dismiss]; +- (bool) _allowJavaScriptPanel { + return commercial_; } -- (void) _rightButtonClicked { +#if !AlwaysReload +- (void) __rightButtonClicked { int count = [buttons_ count]; _assert(count != 0); @@ -3161,38 +4554,40 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); else { NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)]; [buttons addObjectsFromArray:buttons_]; - [buttons addObject:@"Cancel"]; + [buttons addObject:CYLocalize("CANCEL")]; - [delegate_ slideUp:[[[UIAlertSheet alloc] + [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 ? CYLocalize("MODIFY") : [buttons_ objectAtIndex:0]; } -- (NSString *) title { +- (NSString *) backButtonTitle { return @"Details"; } - (id) initWithBook:(RVBook *)book database:(Database *)database { if ((self = [super initWithBook:book]) != nil) { database_ = database; - - table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]]; - [self addSubview:table_]; - - [table_ setDataSource:self]; - [table_ setDelegate:self]; - buttons_ = [[NSMutableArray alloc] initWithCapacity:4]; + [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]]; } return self; } @@ -3207,46 +4602,55 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); name_ = nil; } - if (description_ != nil) { - [description_ release]; - description_ = nil; - } - [buttons_ removeAllObjects]; if (package != nil) { package_ = [package retain]; name_ = [[package id] retain]; + commercial_ = [package isCommercial]; - NSString *description([package description]); - if (description == nil) - description = [package tagline]; - if (description != nil) { - description_ = [GetTextView(description, 12, true) retain]; - [description_ setTextColor:Black_]; - } - - [table_ reloadData]; - + if ([package_ mode] != nil) + [buttons_ addObject:CYLocalize("CLEAR")]; if ([package_ source] == nil); else if ([package_ upgradableAndEssential:NO]) - [buttons_ addObject:@"Upgrade"]; + [buttons_ addObject:CYLocalize("UPGRADE")]; else if ([package_ installed] == nil) - [buttons_ addObject:@"Install"]; + [buttons_ addObject:CYLocalize("INSTALL")]; else - [buttons_ addObject:@"Reinstall"]; + [buttons_ addObject:CYLocalize("REINSTALL")]; if ([package_ installed] != nil) - [buttons_ addObject:@"Remove"]; + [buttons_ addObject:CYLocalize("REMOVE")]; + + if (special_ != NULL) { + CGRect frame([webview_ frame]); + frame.size.width = 320; + frame.size.height = 0; + [webview_ setFrame:frame]; + + [scroller_ scrollPointVisibleAtTopLeft:CGPointZero]; + + WebThreadLock(); + [[[webview_ webView] windowScriptObject] setValue:package_ forKey:@"package"]; + + [self setButtonTitle:nil withStyle:nil toFunction:nil]; + + [self setFinishHook:nil]; + [self setPopupHook:nil]; + WebThreadUnlock(); + + [super callFunction:special_]; + } } + + [self reloadButtons]; } -- (void) resetViewAnimated:(BOOL)animated { - [table_ resetViewAnimated:animated]; +- (bool) isLoading { + return commercial_ ? [super isLoading] : false; } - (void) reloadData { [self setPackage:[database_ packageWithName:name_]]; - [self reloadButtons]; } @end @@ -3255,17 +4659,14 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @interface PackageTable : RVPage { _transient Database *database_; NSString *title_; - SEL filter_; - id object_; NSMutableArray *packages_; NSMutableArray *sections_; UISectionList *list_; } -- (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; @@ -3282,8 +4683,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [list_ setDataSource:nil]; [title_ release]; - if (object_ != nil) - [object_ release]; [packages_ release]; [sections_ release]; [list_ release]; @@ -3327,18 +4726,17 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); return; Package *package = [packages_ objectAtIndex:row]; - PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; - [view setDelegate:delegate_]; + package = [database_ packageWithName:[package id]]; + PackageView *view([delegate_ packageView]); [view setPackage:package]; + [view setDelegate:delegate_]; [book_ pushPage:view]; } -- (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]; packages_ = [[NSMutableArray arrayWithCapacity:16] retain]; sections_ = [[NSMutableArray arrayWithCapacity:16] retain]; @@ -3347,7 +4745,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [list_ setDataSource:self]; UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:@"Name" + initWithTitle:CYLocalize("NAME") identifier:@"name" width:[self frame].size.width ] autorelease]; @@ -3359,7 +4757,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [table setReusesTableCells:YES]; [self addSubview:list_]; - [self reloadData]; + + [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; } return self; } @@ -3367,13 +4767,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); 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 { @@ -3382,27 +4777,41 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [packages_ removeAllObjects]; [sections_ removeAllObjects]; - for (size_t i(0); i != [packages count]; ++i) { - Package *package([packages objectAtIndex:i]); - if ([[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 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]; + _profile(PackageTable$reloadData$Section$Add) + [sections_ addObject:section]; + _end + } + + [section addToCount]; + } + _end + + _profile(PackageTable$reloadData$List) + [list_ reloadData]; + _end } - (NSString *) title { @@ -3427,337 +4836,1136 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @end /* }}} */ +/* Filtered Package Table {{{ */ +@interface FilteredPackageTable : PackageTable { + SEL filter_; + IMP imp_; + id object_; +} -/* Browser Implementation {{{ */ -@implementation BrowserView +- (void) setObject:(id)object; -- (void) dealloc { - WebView *webview = [webview_ webView]; - [webview setFrameLoadDelegate:nil]; - [webview setResourceLoadDelegate:nil]; - [webview setUIDelegate:nil]; +- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object; + +@end - [scroller_ setDelegate:nil]; - [webview_ setDelegate:nil]; +@implementation FilteredPackageTable - [scroller_ release]; - [webview_ release]; - [urls_ release]; - [indicator_ release]; - if (title_ != nil) - [title_ release]; +- (void) dealloc { + if (object_ != nil) + [object_ release]; [super dealloc]; } -- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy { - NSMutableURLRequest *request = [NSMutableURLRequest - requestWithURL:url - cachePolicy:policy - timeoutInterval:30.0 - ]; - - [request addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"]; - [request addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"]; - [request addValue:[NSString stringWithUTF8String:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"]; +- (void) setObject:(id)object { + if (object_ != nil) + [object_ release]; + if (object == nil) + object_ = nil; + else + object_ = [object retain]; +} - [self loadRequest:request]; +- (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) { + filter_ = filter; + object_ = object == nil ? nil : [object retain]; -- (void) loadURL:(NSURL *)url { - [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy]; -} + /* XXX: this is an unsafe optimization of doomy hell */ + Method method = class_getInstanceMethod([Package class], filter); + imp_ = method_getImplementation(method); + _assert(imp_ != NULL); -// XXX: this needs to add the headers -- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request { - return request; + [self reloadData]; + } return self; } -- (void) loadRequest:(NSURLRequest *)request { - [webview_ loadRequest:request]; -} +@end +/* }}} */ -- (void) reloadURL { - NSURL *url = [[[urls_ lastObject] retain] autorelease]; - [urls_ removeLastObject]; - [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData]; +/* Add Source View {{{ */ +@interface AddSourceView : RVPage { + _transient Database *database_; } -- (WebView *) webView { - return [webview_ webView]; -} +- (id) initWithBook:(RVBook *)book database:(Database *)database; -- (void) view:(UIView *)sender didSetFrame:(CGRect)frame { - [scroller_ setContentSize:frame.size]; -} +@end -- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old { - [self view:sender didSetFrame:frame]; -} +@implementation AddSourceView -- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource { - return [self _addHeadersToRequest:request]; +- (id) initWithBook:(RVBook *)book database:(Database *)database { + if ((self = [super initWithBook:book]) != nil) { + database_ = database; + } return self; } -- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request { - if ([[[request URL] scheme] isEqualToString:@"apptapp"]) - return nil; - [self setBackButtonTitle:title_]; - BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease]; - [browser setDelegate:delegate_]; - [book_ pushPage:browser]; - [browser loadRequest:[self _addHeadersToRequest:request]]; - return [browser webView]; +@end +/* }}} */ +/* Source Cell {{{ */ +@interface SourceCell : UITableCell { + UIImage *icon_; + NSString *origin_; + NSString *description_; + NSString *label_; } -- (void) webView:(WebView *)sender willClickElement:(id)element { - if (![element respondsToSelector:@selector(href)]) - return; - NSString *href = [element href]; - if (href == nil) - return; - if ([href hasPrefix:@"apptapp://package/"]) { - NSString *name = [href substringFromIndex:18]; - Package *package = [database_ packageWithName:name]; - if (package == nil) { - UIAlertSheet *sheet = [[[UIAlertSheet alloc] - initWithTitle:@"Cannot Locate Package" - buttons:[NSArray arrayWithObjects:@"Close", nil] - defaultButtonIndex:0 - delegate:self - context:@"missing" - ] autorelease]; +- (void) dealloc; - [sheet setBodyText:[NSString stringWithFormat: - @"The package %@ cannot be found in your current sources. I might recommend installing more sources." - , name]]; +- (SourceCell *) initWithSource:(Source *)source; - [sheet popupAlertAnimated:YES]; - } else { - [self setBackButtonTitle:title_]; - PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; - [view setDelegate:delegate_]; - [view setPackage:package]; - [book_ pushPage:view]; - } - } +@end + +@implementation SourceCell + +- (void) dealloc { + [icon_ release]; + [origin_ release]; + [description_ release]; + [label_ release]; + [super dealloc]; } -- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame { - title_ = [title retain]; - [self setTitle:title]; +- (SourceCell *) initWithSource:(Source *)source { + if ((self = [super init]) != nil) { + if (icon_ == nil) + icon_ = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sources/%@.png", [source host]]]; + if (icon_ == nil) + icon_ = [UIImage applicationImageNamed:@"unknown.png"]; + icon_ = [icon_ retain]; + + origin_ = [[source name] retain]; + label_ = [[source uri] retain]; + description_ = [[source description] retain]; + } return self; } -- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame { - if ([frame parentFrame] != nil) - return; +- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected { + if (icon_ != nil) + [icon_ drawInRect:CGRectMake(10, 10, 30, 30)]; - reloading_ = false; - loading_ = true; - [indicator_ startAnimation]; - [self reloadButtons]; + if (selected) + UISetColor(White_); - if (title_ != nil) { - [title_ release]; - title_ = nil; - } + if (!selected) + UISetColor(Black_); + [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2]; - [self setTitle:@"Loading..."]; + if (!selected) + UISetColor(Blue_); + [label_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2]; - WebView *webview = [webview_ webView]; - NSString *href = [webview mainFrameURL]; - [urls_ addObject:[NSURL URLWithString:href]]; + if (!selected) + UISetColor(Gray_); + [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2]; - CGRect webrect = [scroller_ frame]; - webrect.size.height = 0; - [webview_ setFrame:webrect]; + [super drawContentInRect:rect selected:selected]; } -- (void) _finishLoading { - if (!reloading_) { - loading_ = false; - [indicator_ stopAnimation]; - [self reloadButtons]; - } -} +@end +/* }}} */ +/* Source Table {{{ */ +@interface SourceTable : RVPage { + _transient Database *database_; + UISectionList *list_; + NSMutableArray *sources_; + UIActionSheet *alert_; + int offset_; -- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame { - if ([frame parentFrame] != nil) - return; - [self _finishLoading]; -} + NSString *href_; + UIProgressHUD *hud_; + NSError *error_; -- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { - if ([frame parentFrame] != nil) - return; - [self setTitle:[error localizedDescription]]; - [self _finishLoading]; -} + //NSURLConnection *installer_; + NSURLConnection *trivial_bz2_; + NSURLConnection *trivial_gz_; + //NSURLConnection *automatic_; -- (id) initWithBook:(RVBook *)book database:(Database *)database { - if ((self = [super initWithBook:book]) != nil) { - database_ = database; - loading_ = false; + BOOL trivial_; +} - struct CGRect bounds = [self bounds]; +- (id) initWithBook:(RVBook *)book database:(Database *)database; - UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:bounds] autorelease]; - [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]]; - [self addSubview:pinstripe]; +@end - scroller_ = [[UIScroller alloc] initWithFrame:bounds]; - [self addSubview:scroller_]; +@implementation SourceTable - [scroller_ setScrollingEnabled:YES]; - [scroller_ setAdjustForContentSizeChange:YES]; - [scroller_ setClipsSubviews:YES]; - [scroller_ setAllowsRubberBanding:YES]; - [scroller_ setScrollDecelerationFactor:0.99]; - [scroller_ setDelegate:self]; +- (void) _deallocConnection:(NSURLConnection *)connection { + if (connection != nil) { + [connection cancel]; + //[connection setDelegate:nil]; + [connection release]; + } +} - CGRect webrect = [scroller_ bounds]; - webrect.size.height = 0; +- (void) dealloc { + [[list_ table] setDelegate:nil]; + [list_ setDataSource:nil]; - webview_ = [[UIWebView alloc] initWithFrame:webrect]; - [scroller_ addSubview:webview_]; + if (href_ != nil) + [href_ release]; + if (hud_ != nil) + [hud_ release]; + if (error_ != nil) + [error_ release]; - [webview_ setTilingEnabled:YES]; - [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)]; - [webview_ setAutoresizes:YES]; - [webview_ setDelegate:self]; - //[webview_ setEnabledGestures:2]; + //[self _deallocConnection:installer_]; + [self _deallocConnection:trivial_gz_]; + [self _deallocConnection:trivial_bz2_]; + //[self _deallocConnection:automatic_]; - CGSize indsize = [UIProgressIndicator defaultSizeForStyle:0]; - indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 42, indsize.width, indsize.height)]; - [indicator_ setStyle:0]; + [sources_ release]; + [list_ release]; + [super dealloc]; +} - Package *package([database_ packageWithName:@"cydia"]); - NSString *application = package == nil ? @"Cydia" : [NSString - stringWithFormat:@"Cydia/%@", - [package installed] - ]; +- (int) numberOfSectionsInSectionList:(UISectionList *)list { + return offset_ == 0 ? 1 : 2; +} - WebView *webview = [webview_ webView]; - [webview setApplicationNameForUserAgent:application]; - [webview setFrameLoadDelegate:self]; - [webview setResourceLoadDelegate:self]; - [webview setUIDelegate:self]; +- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section { + switch (section + (offset_ == 0 ? 1 : 0)) { + case 0: return CYLocalize("ENTERED_BY_USER"); + case 1: return CYLocalize("INSTALLED_BY_PACKAGE"); - urls_ = [[NSMutableArray alloc] initWithCapacity:16]; - } return self; + default: + _assert(false); + return nil; + } } -- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button { - [sheet dismiss]; +- (int) sectionList:(UISectionList *)list rowForSection:(int)section { + switch (section + (offset_ == 0 ? 1 : 0)) { + case 0: return 0; + case 1: return offset_; + + default: + _assert(false); + return -1; + } } -- (void) _leftButtonClicked { - UIAlertSheet *sheet = [[[UIAlertSheet alloc] - initWithTitle:@"About Cydia Installer" - buttons:[NSArray arrayWithObjects:@"Close", nil] - defaultButtonIndex:0 - delegate:self - context:@"about" - ] autorelease]; +- (int) numberOfRowsInTable:(UITable *)table { + return [sources_ count]; +} - [sheet setBodyText: - @"Copyright (C) 2008\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/" - ]; +- (float) table:(UITable *)table heightForRow:(int)row { + Source *source = [sources_ objectAtIndex:row]; + return [source description] == nil ? 56 : 73; +} - [sheet popupAlertAnimated:YES]; +- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col { + Source *source = [sources_ objectAtIndex:row]; + // XXX: weird warning, stupid selectors ;P + return [[[SourceCell alloc] initWithSource:(id)source] autorelease]; } -- (void) _rightButtonClicked { - reloading_ = true; - [self reloadURL]; +- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row { + return YES; } -- (NSString *) leftButtonTitle { - return @"About"; +- (BOOL) table:(UITable *)table canSelectRow:(int)row { + return YES; } -- (NSString *) rightButtonTitle { - return loading_ ? @"" : @"Reload"; +- (void) tableRowSelected:(NSNotification*)notification { + UITable *table([list_ table]); + int row([table selectedRow]); + if (row == INT_MAX) + return; + + Source *source = [sources_ objectAtIndex:row]; + + PackageTable *packages = [[[FilteredPackageTable alloc] + initWithBook:book_ + database:database_ + title:[source label] + filter:@selector(isVisibleInSource:) + with:source + ] autorelease]; + + [packages setDelegate:delegate_]; + + [book_ pushPage:packages]; } -- (NSString *) title { - return nil; +- (BOOL) table:(UITable *)table canDeleteRow:(int)row { + Source *source = [sources_ objectAtIndex:row]; + return [source record] != nil; } -- (NSString *) backButtonTitle { - return @"Browser"; +- (void) table:(UITable *)table willSwipeToDeleteRow:(int)row { + [[list_ table] setDeleteConfirmationRow:row]; } -- (void) setPageActive:(BOOL)active { - if (active) - [book_ addSubview:indicator_]; - else - [indicator_ removeFromSuperview]; +- (void) table:(UITable *)table deleteRow:(int)row { + Source *source = [sources_ objectAtIndex:row]; + [Sources_ removeObjectForKey:[source key]]; + [delegate_ syncData]; } -- (void) resetViewAnimated:(BOOL)animated { +- (void) complete { + [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys: + @"deb", @"Type", + href_, @"URI", + @"./", @"Distribution", + nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]]; + + [delegate_ syncData]; } -@end -/* }}} */ +- (NSString *) getWarning { + NSString *href(href_); + NSRange colon([href rangeOfString:@"://"]); + if (colon.location != NSNotFound) + href = [href substringFromIndex:(colon.location + 3)]; + href = [href stringByAddingPercentEscapes]; + href = [@"http://cydia.saurik.com/api/repotag/" stringByAppendingString:href]; + href = [href stringByCachingURLWithCurrentCDN]; -@interface CYBook : RVBook < - ProgressDelegate -> { - _transient Database *database_; - UIView *overlay_; + 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_) + field = &trivial_bz2_; + else if (connection == trivial_gz_) + field = &trivial_gz_; + _assert(field != NULL); + [connection release]; + *field = nil; + + if ( + trivial_bz2_ == nil && + trivial_gz_ == nil + ) { + bool defer(false); + + if (trivial_) { + if (NSString *warning = [self yieldToSelector:@selector(getWarning)]) { + defer = true; + + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:CYLocalize("SOURCE_WARNING") + buttons:[NSArray arrayWithObjects:CYLocalize("ADD_ANYWAY"), CYLocalize("CANCEL"), nil] + defaultButtonIndex:0 + delegate:self + context:@"warning" + ] autorelease]; + + [sheet setNumberOfRows:1]; + + [sheet setBodyText:warning]; + [sheet popupAlertAnimated:YES]; + } else + [self complete]; + } else if (error_ != nil) { + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:CYLocalize("VERIFICATION_ERROR") + buttons:[NSArray arrayWithObjects:CYLocalize("OK"), nil] + defaultButtonIndex:0 + delegate:self + context:@"urlerror" + ] autorelease]; + + [sheet setBodyText:[error_ localizedDescription]]; + [sheet popupAlertAnimated:YES]; + } else { + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:CYLocalize("NOT_REPOSITORY") + buttons:[NSArray arrayWithObjects:CYLocalize("OK"), nil] + defaultButtonIndex:0 + delegate:self + context:@"trivial" + ] autorelease]; + + [sheet setBodyText:CYLocalize("NOT_REPOSITORY_EX")]; + [sheet popupAlertAnimated:YES]; + } + + [delegate_ setStatusBarShowsProgress:NO]; + [delegate_ removeProgressHUD:hud_]; + + [hud_ autorelease]; + hud_ = nil; + + if (!defer) { + [href_ release]; + href_ = nil; + } + + if (error_ != nil) { + [error_ release]; + error_ = nil; + } + } +} + +- (void) connection:(NSURLConnection *)connection didReceiveResponse:(NSHTTPURLResponse *)response { + switch ([response statusCode]) { + case 200: + trivial_ = YES; + } +} + +- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { + lprintf("connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]); + if (error_ != nil) + error_ = [error retain]; + [self _endConnection:connection]; +} + +- (void) connectionDidFinishLoading:(NSURLConnection *)connection { + [self _endConnection:connection]; +} + +- (NSURLConnection *) _requestHRef:(NSString *)href method:(NSString *)method { + NSMutableURLRequest *request = [NSMutableURLRequest + requestWithURL:[NSURL URLWithString:href] + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:20.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"]) { + switch (button) { + case 1: { + NSString *href = [[sheet textField] text]; + + //installer_ = [[self _requestHRef:href method:@"GET"] retain]; + + if (![href hasSuffix:@"/"]) + href_ = [href stringByAppendingString:@"/"]; + else + href_ = href; + href_ = [href_ 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; + + hud_ = [[delegate_ addProgressHUD] retain]; + [hud_ setText:CYLocalize("VERIFYING_URL")]; + } break; + + case 2: + break; + + default: + _assert(false); + } + + [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; + + default: + _assert(false); + } + + [href_ release]; + href_ = nil; + + [sheet dismiss]; + } +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database { + if ((self = [super initWithBook:book]) != nil) { + database_ = database; + sources_ = [[NSMutableArray arrayWithCapacity:16] retain]; + + //list_ = [[UITable alloc] initWithFrame:[self bounds]]; + list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:NO]; + [list_ setShouldHideHeaderInShortLists:NO]; + + [self addSubview:list_]; + [list_ setDataSource:self]; + + UITableColumn *column = [[UITableColumn alloc] + initWithTitle:CYLocalize("NAME") + identifier:@"name" + width:[self frame].size.width + ]; + + UITable *table = [list_ table]; + [table setSeparatorStyle:1]; + [table addTableColumn:column]; + [table setDelegate:self]; + + [self reloadData]; + + [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + } return self; +} + +- (void) reloadData { + pkgSourceList list; + _assert(list.ReadMainList()); + + [sources_ removeAllObjects]; + [sources_ addObjectsFromArray:[database_ sources]]; + _trace(); + [sources_ sortUsingSelector:@selector(compareByNameAndType:)]; + _trace(); + + int count = [sources_ count]; + for (offset_ = 0; offset_ != count; ++offset_) { + Source *source = [sources_ objectAtIndex:offset_]; + if ([source record] == nil) + break; + } + + [list_ reloadData]; +} + +- (void) resetViewAnimated:(BOOL)animated { + [list_ resetViewAnimated:animated]; +} + +- (void) _leftButtonClicked { + /*[book_ pushPage:[[[AddSourceView alloc] + initWithBook:book_ + database:database_ + ] autorelease]];*/ + + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:CYLocalize("ENTER_APT_URL") + buttons:[NSArray arrayWithObjects:CYLocalize("ADD_SOURCE"), CYLocalize("CANCEL"), nil] + defaultButtonIndex:0 + delegate:self + context:@"source" + ] autorelease]; + + [sheet setNumberOfRows:1]; + + [sheet addTextFieldWithValue:@"http://" label:@""]; + + UITextInputTraits *traits = [[sheet textField] textInputTraits]; + [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone]; + [traits setAutocorrectionType:UITextAutocorrectionTypeNo]; + [traits setKeyboardType:UIKeyboardTypeURL]; + // XXX: UIReturnKeyDone + [traits setReturnKeyType:UIReturnKeyNext]; + + [sheet popupAlertAnimated:YES]; +} + +- (void) _rightButtonClicked { + UITable *table = [list_ table]; + BOOL editing = [table isRowDeletionEnabled]; + [table enableRowDeletion:!editing animated:YES]; + [book_ reloadButtonsForPage:self]; +} + +- (NSString *) title { + return CYLocalize("SOURCES"); +} + +- (NSString *) leftButtonTitle { + return [[list_ table] isRowDeletionEnabled] ? CYLocalize("ADD") : nil; +} + +- (id) rightButtonTitle { + return [[list_ table] isRowDeletionEnabled] ? CYLocalize("DONE") : CYLocalize("EDIT"); +} + +- (UINavigationButtonStyle) rightButtonStyle { + return [[list_ table] isRowDeletionEnabled] ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal; +} + +@end +/* }}} */ + +/* Installed View {{{ */ +@interface InstalledView : RVPage { + _transient Database *database_; + FilteredPackageTable *packages_; + BOOL expert_; +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database; + +@end + +@implementation InstalledView + +- (void) dealloc { + [packages_ release]; + [super dealloc]; +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database { + if ((self = [super initWithBook:book]) != nil) { + database_ = database; + + packages_ = [[FilteredPackageTable alloc] + initWithBook:book + database:database + title:nil + filter:@selector(isInstalledAndVisible:) + with:[NSNumber numberWithBool:YES] + ]; + + [self addSubview:packages_]; + + [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + } return self; +} + +- (void) resetViewAnimated:(BOOL)animated { + [packages_ resetViewAnimated:animated]; +} + +- (void) reloadData { + [packages_ reloadData]; +} + +- (void) _rightButtonClicked { + [packages_ setObject:[NSNumber numberWithBool:expert_]]; + [packages_ reloadData]; + expert_ = !expert_; + [book_ reloadButtonsForPage:self]; +} + +- (NSString *) title { + return CYLocalize("INSTALLED"); +} + +- (NSString *) backButtonTitle { + return CYLocalize("PACKAGES"); +} + +- (id) rightButtonTitle { + return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? CYLocalize("EXPERT") : CYLocalize("SIMPLE"); +} + +- (UINavigationButtonStyle) rightButtonStyle { + return expert_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal; +} + +- (void) setDelegate:(id)delegate { + [super setDelegate:delegate]; + [packages_ setDelegate:delegate]; +} + +@end +/* }}} */ + +/* Home View {{{ */ +@interface HomeView : BrowserView { +} + +@end + +@implementation HomeView + +- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { + NSString *context([sheet context]); + + if ([context isEqualToString:@"about"]) + [sheet dismiss]; + else + [super alertSheet:sheet buttonClicked:button]; +} + +- (void) _leftButtonClicked { + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:CYLocalize("ABOUT_CYDIA") + buttons:[NSArray arrayWithObjects:CYLocalize("CLOSE"), nil] + defaultButtonIndex:0 + delegate:self + context:@"about" + ] autorelease]; + + [sheet setBodyText: + @"Copyright (C) 2008-2009\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/" + ]; + + [sheet popupAlertAnimated:YES]; +} + +- (NSString *) leftButtonTitle { + return CYLocalize("ABOUT"); +} + +@end +/* }}} */ +/* Manage View {{{ */ +@interface ManageView : BrowserView { +} + +@end + +@implementation ManageView + +- (NSString *) title { + return CYLocalize("MANAGE"); +} + +- (void) _leftButtonClicked { + [delegate_ askForSettings]; +} + +- (NSString *) leftButtonTitle { + return CYLocalize("SETTINGS"); +} + +#if !AlwaysReload +- (id) _rightButtonTitle { + return Queuing_ ? CYLocalize("QUEUE") : nil; +} + +- (UINavigationButtonStyle) rightButtonStyle { + return Queuing_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal; +} + +- (void) _rightButtonClicked { + [delegate_ queue]; +} +#endif + +- (bool) isLoading { + return false; +} + +@end +/* }}} */ + +#include + +/* Cydia Book {{{ */ +@interface CYBook : RVBook < + ProgressDelegate +> { + _transient Database *database_; + UINavigationBar *overlay_; + UINavigationBar *underlay_; UIProgressIndicator *indicator_; UITextLabel *prompt_; UIProgressBar *progress_; + UINavigationButton *cancel_; bool updating_; } -- (id) initWithFrame:(CGRect)frame database:(Database *)database; -- (void) update; -- (BOOL) updating; +- (id) initWithFrame:(CGRect)frame database:(Database *)database; +- (void) update; +- (BOOL) updating; + +@end + +@implementation CYBook + +- (void) dealloc { + [overlay_ release]; + [indicator_ release]; + [prompt_ release]; + [progress_ release]; + [cancel_ release]; + [super dealloc]; +} + +- (NSString *) getTitleForPage:(RVPage *)page { + return [super getTitleForPage:page]; +} + +- (BOOL) updating { + return updating_; +} + +- (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]; + + [indicator_ startAnimation]; + [prompt_ setText:CYLocalize("UPDATING_DATABASE")]; + [progress_ setProgress:0]; + + updating_ = true; + [overlay_ addSubview:cancel_]; + + [NSThread + detachNewThreadSelector:@selector(_update) + toTarget:self + withObject:nil + ]; +} + +- (void) _update_ { + updating_ = false; + + [indicator_ stopAnimation]; + + [UIView beginAnimations:nil context:NULL]; + + CGRect ovrframe = [overlay_ frame]; + ovrframe.origin.y = -ovrframe.size.height; + [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 commitAnimations]; + + [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0]; +} + +- (id) initWithFrame:(CGRect)frame database:(Database *)database { + if ((self = [super initWithFrame:frame]) != nil) { + database_ = database; + + CGRect ovrrect = [navbar_ bounds]; + ovrrect.size.height = [UINavigationBar defaultSize].height; + ovrrect.origin.y = -ovrrect.size.height; + + overlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect]; + [self addSubview:overlay_]; + + ovrrect.origin.y = frame.size.height; + underlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect]; + [underlay_ setTintColor:[UIColor colorWithRed:0.23 green:0.23 blue:0.23 alpha:1]]; + [self addSubview:underlay_]; + + [overlay_ setBarStyle:1]; + [underlay_ setBarStyle:1]; + + int barstyle = [overlay_ _barStyle:NO]; + bool ugly = barstyle == 0; + + UIProgressIndicatorStyle style = ugly ? + UIProgressIndicatorStyleMediumBrown : + UIProgressIndicatorStyleMediumWhite; + + CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style]; + unsigned indoffset = (ovrrect.size.height - indsize.height) / 2; + CGRect indrect = {{indoffset, indoffset}, indsize}; + + indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect]; + [indicator_ setStyle:style]; + [overlay_ addSubview:indicator_]; + + CGSize prmsize = {215, indsize.height + 4}; + + CGRect prmrect = {{ + indoffset * 2 + indsize.width, +#ifdef __OBJC2__ + -1 + +#endif + unsigned(ovrrect.size.height - prmsize.height) / 2 + }, prmsize}; + + UIFont *font = [UIFont systemFontOfSize:15]; + + prompt_ = [[UITextLabel alloc] initWithFrame:prmrect]; + + [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]]; + [prompt_ setBackgroundColor:[UIColor clearColor]]; + [prompt_ setFont:font]; + + [overlay_ addSubview:prompt_]; + + CGSize prgsize = {75, 100}; + + CGRect prgrect = {{ + ovrrect.size.width - prgsize.width - 10, + (ovrrect.size.height - prgsize.height) / 2 + } , prgsize}; + + progress_ = [[UIProgressBar alloc] initWithFrame:prgrect]; + [progress_ setStyle:0]; + [overlay_ addSubview:progress_]; + + cancel_ = [[UINavigationButton alloc] initWithTitle:CYLocalize("CANCEL") style:UINavigationButtonStyleHighlighted]; + [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside]; + + 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]; + + [cancel_ setBarStyle:barstyle]; + } return self; +} + +- (void) _onCancel { + updating_ = false; + [cancel_ removeFromSuperview]; +} + +- (void) _update { _pooled + Status status; + status.setDelegate(self); + + [database_ updateWithStatus:status]; + + [self + performSelectorOnMainThread:@selector(_update_) + withObject:nil + waitUntilDone:NO + ]; +} + +- (void) setProgressError:(NSString *)error forPackage:(NSString *)id { + [prompt_ setText:[NSString stringWithFormat:CYLocalize("ERROR_MESSAGE"), error]]; +} + +- (void) setProgressTitle:(NSString *)title { + [self + performSelectorOnMainThread:@selector(_setProgressTitle:) + withObject:title + waitUntilDone:YES + ]; +} + +- (void) setProgressPercent:(float)percent { + [self + performSelectorOnMainThread:@selector(_setProgressPercent:) + withObject:[NSNumber numberWithFloat:percent] + waitUntilDone:YES + ]; +} + +- (void) startProgress { +} + +- (void) addProgressOutput:(NSString *)output { + [self + performSelectorOnMainThread:@selector(_addProgressOutput:) + withObject:output + waitUntilDone:YES + ]; +} + +- (bool) isCancelling:(size_t)received { + return !updating_; +} + +- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { + [sheet dismiss]; +} + +- (void) _setProgressTitle:(NSString *)title { + [prompt_ setText:title]; +} + +- (void) _setProgressPercent:(NSNumber *)percent { + [progress_ setProgress:[percent floatValue]]; +} + +- (void) _addProgressOutput:(NSString *)output { +} + +@end +/* }}} */ +/* Cydia:// Protocol {{{ */ +@interface CydiaURLProtocol : NSURLProtocol { +} + +@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; +} + ++ (NSURLRequest *) canonicalRequestForRequest:(NSURLRequest *)request { + return request; +} + +- (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)); + + 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) startLoading { + id client([self client]); + NSURLRequest *request([self request]); + + NSURL *url([request URL]); + NSString *href([url absoluteString]); + + NSString *path([href substringFromIndex:8]); + NSRange slash([path rangeOfString:@"/"]); + + 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 *packages_; NSMutableArray *sections_; + NSMutableArray *filtered_; + UITransitionView *transition_; UITable *list_; UIView *accessory_; + BOOL editing_; } - (id) initWithBook:(RVBook *)book database:(Database *)database; - (void) reloadData; +- (void) resetView; @end -@implementation InstallView +@implementation SectionsView - (void) dealloc { [list_ setDataSource:nil]; [list_ setDelegate:nil]; - [packages_ release]; [sections_ release]; + [filtered_ release]; + [transition_ release]; [list_ release]; [accessory_ release]; [super dealloc]; } - (int) numberOfRowsInTable:(UITable *)table { - return [sections_ count] + 1; + return editing_ ? [sections_ count] : [filtered_ count] + 1; } - (float) table:(UITable *)table heightForRow:(int)row { @@ -3767,12 +5975,19 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing { if (reusing == nil) reusing = [[[SectionCell alloc] init] autorelease]; - [(SectionCell *)reusing setSection:(row == 0 ? nil : [sections_ objectAtIndex:(row - 1)])]; + [(SectionCell *)reusing setSection:(editing_ ? + [sections_ objectAtIndex:row] : + (row == 0 ? nil : [filtered_ objectAtIndex:(row - 1)]) + ) editing:editing_]; return reusing; } - (BOOL) table:(UITable *)table showDisclosureForRow:(int)row { - return YES; + return !editing_; +} + +- (BOOL) table:(UITable *)table canSelectRow:(int)row { + return !editing_; } - (void) tableRowSelected:(NSNotification *)notification { @@ -3787,24 +6002,24 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); if (row == 0) { section = nil; name = nil; - title = @"All Packages"; + title = CYLocalize("ALL_PACKAGES"); } else { - section = [sections_ objectAtIndex:(row - 1)]; + section = [filtered_ objectAtIndex:(row - 1)]; name = [section name]; if (name != nil) - title = name; + title = [[NSBundle mainBundle] localizedStringForKey:Simplify(name) value:nil table:@"Sections"]; else { name = @""; - title = @"(No Section)"; + title = CYLocalize("NO_SECTION"); } } - PackageTable *table = [[[PackageTable alloc] + PackageTable *table = [[[FilteredPackageTable alloc] initWithBook:book_ database:database_ title:title - filter:@selector(isUninstalledInSection:) + filter:@selector(isVisiblyUninstalledInSection:) with:name ] autorelease]; @@ -3817,14 +6032,17 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); if ((self = [super initWithBook:book]) != nil) { database_ = database; - packages_ = [[NSMutableArray arrayWithCapacity:16] retain]; sections_ = [[NSMutableArray arrayWithCapacity:16] retain]; + filtered_ = [[NSMutableArray arrayWithCapacity:16] retain]; - list_ = [[UITable alloc] initWithFrame:[self bounds]]; - [self addSubview:list_]; + transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]]; + [self addSubview:transition_]; + + list_ = [[UITable alloc] initWithFrame:[transition_ bounds]]; + [transition_ transition:0 toView:list_]; UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:@"Name" + initWithTitle:CYLocalize("NAME") identifier:@"name" width:[self frame].size.width ] autorelease]; @@ -3836,49 +6054,131 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [list_ setReusesTableCells:YES]; [self reloadData]; + + [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; } return self; } - (void) reloadData { NSArray *packages = [database_ packages]; - [packages_ removeAllObjects]; [sections_ removeAllObjects]; + [filtered_ removeAllObjects]; + +#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]); - if ([package valid] && [package installed] == nil) - [packages_ addObject:package]; + _trace(); + for (Package *package in packages) { + NSString *name([package section]); + NSString *key(name == nil ? @"" : 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] autorelease]; + _end + } + _end + + [*section addToCount]; + + _profile(SectionsView$reloadData$Filter) + if (![package valid] || [package installed] != nil || ![package visible]) + continue; + _end + + [*section addToRow]; +#else + Section *section; + + _profile(SectionsView$reloadData$Section) + section = [sections objectForKey:key]; + if (section == nil) { + _profile(SectionsView$reloadData$Section$Allocate) + section = [[[Section alloc] initWithName:name] autorelease]; + [sections setObject:section forKey:key]; + _end + } + _end + + [section addToCount]; + + _profile(SectionsView$reloadData$Filter) + if (![package valid] || [package installed] != nil || ![package visible]) + continue; + _end + + [section addToRow]; +#endif } + _trace(); - [packages_ sortUsingSelector:@selector(compareBySection:)]; +#if 0 + for (SectionMap::const_iterator i(sections.begin()), e(sections.end()); i != e; ++i) + [sections_ addObject:i->second]; +#else + [sections_ addObjectsFromArray:[sections allValues]]; +#endif - Section *section = nil; - for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) { - Package *package = [packages_ objectAtIndex:offset]; - NSString *name = [package section]; + [sections_ sortUsingSelector:@selector(compareByName:)]; - if (section == nil || name != nil && ![[section name] isEqualToString:name]) { - section = [[[Section alloc] initWithName:name row:offset] autorelease]; - [sections_ addObject:section]; - } + for (Section *section in sections_) { + size_t count([section row]); + if ([section row] == 0) + continue; - [section addToCount]; + section = [[[Section alloc] initWithName:[section name]] autorelease]; + [section setCount:count]; + [filtered_ addObject:section]; } [list_ reloadData]; + _trace(); +} + +- (void) resetView { + if (editing_) + [self _rightButtonClicked]; } - (void) resetViewAnimated:(BOOL)animated { [list_ resetViewAnimated:animated]; } +- (void) _rightButtonClicked { + if ((editing_ = !editing_)) + [list_ reloadData]; + else + [delegate_ updateData]; + [book_ reloadTitleForPage:self]; + [book_ reloadButtonsForPage:self]; +} + - (NSString *) title { - return @"Install"; + return editing_ ? CYLocalize("SECTION_VISIBILITY") : CYLocalize("INSTALL_BY_SECTION"); } - (NSString *) backButtonTitle { - return @"Sections"; + return CYLocalize("SECTIONS"); +} + +- (id) rightButtonTitle { + return [sections_ count] == 0 ? nil : editing_ ? CYLocalize("DONE") : CYLocalize("EDIT"); +} + +- (UINavigationButtonStyle) rightButtonStyle { + return editing_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal; } - (UIView *) accessoryView { @@ -3918,6 +6218,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); } - (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section { + NSLog(@"titleForSection:%u", section); return [[sections_ objectAtIndex:section] name]; } @@ -3949,7 +6250,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); if (row == INT_MAX) return; Package *package = [packages_ objectAtIndex:row]; - PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; + PackageView *view([delegate_ packageView]); [view setDelegate:delegate_]; [view setPackage:package]; [book_ pushPage:view]; @@ -3979,7 +6280,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); //[list_ setSectionListStyle:1]; UITableColumn *column = [[[UITableColumn alloc] - initWithTitle:@"Name" + initWithTitle:CYLocalize("NAME") identifier:@"name" width:[self frame].size.width ] autorelease]; @@ -3991,6 +6292,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [table setReusesTableCells:YES]; [self reloadData]; + + [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; } return self; } @@ -4000,49 +6304,80 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [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 upgradableAndEssential:NO]) + _trace(); + for (Package *package in packages) + if ( + [package installed] == nil && [package valid] && [package visible] || + [package upgradableAndEssential:YES] + ) [packages_ addObject:package]; - } - [packages_ sortUsingSelector:@selector(compareForChanges:)]; + _trace(); + [packages_ radixSortUsingFunction:reinterpret_cast(&PackageChangesRadix) withArgument:NULL]; + _trace(); - Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades" row:0] autorelease]; + Section *upgradable = [[[Section alloc] initWithName:CYLocalize("AVAILABLE_UPGRADES")] autorelease]; + Section *ignored = [[[Section alloc] initWithName:CYLocalize("IGNORED_UPGRADES")] autorelease]; Section *section = nil; + NSDate *last = nil; upgrades_ = 0; bool unseens = false; CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle); + _trace(); 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; + _profile(ChangesView$reloadData$Upgrade) + uae = [package upgradableAndEssential:YES]; + _end + + 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); - } + bool different; + _profile(ChangesView$reloadData$Compare) + different = section == nil || last != seen && (seen == nil || [seen compare:last] != NSOrderedSame); + _end + + if (different) { + last = seen; + + NSString *name; + if (seen == nil) + name = CYLocalize("UNKNOWN"); + else { + _profile(ChangesView$reloadData$Format) + name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen); + _end - if (section == nil || ![[section name] isEqualToString:name]) { - section = [[[Section alloc] initWithName:name row:offset] autorelease]; - [sections_ addObject:section]; + [name autorelease]; + } + + _profile(ChangesView$reloadData$Allocate) + name = [NSString stringWithFormat:CYLocalize("NEW_AT"), name]; + section = [[[Section alloc] initWithName:name row:offset] autorelease]; + [sections_ addObject:section]; + _end } - [name release]; [section addToCount]; + } else if ([package ignored]) + [ignored addToCount]; + else { + ++upgrades_; + [upgradable addToCount]; } } + _trace(); CFRelease(formatter); @@ -4053,6 +6388,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [sections_ removeLastObject]; } + if ([ignored count] != 0) + [sections_ insertObject:ignored atIndex:0]; if (upgrades_ != 0) [sections_ insertObject:upgradable atIndex:0]; @@ -4065,46 +6402,15 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); } - (NSString *) leftButtonTitle { - return [(CYBook *)book_ updating] ? nil : @"Refresh"; -} - -- (NSString *) rightButtonTitle { - return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade All (%u)", upgrades_]; -} - -- (NSString *) title { - return @"Changes"; -} - -@end -/* }}} */ -/* Manage View {{{ */ -@interface ManageView : PackageTable { + return [(CYBook *)book_ updating] ? nil : CYLocalize("REFRESH"); } -- (id) initWithBook:(RVBook *)book database:(Database *)database; - -@end - -@implementation ManageView - -- (id) initWithBook:(RVBook *)book database:(Database *)database { - if ((self = [super - initWithBook:book - database:database - title:nil - filter:@selector(isInstalledInSection:) - with:nil - ]) != nil) { - } return self; +- (id) rightButtonTitle { + return upgrades_ == 0 ? nil : [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), CYLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]]; } - (NSString *) title { - return @"Installed Packages"; -} - -- (NSString *) backButtonTitle { - return @"All Packages"; + return CYLocalize("CHANGES"); } @end @@ -4118,7 +6424,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); UIView *accessory_; UISearchField *field_; UITransitionView *transition_; - PackageTable *table_; + FilteredPackageTable *table_; UIPreferencesTable *advanced_; UIView *dimmed_; bool flipped_; @@ -4133,9 +6439,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @implementation SearchView - (void) dealloc { -#ifndef __OBJC2__ - [[field_ textTraits] setEditingDelegate:nil]; -#endif [field_ setDelegate:nil]; [accessory_ release]; @@ -4153,7 +6456,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); - (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group { switch (group) { - case 0: return @"Advanced Search (Coming Soon!)"; + case 0: return [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), CYLocalize("ADVANCED_SEARCH"), CYLocalize("COMING_SOON")]; default: _assert(false); } @@ -4239,10 +6542,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); 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_]; @@ -4254,53 +6553,65 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); dimmed_ = [[UIView alloc] initWithFrame:pageBounds]; CGColor dimmed(space_, 0, 0, 0, 0.5); - [dimmed_ setBackgroundColor:dimmed]; + [dimmed_ setBackgroundColor:[UIColor colorWithCGColor:dimmed]]; - table_ = [[PackageTable alloc] + table_ = [[FilteredPackageTable alloc] initWithBook:book database:database title:nil - filter:@selector(isSearchedForBy:) + filter:@selector(isUnfilteredAndSearchedForBy:) with:nil ]; [table_ setShouldHideHeaderInShortLists:NO]; [transition_ transition:0 toView:table_]; - CGRect cnfrect = {{1, 38}, {17, 18}}; + CGRect cnfrect = {{ +#ifdef __OBJC2__ + 6 + +#endif + 1, 38}, {17, 18}}; CGRect area; - area.origin.x = cnfrect.size.width + 15; - area.origin.y = 30; - area.size.width = [self bounds].size.width - area.origin.x - 18; + 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.size.height = [UISearchField defaultHeight]; field_ = [[UISearchField alloc] initWithFrame:area]; - GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16); + UIFont *font = [UIFont systemFontOfSize:16]; [field_ setFont:font]; - CFRelease(font); - [field_ setPlaceholder:@"Package Names & Descriptions"]; - [field_ setPaddingTop:5]; + [field_ setPlaceholder:CYLocalize("SEARCH_EX")]; [field_ setDelegate:self]; -#ifndef __OBJC2__ - UITextTraits *traits = [field_ textTraits]; - [traits setEditingDelegate:self]; - [traits setReturnKeyType:6]; - [traits setAutoCapsType:0]; - [traits setAutoCorrectionType:1]; -#endif + [field_ setPaddingTop:5]; + + 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_ addSubview:field_]; - UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease]; + /*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];*/ - accessory_ = [[UIView alloc] initWithFrame:CGRectMake(0, 6, cnfrect.size.width + area.size.width + 6 * 3, area.size.height + 30)]; - [accessory_ addSubview:field_]; - [accessory_ addSubview:configure]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [table_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; } return self; } @@ -4331,11 +6642,17 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [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]; } @@ -4348,7 +6665,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); } - (NSString *) backButtonTitle { - return @"Search"; + return CYLocalize("SEARCH"); } - (void) setDelegate:(id)delegate { @@ -4359,154 +6676,236 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @end /* }}} */ -@implementation CYBook +@interface SettingsView : RVPage { + _transient Database *database_; + NSString *name_; + Package *package_; + UIPreferencesTable *table_; + _UISwitchSlider *subscribedSwitch_; + _UISwitchSlider *ignoredSwitch_; + UIPreferencesControlTableCell *subscribedCell_; + UIPreferencesControlTableCell *ignoredCell_; +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package; + +@end + +@implementation SettingsView - (void) dealloc { - [overlay_ release]; - [indicator_ release]; - [prompt_ release]; - [progress_ 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; + + return 2; } -- (BOOL) updating { - return updating_; +- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group { + if (package_ == nil) + return nil; + + switch (group) { + case 0: return nil; + case 1: return nil; + + default: _assert(false); + } + + return nil; } -- (void) update { - [navbar_ setPrompt:@""]; - [navbar_ addSubview:overlay_]; - [indicator_ startAnimation]; - [prompt_ setText:@"Updating Database..."]; - [progress_ setProgress:0]; +- (BOOL) preferencesTable:(UIPreferencesTable *)table isLabelGroup:(int)group { + if (package_ == nil) + return NO; - updating_ = true; + switch (group) { + case 0: return NO; + case 1: return YES; - [NSThread - detachNewThreadSelector:@selector(_update) - toTarget:self - withObject:nil - ]; + default: _assert(false); + } + + return NO; } -- (void) _update_ { - updating_ = false; +- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group { + if (package_ == nil) + return 0; - [overlay_ removeFromSuperview]; - [indicator_ stopAnimation]; - [delegate_ reloadData]; + switch (group) { + case 0: return 1; + case 1: return 1; + + default: _assert(false); + } + + return 0; +} + +- (void) onSomething:(UIPreferencesControlTableCell *)cell withKey:(NSString *)key { + if (package_ == nil) + return; + + _UISwitchSlider *slider([cell control]); + BOOL value([slider value] != 0); + NSMutableDictionary *metadata([package_ metadata]); + + BOOL before; + if (NSNumber *number = [metadata objectForKey:key]) + before = [number boolValue]; + else + before = NO; - [self setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]]; + if (value != before) { + [metadata setObject:[NSNumber numberWithBool:value] forKey:key]; + Changed_ = true; + [delegate_ updateData]; + } } -- (id) initWithFrame:(CGRect)frame database:(Database *)database { - if ((self = [super initWithFrame:frame]) != nil) { - database_ = database; - - if (Advanced_) - [navbar_ setBarStyle:1]; +- (void) onSubscribed:(UIPreferencesControlTableCell *)cell { + [self onSomething:cell withKey:@"IsSubscribed"]; +} - CGRect ovrrect = [navbar_ bounds]; - ovrrect.size.height = [UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height; +- (void) onIgnored:(UIPreferencesControlTableCell *)cell { + [self onSomething:cell withKey:@"IsIgnored"]; +} - overlay_ = [[UIView alloc] initWithFrame:ovrrect]; +- (id) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group { + if (package_ == nil) + return nil; - CGSize indsize = [UIProgressIndicator defaultSizeForStyle:2]; - unsigned indoffset = (ovrrect.size.height - indsize.height) / 2; - CGRect indrect = {{indoffset, indoffset}, indsize}; + switch (group) { + case 0: switch (row) { + case 0: + return subscribedCell_; + case 1: + return ignoredCell_; + default: _assert(false); + } break; - indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect]; - [indicator_ setStyle:(Advanced_ ? 2 : 3)]; - [overlay_ addSubview:indicator_]; + case 1: switch (row) { + case 0: { + UIPreferencesControlTableCell *cell([[[UIPreferencesControlTableCell alloc] init] autorelease]); + [cell setShowSelection:NO]; + [cell setTitle:CYLocalize("SHOW_ALL_CHANGES_EX")]; + return cell; + } - CGSize prmsize = {200, indsize.width}; + default: _assert(false); + } break; - CGRect prmrect = {{ - indoffset * 2 + indsize.width, - (ovrrect.size.height - prmsize.height) / 2 - }, prmsize}; + default: _assert(false); + } - GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12); + return nil; +} - prompt_ = [[UITextLabel alloc] initWithFrame:prmrect]; +- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package { + if ((self = [super initWithBook:book])) { + database_ = database; + name_ = [package retain]; - [prompt_ setColor:(Advanced_ ? White_ : Blueish_)]; - [prompt_ setBackgroundColor:Clear_]; - [prompt_ setFont:font]; + table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]]; + [self addSubview:table_]; - CFRelease(font); + subscribedSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)]; + [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:kUIControlEventMouseUpInside]; - [overlay_ addSubview:prompt_]; + ignoredSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)]; + [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:kUIControlEventMouseUpInside]; - CGSize prgsize = {75, 100}; + subscribedCell_ = [[UIPreferencesControlTableCell alloc] init]; + [subscribedCell_ setShowSelection:NO]; + [subscribedCell_ setTitle:CYLocalize("SHOW_ALL_CHANGES")]; + [subscribedCell_ setControl:subscribedSwitch_]; - CGRect prgrect = {{ - ovrrect.size.width - prgsize.width - 10, - (ovrrect.size.height - prgsize.height) / 2 - } , prgsize}; + ignoredCell_ = [[UIPreferencesControlTableCell alloc] init]; + [ignoredCell_ setShowSelection:NO]; + [ignoredCell_ setTitle:CYLocalize("IGNORE_UPGRADES")]; + [ignoredCell_ setControl:ignoredSwitch_]; - progress_ = [[UIProgressBar alloc] initWithFrame:prgrect]; - [progress_ setStyle:0]; - [overlay_ addSubview:progress_]; + [table_ setDataSource:self]; + [self reloadData]; } return self; } -- (void) _update { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - Status status; - status.setDelegate(self); - - [database_ updateWithStatus:status]; +- (void) resetViewAnimated:(BOOL)animated { + [table_ resetViewAnimated:animated]; +} - [self - performSelectorOnMainThread:@selector(_update_) - withObject:nil - waitUntilDone:NO - ]; +- (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]; + } - [pool release]; + [table_ reloadData]; } -- (void) setProgressError:(NSString *)error forPackage:(NSString *)id { - [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]]; +- (NSString *) title { + return CYLocalize("SETTINGS"); } -- (void) setProgressTitle:(NSString *)title { - [self - performSelectorOnMainThread:@selector(_setProgressTitle:) - withObject:title - waitUntilDone:YES - ]; +@end + +/* Signature View {{{ */ +@interface SignatureView : BrowserView { + _transient Database *database_; + NSString *package_; } -- (void) setProgressPercent:(float)percent { +- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package; + +@end + +@implementation SignatureView + +- (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]; } -- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button { - [sheet dismiss]; +- (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) _setProgressTitle:(NSString *)title { - [prompt_ setText:[title stringByAppendingString:@"..."]]; +- (void) resetViewAnimated:(BOOL)animated { } -- (void) _addProgressOutput:(NSString *)output { +- (void) reloadData { + [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"signature" ofType:@"html"]]]; } @end +/* }}} */ @interface Cydia : UIApplication < ConfirmationViewDelegate, @@ -4519,9 +6918,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); UIView *underlay_; UIView *overlay_; CYBook *book_; - UIButtonBar *buttonbar_; + UIToolbar *buttonbar_; - ConfirmationView *confirm_; + RVBook *confirm_; NSMutableArray *essential_; NSMutableArray *broken_; @@ -4532,11 +6931,14 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); unsigned tag_; UIKeyboard *keyboard_; + UIProgressHUD *hud_; - InstallView *install_; + SectionsView *sections_; ChangesView *changes_; ManageView *manage_; SearchView *search_; + + PackageView *package_; } @end @@ -4547,47 +6949,51 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); if ([broken_ count] != 0) { int count = [broken_ count]; - UIAlertSheet *sheet = [[[UIAlertSheet alloc] - initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")] + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:(count == 1 ? CYLocalize("HALFINSTALLED_PACKAGE") : [NSString stringWithFormat:CYLocalize("HALFINSTALLED_PACKAGES"), count]) buttons:[NSArray arrayWithObjects: - @"Forcibly Clear", - @"Ignore (Temporary)", + CYLocalize("FORCIBLY_CLEAR"), + CYLocalize("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 setBodyText:CYLocalize("HALFINSTALLED_PACKAGE_EX")]; [sheet popupAlertAnimated:YES]; } else if (!Ignored_ && [essential_ count] != 0) { int count = [essential_ count]; - UIAlertSheet *sheet = [[[UIAlertSheet alloc] - initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")] - buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil] + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:(count == 1 ? CYLocalize("ESSENTIAL_UPGRADE") : [NSString stringWithFormat:CYLocalize("ESSENTIAL_UPGRADES"), count]) + buttons:[NSArray arrayWithObjects: + CYLocalize("UPGRADE_ESSENTIAL"), + CYLocalize("COMPLETE_UPGRADE"), + CYLocalize("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 setBodyText:CYLocalize("ESSENTIAL_UPGRADE_EX")]; [sheet popupAlertAnimated:YES]; } } - (void) _reloadData { - /*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_]; - [hud setText:@"Reloading Data"]; - [overlay_ addSubview:hud]; - [hud show:YES];*/ + UIView *block(); - [database_ reloadData]; + static bool loaded(false); + UIProgressHUD *hud([self addProgressHUD]); + [hud setText:(loaded ? CYLocalize("RELOADING_DATA") : CYLocalize("LOADING_DATA"))]; + loaded = true; - if (Packages_ == nil) { - Packages_ = [[NSMutableDictionary alloc] initWithCapacity:128]; - [Metadata_ setObject:Packages_ forKey:@"Packages"]; - } + [database_ yieldToSelector:@selector(reloadData) withObject:nil]; + _trace(); + + [self removeProgressHUD:hud]; size_t changes(0); @@ -4595,8 +7001,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [broken_ removeAllObjects]; NSArray *packages = [database_ packages]; - for (int i(0), e([packages count]); i != e; ++i) { - Package *package = [packages objectAtIndex:i]; + for (Package *package in packages) { if ([package half]) [broken_ addObject:package]; if ([package upgradableAndEssential:NO]) { @@ -4610,42 +7015,106 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); 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]; + [buttonbar_ setBadgeAnimated:([essential_ count] != 0) forButton:3]; + 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]; + if ([self respondsToSelector:@selector(removeApplicationBadge)]) + [self removeApplicationBadge]; + else // XXX: maybe use setApplicationBadgeString also? + [self setApplicationIconBadgeNumber:0]; + } + + Queuing_ = false; + [buttonbar_ setBadgeValue:nil forButton:4]; + + [self updateData]; + + // XXX: what is this line of code for? + if ([packages count] == 0); + else if (Loaded_ || ManualRefresh) loaded: + [self _loaded]; + else { + Loaded_ = YES; + + if (NSDate *update = [Metadata_ objectForKey:@"LastUpdate"]) { + NSTimeInterval interval([update timeIntervalSinceNow]); + if (interval <= 0 && interval > -600) + goto loaded; + } + + [book_ update]; } +} +- (void) _saveConfig { if (Changed_) { - _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES); + _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_ != 2) - [install_ reloadData]; - if (tag_ != 3) + if (tag_ != 2 && sections_ != nil) + [sections_ reloadData]; + if (tag_ != 3 && changes_ != nil) [changes_ reloadData]; - if (tag_ != 4) - [manage_ reloadData]; - if (tag_ != 5) + if (tag_ != 5 && search_ != nil) [search_ reloadData]; [book_ reloadData]; +} - if ([packages count] == 0); - else if (Loaded_) - [self _loaded]; - else { - Loaded_ = YES; - [book_ update]; +- (void) update_ { + [database_ update]; +} + +- (void) syncData { + FILE *file = fopen("/etc/apt/sources.list.d/cydia.list", "w"); + _assert(file != NULL); + + NSArray *keys = [Sources_ allKeys]; + + for (NSString *key in keys) { + NSDictionary *source = [Sources_ objectForKey:key]; + + fprintf(file, "%s %s %s\n", + [[source objectForKey:@"Type"] UTF8String], + [[source objectForKey:@"URI"] UTF8String], + [[source objectForKey:@"Distribution"] UTF8String] + ); } - /*[hud show:NO]; - [hud removeFromSuperview];*/ + fclose(file); + + [self _saveConfig]; + + [progress_ + detachNewThreadSelector:@selector(update_) + toTarget:self + withObject:nil + title:CYLocalize("UPDATING_SOURCES") + ]; } - (void) reloadData { @@ -4663,33 +7132,38 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); _error->Discard(); } +- (void) popUpBook:(RVBook *)book { + [underlay_ popSubview:book]; +} + +- (CGRect) popUpBounds { + return [underlay_ bounds]; +} + - (void) perform { [database_ prepare]; - if ([database_ cache]->BrokenCount() == 0) - confirm_ = [[ConfirmationView alloc] initWithView:underlay_ database:database_ delegate:self]; - else { - NSMutableArray *broken = [NSMutableArray arrayWithCapacity:16]; - NSArray *packages = [database_ packages]; + confirm_ = [[RVBook alloc] initWithFrame:[self popUpBounds]]; + [confirm_ setDelegate:self]; - for (size_t i(0); i != [packages count]; ++i) { - Package *package = [packages objectAtIndex:i]; - if ([package broken]) - [broken addObject:[package name]]; - } + ConfirmationView *page([[[ConfirmationView alloc] initWithBook:confirm_ database:database_] autorelease]); + [page setDelegate:self]; - UIAlertSheet *sheet = [[[UIAlertSheet alloc] - initWithTitle:[NSString stringWithFormat:@"%d Broken Packages", [database_ cache]->BrokenCount()] - buttons:[NSArray arrayWithObjects:@"Okay", nil] - defaultButtonIndex:0 - delegate:self - context:@"broken" - ] autorelease]; + [confirm_ setPage:page]; + [self popUpBook:confirm_]; +} - [sheet setBodyText:[NSString stringWithFormat:@"The following packages have unmet dependencies:\n\n%@", [broken componentsJoinedByString:@"\n"]]]; - [sheet popupAlertAnimated:YES]; +- (void) queue { + @synchronized (self) { + [self perform]; + } +} - [self _reloadData]; +- (void) clearPackage:(Package *)package { + @synchronized (self) { + [package clear]; + [self resolve]; + [self perform]; } } @@ -4717,10 +7191,23 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); } - (void) cancel { + [self slideUp:[[[UIActionSheet alloc] + initWithTitle:nil + buttons:[NSArray arrayWithObjects:CYLocalize("CONTINUE_QUEUING"), CYLocalize("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; + } } } @@ -4732,7 +7219,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); detachNewThreadSelector:@selector(perform) toTarget:database_ withObject:nil - title:@"Running..." + title:CYLocalize("RUNNING") ]; } @@ -4743,81 +7230,23 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [database_ perform]; } +/* XXX: replace and localize */ - (void) bootstrap { [progress_ detachNewThreadSelector:@selector(bootstrap_) toTarget:self withObject:nil - title:@"Bootstrap Install..." + title:@"Bootstrap Install" ]; } - (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]; } -} - -- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button { - NSString *context = [sheet context]; - 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]; - [broken remove]; - - NSString *id = [broken id]; - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]); - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]); - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]); - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]); - } - - [self resolve]; - [self perform]; - } - break; - - case 2: - [broken_ removeAllObjects]; - [self _loaded]; - break; - - default: - _assert(false); - } - 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]; - [essential install]; - } - - [self resolve]; - [self perform]; - } - break; - - case 2: - Ignored_ = YES; - break; - default: - _assert(false); - } - - [sheet dismiss]; + [self complete]; } - (void) setPage:(RVPage *)page { @@ -4826,85 +7255,114 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [book_ setPage:page]; } -- (RVPage *) _setHomePage { - BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease]; - [self setPage:browser]; - [browser loadURL:[NSURL URLWithString:@"http://cydia.saurik.com/"]]; +- (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class { + BrowserView *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_; +} + - (void) buttonBarItemTapped:(id)sender { unsigned tag = [sender tag]; if (tag == tag_) { [book_ resetViewAnimated:YES]; return; - } + } else if (tag_ == 2 && tag != 2) + [[self sectionsView] resetView]; switch (tag) { case 1: [self _setHomePage]; break; - case 2: [self setPage:install_]; break; + case 2: [self setPage:[self sectionsView]]; break; case 3: [self setPage:changes_]; break; case 4: [self setPage:manage_]; break; case 5: [self setPage:search_]; break; - default: _assert(false); + default: _assert(false); + } + + tag_ = tag; +} + +- (void) applicationWillSuspend { + [database_ clean]; + [super applicationWillSuspend]; +} + +- (void) askForSettings { + NSString *parenthetical(CYLocalize("PARENTHETICAL")); + + UIActionSheet *role = [[[UIActionSheet alloc] + initWithTitle:CYLocalize("WHO_ARE_YOU") + buttons:[NSArray arrayWithObjects: + [NSString stringWithFormat:parenthetical, CYLocalize("USER"), CYLocalize("USER_EX")], + [NSString stringWithFormat:parenthetical, CYLocalize("HACKER"), CYLocalize("HACKER_EX")], + [NSString stringWithFormat:parenthetical, CYLocalize("DEVELOPER"), CYLocalize("DEVELOPER_EX")], + nil] + defaultButtonIndex:-1 + delegate:self + context:@"role" + ] autorelease]; + + [role setBodyText:CYLocalize("ROLE_EX")]; + [role popupAlertAnimated:YES]; +} + +- (void) setPackageView:(PackageView *)view { + if (package_ == nil) + package_ = [view retain]; + NSLog(@"packageView: %@", package_); +} + +- (PackageView *) packageView { + PackageView *view; + + if (package_ == nil) + view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; + else { + return package_; + view = [package_ autorelease]; + package_ = nil; } - tag_ = tag; + return view; } -- (void) applicationWillSuspend { - [super applicationWillSuspend]; +- (void) finish { + if (hud_ != nil) { + [self setStatusBarShowsProgress:NO]; + [self removeProgressHUD:hud_]; - [database_ clean]; + [hud_ autorelease]; + hud_ = nil; - if (reload_) { pid_t pid = ExecFork(); if (pid == 0) { - sleep(1); - if (pid_t child = fork()) - waitpid(child, NULL, 0); - else { - execlp("launchctl", "launchctl", "unload", SpringBoard_, NULL); - exit(0); - } - execlp("launchctl", "launchctl", "load", SpringBoard_, NULL); - exit(0); + execlp("launchctl", "launchctl", "stop", "com.apple.SpringBoard", NULL); + perror("launchctl stop"); } - } -} - -- (void) applicationDidFinishLaunching:(id)unused { - _assert(pkgInitConfig(*_config)); - _assert(pkgInitSystem(*_config, _system)); - confirm_ = nil; - tag_ = 1; - - essential_ = [[NSMutableArray alloc] initWithCapacity:4]; - broken_ = [[NSMutableArray alloc] initWithCapacity:4]; - - CGRect screenrect = [UIHardware fullScreenApplicationContentRect]; - window_ = [[UIWindow alloc] initWithContentRect:screenrect]; - - [window_ orderFront: self]; - [window_ makeKey: self]; - [window_ _setHidden: NO]; - - database_ = [[Database alloc] init]; - progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self]; - [database_ setDelegate:progress_]; - [window_ setContentView:progress_]; + return; + } - underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]]; - [progress_ setContentView:underlay_]; + if (Role_ == nil) { + [self askForSettings]; + return; + } + _trace(); overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]]; - if (!bootstrap_) - [underlay_ addSubview:overlay_]; - + CGRect screenrect = [UIHardware fullScreenApplicationContentRect]; book_ = [[CYBook alloc] initWithFrame:CGRectMake( 0, 0, screenrect.size.width, screenrect.size.height - 48 ) database:database_]; @@ -4920,7 +7378,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @"home-dn.png", kUIButtonBarButtonSelectedInfo, [NSNumber numberWithInt:1], kUIButtonBarButtonTag, self, kUIButtonBarButtonTarget, - @"Home", kUIButtonBarButtonTitle, + CYLocalize("HOME"), kUIButtonBarButtonTitle, @"0", kUIButtonBarButtonType, nil], @@ -4930,7 +7388,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @"install-dn.png", kUIButtonBarButtonSelectedInfo, [NSNumber numberWithInt:2], kUIButtonBarButtonTag, self, kUIButtonBarButtonTarget, - @"Install", kUIButtonBarButtonTitle, + CYLocalize("SECTIONS"), kUIButtonBarButtonTitle, @"0", kUIButtonBarButtonType, nil], @@ -4940,7 +7398,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @"changes-dn.png", kUIButtonBarButtonSelectedInfo, [NSNumber numberWithInt:3], kUIButtonBarButtonTag, self, kUIButtonBarButtonTarget, - @"Changes", kUIButtonBarButtonTitle, + CYLocalize("CHANGES"), kUIButtonBarButtonTitle, @"0", kUIButtonBarButtonType, nil], @@ -4950,7 +7408,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @"manage-dn.png", kUIButtonBarButtonSelectedInfo, [NSNumber numberWithInt:4], kUIButtonBarButtonTag, self, kUIButtonBarButtonTarget, - @"Manage", kUIButtonBarButtonTitle, + CYLocalize("MANAGE"), kUIButtonBarButtonTitle, @"0", kUIButtonBarButtonType, nil], @@ -4960,12 +7418,12 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @"search-dn.png", kUIButtonBarButtonSelectedInfo, [NSNumber numberWithInt:5], kUIButtonBarButtonTag, self, kUIButtonBarButtonTarget, - @"Search", kUIButtonBarButtonTitle, + CYLocalize("SEARCH"), kUIButtonBarButtonTitle, @"0", kUIButtonBarButtonType, nil], nil]; - buttonbar_ = [[UIButtonBar alloc] + buttonbar_ = [[UIToolbar alloc] initInView:overlay_ withFrame:CGRectMake( 0, screenrect.size.height - ButtonBarHeight_, @@ -4994,16 +7452,26 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); CGSize keysize = [UIKeyboard defaultSize]; CGRect keyrect = {{0, [overlay_ bounds].size.height}, keysize}; keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect]; - [[UIKeyboardImpl sharedInstance] setSoundsEnabled:(Sounds_Keyboard_ ? YES : NO)]; + //[[UIKeyboardImpl sharedInstance] setSoundsEnabled:(Sounds_Keyboard_ ? YES : NO)]; [overlay_ addSubview:keyboard_]; - install_ = [[InstallView alloc] initWithBook:book_ database:database_]; + if (!bootstrap_) + [underlay_ addSubview:overlay_]; + + [self reloadData]; + + [self sectionsView]; changes_ = [[ChangesView alloc] initWithBook:book_ database:database_]; - manage_ = [[ManageView alloc] initWithBook:book_ database:database_]; search_ = [[SearchView alloc] initWithBook:book_ database:database_]; - [progress_ resetView]; - [self reloadData]; + manage_ = (ManageView *) [[self + _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]] + withClass:[ManageView class] + ] retain]; + + [self setPackageView:[self packageView]]; + + PrintTimes(); if (bootstrap_) [self bootstrap]; @@ -5011,6 +7479,311 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [self _setHomePage]; } +- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { + NSString *context([sheet context]); + + if ([context isEqualToString:@"missing"]) + [sheet dismiss]; + else if ([context isEqualToString:@"cancel"]) { + bool clear; + + switch (button) { + case 1: + clear = false; + break; + + case 2: + clear = true; + break; + + default: + _assert(false); + } + + [sheet dismiss]; + + @synchronized (self) { + if (clear) + [self _reloadData]; + else { + Queuing_ = true; + [buttonbar_ setBadgeValue:CYLocalize("Q_D") forButton:4]; + [book_ reloadData]; + } + + if (confirm_ != nil) { + [confirm_ release]; + confirm_ = nil; + } + } + } else if ([context isEqualToString:@"fixhalf"]) { + switch (button) { + case 1: + @synchronized (self) { + for (Package *broken in broken_) { + [broken remove]; + + NSString *id = [broken id]; + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]); + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]); + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]); + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]); + } + + [self resolve]; + [self perform]; + } + break; + + case 2: + [broken_ removeAllObjects]; + [self _loaded]; + break; + + default: + _assert(false); + } + + [sheet dismiss]; + } 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); + } + + bool reset = Settings_ != nil; + + Settings_ = [NSMutableDictionary dictionaryWithObjectsAndKeys: + Role_, @"Role", + nil]; + + [Metadata_ setObject:Settings_ forKey:@"Settings"]; + + Changed_ = true; + + if (reset) + [self updateData]; + else + [self finish]; + + [sheet dismiss]; + } else if ([context isEqualToString:@"upgrade"]) { + switch (button) { + case 1: + @synchronized (self) { + for (Package *essential in essential_) + [essential install]; + + [self resolve]; + [self perform]; + } + break; + + case 2: + [self distUpgrade]; + break; + + case 3: + Ignored_ = YES; + break; + + default: + _assert(false); + } + + [sheet dismiss]; + } +} + +- (void) reorganize { _pooled + system("/usr/libexec/cydia/free.sh"); + [self performSelectorOnMainThread:@selector(finish) withObject:nil waitUntilDone:NO]; +} + +- (void) applicationSuspend:(__GSEvent *)event { + if (hud_ == nil && ![progress_ isRunning]) + [super applicationSuspend:event]; +} + +- (void) _animateSuspension:(BOOL)arg0 duration:(double)arg1 startTime:(double)arg2 scale:(float)arg3 { + if (hud_ == nil) + [super _animateSuspension:arg0 duration:arg1 startTime:arg2 scale:arg3]; +} + +- (void) _setSuspended:(BOOL)value { + if (hud_ == nil) + [super _setSuspended:value]; +} + +- (UIProgressHUD *) addProgressHUD { + UIProgressHUD *hud([[[UIProgressHUD alloc] initWithWindow:window_] autorelease]); + [window_ setUserInteractionEnabled:NO]; + [hud show:YES]; + [progress_ addSubview:hud]; + return hud; +} + +- (void) removeProgressHUD:(UIProgressHUD *)hud { + [hud show:NO]; + [hud removeFromSuperview]; + [window_ setUserInteractionEnabled:YES]; +} + +- (void) openMailToURL:(NSURL *)url { +// XXX: this makes me sad +#if 0 + [[[MailToView alloc] initWithView:underlay_ delegate:self url:url] autorelease]; +#else + [UIApp openURL:url];// asPanel:YES]; +#endif +} + +- (void) clearFirstResponder { + if (id responder = [window_ firstResponder]) + [responder resignFirstResponder]; +} + +- (RVPage *) pageForPackage:(NSString *)name { + if (Package *package = [database_ packageWithName:name]) { + PackageView *view([self packageView]); + [view setPackage:package]; + return view; + } else { + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:CYLocalize("CANNOT_LOCATE_PACKAGE") + buttons:[NSArray arrayWithObjects:CYLocalize("CLOSE"), nil] + defaultButtonIndex:0 + delegate:self + context:@"missing" + ] autorelease]; + + [sheet setBodyText:[NSString stringWithFormat:CYLocalize("PACKAGE_CANNOT_BE_FOUND"), name]]; + + [sheet popupAlertAnimated:YES]; + return nil; + } +} + +- (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag { + if (tag != NULL) + tag = 0; + + 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:[BrowserView class]]; + else if ([path isEqualToString:@"/sources"]) + return [[[SourceTable alloc] initWithBook:book_ database:database_] autorelease]; + else if ([path isEqualToString:@"/packages"]) + return [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease]; + else if ([path hasPrefix:@"/url/"]) + return [self _pageForURL:[NSURL URLWithString:[path substringFromIndex:5]] withClass:[BrowserView class]]; + 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]; + [buttonbar_ showSelectionForButton:tag]; + tag_ = tag; + } +} + +- (void) applicationDidFinishLaunching:(id)unused { + _trace(); + 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)); + + tag_ = 1; + + essential_ = [[NSMutableArray alloc] initWithCapacity:4]; + broken_ = [[NSMutableArray alloc] initWithCapacity:4]; + + [NSURLProtocol registerClass:[CydiaURLProtocol class]]; + + CGRect screenrect = [UIHardware fullScreenApplicationContentRect]; + window_ = [[UIWindow alloc] initWithContentRect:screenrect]; + + [window_ orderFront:self]; + [window_ makeKey:self]; + [window_ setHidden:NO]; + + database_ = [Database sharedInstance]; + progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self]; + [database_ setDelegate:progress_]; + [window_ setContentView:progress_]; + + underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]]; + [progress_ setContentView:underlay_]; + + [progress_ resetView]; + + if ( + readlink("/Applications", NULL, 0) == -1 && errno == EINVAL || + readlink("/Library/Ringtones", NULL, 0) == -1 && errno == EINVAL || + readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL || + readlink("/usr/include", 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*/ + ) { + [self setIdleTimerDisabled:YES]; + + hud_ = [[self addProgressHUD] retain]; + [hud_ setText:@"Reorganizing\n\nWill Automatically\nClose When Done"]; + + [self setStatusBarShowsProgress:YES]; + + [NSThread + detachNewThreadSelector:@selector(reorganize) + toTarget:self + withObject:nil + ]; + } else + [self finish]; +} + - (void) showKeyboard:(BOOL)show { CGSize keysize = [UIKeyboard defaultSize]; CGRect keydown = {{0, [overlay_ bounds].size.height}, keysize}; @@ -5037,7 +7810,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); ]; } -- (void) slideUp:(UIAlertSheet *)alert { +- (void) slideUp:(UIActionSheet *)alert { if (Advanced_) [alert presentSheetFromButtonBar:buttonbar_]; else @@ -5046,17 +7819,14 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @end -void AddPreferences(NSString *plist) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - +void AddPreferences(NSString *plist) { _pooled 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]); + for (NSMutableDictionary *item in items) { NSString *label = [item objectForKey:@"label"]; if (label != nil && [label isEqualToString:@"Cydia"]) { cydia = true; @@ -5083,29 +7853,70 @@ void AddPreferences(NSString *plist) { _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; + +void (*_UIWebDocumentView$_setUIKitDelegate$)(UIWebDocumentView *, SEL, id); + +void $UIWebDocumentView$_setUIKitDelegate$(UIWebDocumentView *self, SEL sel, id delegate) { + if (delegate == nil && $WebDefaultUIKitDelegate != nil) + delegate = [$WebDefaultUIKitDelegate sharedUIKitDelegate]; + return _UIWebDocumentView$_setUIKitDelegate$(self, sel, delegate); +} + +int main(int argc, char *argv[]) { _pooled + _trace(); + + Locale_ = CFLocaleCopyCurrent(); + + CFStringRef locale(CFLocaleGetIdentifier(Locale_)); + setenv("LANG", [(NSString *) locale UTF8String], true); + + // XXX: apr_app_initialize? + apr_initialize(); + + class_addMethod(objc_getClass("DOMNodeList"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &DOMNodeList$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16"); + + 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; + } - bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0; + for (int argi(1); argi != arge; ++argi) + if (strcmp(args[argi], "--bootstrap") == 0) + bootstrap_ = true; + else if (strcmp(args[argi], "--substrate") == 0) + substrate = true; + else + fprintf(stderr, "unknown argument: %s\n", args[argi]); + } + App_ = [[NSBundle mainBundle] bundlePath]; Home_ = NSHomeDirectory(); { @@ -5118,6 +7929,20 @@ int main(int argc, char *argv[]) { setuid(0); setgid(0); +#if 1 /* XXX: this costs 1.4s of startup performance */ + if (unlink("/var/cache/apt/pkgcache.bin") == -1) + _assert(errno == ENOENT); + if (unlink("/var/cache/apt/srcpkgcache.bin") == -1) + _assert(errno == ENOENT); +#endif + + $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$)); + } + /*Method alloc = class_getClassMethod([NSObject class], @selector(alloc)); alloc_ = alloc->method_imp; alloc->method_imp = (IMP) &Alloc_;*/ @@ -5126,58 +7951,128 @@ 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; - } + 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("hw.machine", NULL, &size, NULL, 0); char *machine = new char[size]; - sysctlbyname("hw.machine", machine, &size, NULL, 0); - 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_ = strdup(CFStringGetCStringPtr((CFStringRef) serial, CFStringGetSystemEncoding())); - CFRelease(serial); - } + if (sysctlbyname("hw.machine", machine, &size, NULL, 0) == -1) + perror("sysctlbyname(\"hw.machine\", ?)"); + else + Machine_ = machine; - IOObjectRelease(service); - } + UniqueID_ = [[UIDevice currentDevice] uniqueIdentifier]; + + 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"]; + } /*AddPreferences(@"/Applications/Preferences.app/Settings-iPhone.plist"); AddPreferences(@"/Applications/Preferences.app/Settings-iPod.plist");*/ - if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL) - Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2]; - else + _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_ == NULL) + Metadata_ = [NSMutableDictionary dictionaryWithCapacity:2]; + else { + Settings_ = [Metadata_ objectForKey:@"Settings"]; + Packages_ = [Metadata_ objectForKey:@"Packages"]; + Sections_ = [Metadata_ objectForKey:@"Sections"]; + Sources_ = [Metadata_ objectForKey:@"Sources"]; + } + + if (Settings_ != nil) + Role_ = [Settings_ objectForKey:@"Role"]; + + if (Packages_ == nil) { + Packages_ = [[[NSMutableDictionary alloc] initWithCapacity:128] autorelease]; + [Metadata_ setObject:Packages_ forKey:@"Packages"]; + } + + if (Sections_ == nil) { + Sections_ = [[[NSMutableDictionary alloc] initWithCapacity:32] autorelease]; + [Metadata_ setObject:Sections_ forKey:@"Sections"]; + } + + if (Sources_ == nil) { + Sources_ = [[[NSMutableDictionary alloc] initWithCapacity:0] autorelease]; + [Metadata_ setObject:Sources_ forKey:@"Sources"]; + } + +#if RecycleWebViews + Documents_ = [[[NSMutableArray alloc] initWithCapacity:4] autorelease]; +#endif - if (access("/User", F_OK) != 0) + 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("/User", F_OK) != 0) { + _trace(); system("/usr/libexec/cydia/firmware.sh"); + _trace(); + } + + _assert([[NSFileManager defaultManager] + createDirectoryAtPath:@"/var/cache/apt/archives/partial" + withIntermediateDirectories:YES + attributes:nil + error:NULL + ]); - Locale_ = CFLocaleCopyCurrent(); 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); - Clear_.Set(space_, 0.0, 0.0, 0.0, 0.0); - Red_.Set(space_, 1.0, 0.0, 0.0, 1.0); + Off_.Set(space_, 0.9, 0.9, 0.9, 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); + /*Purple_.Set(space_, 1.0, 0.3, 0.0, 1.0); + Purplish_.Set(space_, 1.0, 0.6, 0.4, 1.0); ORANGE */ + /*Purple_.Set(space_, 1.0, 0.5, 0.0, 1.0); + Purplish_.Set(space_, 1.0, 0.7, 0.2, 1.0); ORANGISH */ + /*Purple_.Set(space_, 0.5, 0.0, 0.7, 1.0); + Purplish_.Set(space_, 0.7, 0.4, 0.8, 1.0); PURPLE */ + +//.93 + 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]; + + Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil]; + + void (*$GSFontSetUseLegacyFontMetrics)(BOOL)(reinterpret_cast(dlsym(RTLD_DEFAULT, "GSFontSetUseLegacyFontMetrics"))); + if ($GSFontSetUseLegacyFontMetrics != NULL) + $GSFontSetUseLegacyFontMetrics(YES); + + UIKeyboardDisableAutomaticAppearance(); - int value = UIApplicationMain(argc, argv, [Cydia class]); + _trace(); + int value = UIApplicationMain(argc, argv, @"Cydia", @"Cydia"); CGColorSpaceRelease(space_); CFRelease(Locale_); - [pool release]; return value; }