This is getting nuts, I need an internal branch.

[cydia.git] / Cydia.mm

diff --git a/Cydia.mm b/Cydia.mm
index aa809a7daa07bdfe53cd0adae27587e4a37207d9..827b02046fba5425efab4ca557a963c9681e38a2 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -35,7 +35,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 

+// XXX: wtf/FastMalloc.h... wtf?
+#define USE_SYSTEM_MALLOC 1
+

 /* #include Directives {{{ */
 /* #include Directives {{{ */

+#import "UICaboodle.h"
+
+#include <objc/message.h>

 #include <objc/objc.h>
 #include <objc/runtime.h>
 
 #include <objc/objc.h>
 #include <objc/runtime.h>
 


@@ -44,21 +50,12 @@
 #include <Foundation/Foundation.h>
 
 #import <QuartzCore/CALayer.h>
 #include <Foundation/Foundation.h>
 
 #import <QuartzCore/CALayer.h>

-

 #import <UIKit/UIKit.h>
 
 #import <UIKit/UIKit.h>
 

-// XXX: remove
-#import <MessageUI/MailComposeController.h>
-
-#import <WebCore/WebScriptObject.h>
-//#include <WebCore/DOMHTML.h>
-
-#include <WebKit/WebFrame.h>
-#include <WebKit/WebPolicyDelegate.h>
-#include <WebKit/WebView.h>
-
-#import <WebKit/WebView-WebPrivate.h>
+#include <WebCore/WebCoreThread.h>
+#import <WebKit/WebDefaultUIKitDelegate.h>

 
 

+#include <iomanip>

 #include <sstream>
 #include <string>
 
 #include <sstream>
 #include <string>
 


@@ -80,9 +77,13 @@
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/strutl.h>
 

+#include <apr-1/apr_pools.h>
+

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>

+#include <sys/param.h>
+#include <sys/mount.h>

 
 #include <notify.h>
 #include <dlfcn.h>
 
 #include <notify.h>
 #include <dlfcn.h>


@@ -98,14 +99,92 @@ extern "C" {
 #include <errno.h>
 #include <pcre.h>
 
 #include <errno.h>
 #include <pcre.h>
 

+#include <ext/hash_map>
+

 #import "BrowserView.h"
 #import "ResetView.h"
 #import "BrowserView.h"
 #import "ResetView.h"

-#import "UICaboodle.h"
+
+#import "substrate.h"

 /* }}} */
 
 //#define _finline __attribute__((force_inline))
 #define _finline inline
 
 /* }}} */
 
 //#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<class ProfileTime *> TimeList;
+TimeList times_;
+
+class ProfileTime {
+  private:
+    const char *name_;
+    uint64_t total_;
+    uint64_t count_;
+
+  public:
+    ProfileTime(const char *name) :
+        name_(name),
+        total_(0)
+    {
+        times_.push_back(this);
+    }
+
+    void AddTime(uint64_t time) {
+        total_ += time;
+        ++count_;
+    }
+
+    void Print() {
+        if (total_ != 0)
+            std::cerr << std::setw(5) << count_ << ", " << std::setw(7) << total_ << " : " << name_ << std::endl;
+        total_ = 0;
+        count_ = 0;
+    }
+};
+
+class ProfileTimer {
+  private:
+    ProfileTime &time_;
+    uint64_t start_;
+
+  public:
+    ProfileTimer(ProfileTime &time) :
+        time_(time),
+        start_(_timestamp)
+    {
+    }
+
+    ~ProfileTimer() {
+        time_.AddTime(_timestamp - start_);
+    }
+};
+
+void PrintTimes() {
+    for (TimeList::const_iterator i(times_.begin()); i != times_.end(); ++i)
+        (*i)->Print();
+    std::cerr << "========" << std::endl;
+}
+
+#define _profile(name) { \
+    static ProfileTime name(#name); \
+    ProfileTimer _ ## name(name);
+
+#define _end }
+/* }}} */

 /* Objective-C Handle<> {{{ */
 template <typename Type_>
 class _H {
 /* Objective-C Handle<> {{{ */
 template <typename Type_>
 class _H {


@@ -148,11 +227,83 @@ class _H {
 
 #define _pooled _H<NSAutoreleasePool> _pool([[NSAutoreleasePool alloc] init], true);
 
 
 #define _pooled _H<NSAutoreleasePool> _pool([[NSAutoreleasePool alloc] init], true);
 

+void NSLogPoint(const char *fix, const CGPoint &point) {
+    NSLog(@"%s(%g,%g)", fix, point.x, point.y);
+}
+

 void NSLogRect(const char *fix, const CGRect &rect) {
     NSLog(@"%s(%g,%g)+(%g,%g)", fix, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
 }
 
 void NSLogRect(const char *fix, const CGRect &rect) {
     NSLog(@"%s(%g,%g)+(%g,%g)", fix, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
 }
 

-static const NSStringCompareOptions CompareOptions_ = NSCaseInsensitiveSearch | NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSForcedOrderingSearch;
+@interface NSObject (Cydia)
+- (id) yieldToSelector:(SEL)selector withObject:(id)object;
+- (id) yieldToSelector:(SEL)selector;
+@end
+
+@implementation NSObject (Cydia)
+
+- (void) doNothing {
+}
+
+- (void) _yieldToContext:(NSMutableArray *)context { _pooled
+    SEL selector(reinterpret_cast<SEL>([[context objectAtIndex:0] pointerValue]));
+    id object([[context objectAtIndex:1] nonretainedObjectValue]);
+    volatile bool &stopped(*reinterpret_cast<bool *>([[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;
+
+    [self
+        performSelectorOnMainThread:@selector(doNothing)
+        withObject:nil
+        waitUntilDone:NO
+    ];
+}
+
+- (id) yieldToSelector:(SEL)selector withObject:(id)object {
+    /*return [self performSelector:selector withObject:object];*/
+
+    volatile bool stopped(false);
+
+    NSMutableArray *context([NSMutableArray arrayWithObjects:
+        [NSValue valueWithPointer:selector],
+        [NSValue valueWithNonretainedObject:object],
+        [NSValue valueWithPointer:const_cast<bool *>(&stopped)],
+    nil]);
+
+    NSThread *thread([[[NSThread alloc]
+        initWithTarget:self
+        selector:@selector(_yieldToContext:)
+        object:context
+    ] autorelease]);
+
+    [thread start];
+
+    NSRunLoop *loop([NSRunLoop currentRunLoop]);
+    NSDate *future([NSDate distantFuture]);
+
+    while (!stopped && [loop runMode:NSDefaultRunLoopMode beforeDate:future]);
+
+    return [context count] == 0 ? nil : [context objectAtIndex:0];
+}
+
+- (id) yieldToSelector:(SEL)selector {
+    return [self yieldToSelector:selector withObject:nil];
+}
+
+@end
+
+/* 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__
 
 /* iPhoneOS 2.0 Compatibility {{{ */
 #ifdef __OBJC2__


@@ -206,18 +357,13 @@ extern NSString * const kCAFilterNearest;
 
 @implementation PopTransitionView
 
 
 @implementation PopTransitionView
 

-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
+- (void) transitionViewDidComplete:(UITransitionView *)view fromView:(UIView *)from toView:(UIView *)to {

     if (from != nil && to == nil)
         [self removeFromSuperview];
 }
 
 @end
 
     if (from != nil && to == nil)
         [self removeFromSuperview];
 }
 
 @end
 

-@interface UIView (PopUpView)
-- (void) popFromSuperviewAnimated:(BOOL)animated;
-- (void) popSubview:(UIView *)view;
-@end
-

 @implementation UIView (PopUpView)
 
 - (void) popFromSuperviewAnimated:(BOOL)animated {
 @implementation UIView (PopUpView)
 
 - (void) popFromSuperviewAnimated:(BOOL)animated {


@@ -239,8 +385,154 @@ extern NSString * const kCAFilterNearest;
 
 #define lprintf(args...) fprintf(stderr, args)
 
 
 #define lprintf(args...) fprintf(stderr, args)
 

-#define ForSaurik 1
+#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 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,
 
 typedef enum {
     kUIControlEventMouseDown = 1 << 0,


@@ -251,23 +543,47 @@ typedef enum {
     kUIControlAllEvents = (kUIControlEventMouseDown | kUIControlEventMouseMovedInside | kUIControlEventMouseMovedOutside | kUIControlEventMouseUpInside | kUIControlEventMouseUpOutside)
 } UIControlEventMasks;
 
     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)
 @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 *) stringWithUTF8Bytes:(const char *)bytes length:(int)length;
 - (NSComparisonResult) compareByPath:(NSString *)other;

+- (NSString *) stringByCachingURLWithCurrentCDN;
+- (NSString *) stringByAddingPercentEscapesIncludingReserved;

 @end
 
 @implementation NSString (Cydia)
 
 @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<char *>(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<char *>(apr_palloc(pool, length)));

     memcpy(data, bytes, 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 {
 }
 
 - (NSComparisonResult) compareByPath:(NSString *)other {


@@ -300,8 +616,148 @@ typedef enum {
     return result == NSOrderedSame ? value : result;
 }
 
     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
 
 @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<CFStringRef>(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<char *>(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<uint8_t *>(data_), size_, kCFStringEncodingUTF8, NO, kCFAllocatorNull);
+        } return (id) cache_;
+    }
+};
+
+extern "C" {
+    CF_EXPORT CFHashCode CFStringHashNSString(CFStringRef str);
+}
+
+struct NSStringMapHash :
+    std::unary_function<NSString *, size_t>
+{
+    _finline size_t operator ()(NSString *value) const {
+        return CFStringHashNSString((CFStringRef) value);
+    }
+};
+
+struct NSStringMapLess :
+    std::binary_function<NSString *, NSString *, bool>
+{
+    _finline bool operator ()(NSString *lhs, NSString *rhs) const {
+        return [lhs compare:rhs] == NSOrderedAscending;
+    }
+};
+
+struct NSStringMapEqual :
+    std::binary_function<NSString *, NSString *, bool>
+{
+    _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:
 /* Perl-Compatible RegEx {{{ */
 class Pcre {
   private:


@@ -357,6 +813,8 @@ class Pcre {
 - (NSString *) name;
 - (NSString *) address;
 
 - (NSString *) name;
 - (NSString *) address;
 

+- (void) setAddress:(NSString *)address;
+

 + (Address *) addressWithString:(NSString *)string;
 - (Address *) initWithString:(NSString *)string;
 @end
 + (Address *) addressWithString:(NSString *)string;
 - (Address *) initWithString:(NSString *)string;
 @end


@@ -378,6 +836,15 @@ class Pcre {
     return 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];
 }
 + (Address *) addressWithString:(NSString *)string {
     return [[[Address alloc] initWithString:string] autorelease];
 }


@@ -460,6 +927,9 @@ static const float KeyboardTime_ = 0.3f;
 
 #define SpringBoard_ "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist"
 #define SandboxTemplate_ "/usr/share/sandbox/SandboxTemplate.sb"
 
 #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 Blue_;
 static CGColor Blueish_;


@@ -467,15 +937,19 @@ static CGColor Black_;
 static CGColor Off_;
 static CGColor White_;
 static CGColor Gray_;
 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_;
 
 static BOOL Advanced_;
 
 static NSString *App_;
 static NSString *Home_;
 static BOOL Sounds_Keyboard_;
 
 static BOOL Advanced_;

-#if !ForSaurik

 static BOOL Loaded_;
 static BOOL Loaded_;

-#endif

 static BOOL Ignored_;
 
 static UIFont *Font12_;
 static BOOL Ignored_;
 
 static UIFont *Font12_;


@@ -485,20 +959,14 @@ static UIFont *Font18Bold_;
 static UIFont *Font22Bold_;
 
 static const char *Machine_ = NULL;
 static UIFont *Font22Bold_;
 
 static const char *Machine_ = NULL;

-static const NSString *UniqueID_ = NULL;
-
-unsigned Major_;
-unsigned Minor_;
-unsigned BugFix_;
+static const NSString *UniqueID_ = nil;
+static const NSString *Build_ = nil;
+static const NSString *Product_ = nil;
+static const NSString *Safari_ = nil;

 
 CFLocaleRef Locale_;
 CGColorSpaceRef space_;
 
 
 CFLocaleRef Locale_;
 CGColorSpaceRef space_;
 

-#define FW_LEAST(major, minor, bugfix) \
-    (major < Major_ || major == Major_ && \
-        (minor < Minor_ || minor == Minor_ && \
-            bugfix <= BugFix_))
-

 bool bootstrap_;
 bool reload_;
 
 bool bootstrap_;
 bool reload_;
 


@@ -520,7 +988,7 @@ NSString *GetLastUpdate() {
     NSDate *update = [Metadata_ objectForKey:@"LastUpdate"];
 
     if (update == nil)
     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);
 
     CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
     CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);


@@ -535,6 +1003,7 @@ inline float Interpolate(float begin, float end, float fraction) {
     return (end - begin) * fraction + begin;
 }
 
     return (end - begin) * fraction + begin;
 }
 

+/* XXX: localize this! */

 NSString *SizeString(double size) {
     bool negative = size < 0;
     if (negative)
 NSString *SizeString(double size) {
     bool negative = size < 0;
     if (negative)


@@ -548,7 +1017,7 @@ NSString *SizeString(double size) {
 
     static const char *powers_[] = {"B", "kB", "MB", "GB"};
 
 
     static const char *powers_[] = {"B", "kB", "MB", "GB"};
 

-    return [NSString stringWithFormat:@"%s%.1f%s", (negative ? "-" : ""), size, powers_[power]];
+    return [NSString stringWithFormat:@"%s%.1f %s", (negative ? "-" : ""), size, powers_[power]];

 }
 
 NSString *StripVersion(NSString *version) {
 }
 
 NSString *StripVersion(NSString *version) {


@@ -558,6 +1027,10 @@ NSString *StripVersion(NSString *version) {
     return version;
 }
 
     return version;
 }
 

+NSString *LocalizeSection(NSString *section) {
+    return section;
+}
+

 NSString *Simplify(NSString *title) {
     const char *data = [title UTF8String];
     size_t size = [title length];
 NSString *Simplify(NSString *title) {
     const char *data = [title UTF8String];
     size_t size = [title length];


@@ -616,7 +1089,11 @@ bool isSectionVisible(NSString *section) {
 - (void) setConfigurationData:(NSString *)data;
 @end
 
 - (void) setConfigurationData:(NSString *)data;
 @end
 

+@class PackageView;
+

 @protocol CydiaDelegate
 @protocol CydiaDelegate

+- (void) setPackageView:(PackageView *)view;
+- (void) clearPackage:(Package *)package;

 - (void) installPackage:(Package *)package;
 - (void) removePackage:(Package *)package;
 - (void) slideUp:(UIActionSheet *)alert;
 - (void) installPackage:(Package *)package;
 - (void) removePackage:(Package *)package;
 - (void) slideUp:(UIActionSheet *)alert;


@@ -625,9 +1102,12 @@ bool isSectionVisible(NSString *section) {
 - (void) syncData;
 - (void) askForSettings;
 - (UIProgressHUD *) addProgressHUD;
 - (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;
 - (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag;
 - (RVPage *) pageForPackage:(NSString *)name;
 - (void) openMailToURL:(NSURL *)url;

+- (void) clearFirstResponder;
+- (PackageView *) packageView;

 @end
 /* }}} */
 
 @end
 /* }}} */
 


@@ -656,6 +1136,7 @@ class Status :
     }
 
     virtual void Fetch(pkgAcquire::ItemDesc &item) {
     }
 
     virtual void Fetch(pkgAcquire::ItemDesc &item) {

+        //NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]);

         [delegate_ setProgressTitle:[NSString stringWithUTF8String:("Downloading " + item.ShortDesc).c_str()]];
     }
 
         [delegate_ setProgressTitle:[NSString stringWithUTF8String:("Downloading " + item.ShortDesc).c_str()]];
     }
 


@@ -715,8 +1196,8 @@ class Progress :
 
   protected:
     virtual void Update() {
 
   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:
     }
 
   public:


@@ -730,13 +1211,18 @@ class Progress :
     }
 
     virtual void Done() {
     }
 
     virtual void Done() {

-        [delegate_ setProgressPercent:1];
+        //[delegate_ setProgressPercent:1];

     }
 };
 /* }}} */
 
 /* Database Interface {{{ */
 @interface Database : NSObject {
     }
 };
 /* }}} */
 
 /* Database Interface {{{ */
 @interface Database : NSObject {

+    NSZone *zone_;
+    apr_pool_t *pool_;
+
+    unsigned era_;
+

     pkgCacheFile cache_;
     pkgDepCache::Policy *policy_;
     pkgRecords *records_;
     pkgCacheFile cache_;
     pkgDepCache::Policy *policy_;
     pkgRecords *records_;


@@ -758,6 +1244,9 @@ class Progress :
     FILE *input_;
 }
 
     FILE *input_;
 }
 

++ (Database *) sharedInstance;
+- (unsigned) era;
+

 - (void) _readCydia:(NSNumber *)fd;
 - (void) _readStatus:(NSNumber *)fd;
 - (void) _readOutput:(NSNumber *)fd;
 - (void) _readCydia:(NSNumber *)fd;
 - (void) _readStatus:(NSNumber *)fd;
 - (void) _readOutput:(NSNumber *)fd;


@@ -766,12 +1255,12 @@ class Progress :
 
 - (Package *) packageWithName:(NSString *)name;
 
 
 - (Package *) packageWithName:(NSString *)name;
 

-- (Database *) init;

 - (pkgCacheFile &) cache;
 - (pkgDepCache::Policy *) policy;
 - (pkgRecords *) records;
 - (pkgProblemResolver *) resolver;
 - (pkgAcquire &) fetcher;
 - (pkgCacheFile &) cache;
 - (pkgDepCache::Policy *) policy;
 - (pkgRecords *) records;
 - (pkgProblemResolver *) resolver;
 - (pkgAcquire &) fetcher;

+- (pkgSourceList &) list;

 - (NSArray *) packages;
 - (NSArray *) sources;
 - (void) reloadData;
 - (NSArray *) packages;
 - (NSArray *) sources;
 - (void) reloadData;


@@ -794,6 +1283,7 @@ class Progress :
     NSString *description_;
     NSString *label_;
     NSString *origin_;
     NSString *description_;
     NSString *label_;
     NSString *origin_;

+    NSString *support_;

 
     NSString *uri_;
     NSString *distribution_;
 
     NSString *uri_;
     NSString *distribution_;


@@ -810,6 +1300,8 @@ class Progress :
 
 - (NSComparisonResult) compareByNameAndType:(Source *)source;
 
 
 - (NSComparisonResult) compareByNameAndType:(Source *)source;
 

+- (NSString *) supportForPackage:(NSString *)package;
+

 - (NSDictionary *) record;
 - (BOOL) trusted;
 
 - (NSDictionary *) record;
 - (BOOL) trusted;
 


@@ -831,24 +1323,27 @@ class Progress :
 
 @implementation Source
 
 
 @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];
-    if (record_ != nil)
-        [record_ 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];
 }
 
     [super dealloc];
 }
 


@@ -864,44 +1359,52 @@ class Progress :
     return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
 }
 
     return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
 }
 

-- (Source *) initWithMetaIndex:(metaIndex *)index {
-    if ((self = [super init]) != nil) {
-        trusted_ = index->IsTrusted();
-
-        uri_ = [[NSString stringWithUTF8String:index->GetURI().c_str()] retain];
-        distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain];
-        type_ = [[NSString stringWithUTF8String:index->GetType()] retain];
-
-        debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
-        if (dindex != NULL) {
-            std::ifstream release(dindex->MetaIndexFile("Release").c_str());
-            std::string line;
-            while (std::getline(release, line)) {
-                std::string::size_type colon(line.find(':'));
-                if (colon == std::string::npos)
-                    continue;
+- (void) setMetaIndex:(metaIndex *)index {
+    [self _clear];

 
 

-                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];
-            }
+    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<debReleaseIndex *>(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];
+}

 
 

-        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;
 }
 
     } return self;
 }
 


@@ -925,7 +1428,11 @@ class Progress :
             return NSOrderedDescending;
     }
 
             return NSOrderedDescending;
     }
 

-    return [lhs compare:rhs options:CompareOptions_];
+    return [lhs compare:rhs options:LaxCompareOptions_];
+}
+
+- (NSString *) supportForPackage:(NSString *)package {
+    return support_ == nil ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package];

 }
 
 - (NSDictionary *) record {
 }
 
 - (NSDictionary *) record {


@@ -1018,36 +1525,9 @@ class Progress :
 @end
 /* }}} */
 /* Package Class {{{ */
 @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 == ':' &&
-            strncasecmp(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 {
 @interface Package : NSObject {

+    unsigned era_;
+

     pkgCache::PkgIterator iterator_;
     _transient Database *database_;
     pkgCache::VerIterator version_;
     pkgCache::PkgIterator iterator_;
     _transient Database *database_;
     pkgCache::VerIterator version_;


@@ -1056,35 +1536,56 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     Source *source_;
     bool cached_;
 
     Source *source_;
     bool cached_;
 

+    CYString section_;
+    NSString *section$_;
+    bool essential_;
+

     NSString *latest_;
     NSString *installed_;
 
     NSString *id_;
     NSString *latest_;
     NSString *installed_;
 
     NSString *id_;

-    NSString *name_;
-    NSString *tagline_;
-    NSString *icon_;
-    NSString *depiction_;
-    NSString *homepage_;
-    Address *sponsor_;
-    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_;
     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;
 
 - (pkgCache::PkgIterator) iterator;
 
 - (NSString *) section;

+- (NSString *) simpleSection;
+
+- (NSString *) longSection;
+- (NSString *) shortSection;
+
+- (NSString *) uri;
+

 - (Address *) maintainer;
 - (size_t) size;
 - (NSString *) description;
 - (Address *) maintainer;
 - (size_t) size;
 - (NSString *) description;

-- (NSString *) index;
+- (unichar) index;

 
 

+- (NSMutableDictionary *) metadata;

 - (NSDate *) seen;
 - (NSDate *) seen;

+- (BOOL) subscribed;
+- (BOOL) ignored;

 
 - (NSString *) latest;
 - (NSString *) installed;
 
 - (NSString *) latest;
 - (NSString *) installed;


@@ -1105,11 +1606,13 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (NSString *) id;
 - (NSString *) name;
 - (NSString *) tagline;
 - (NSString *) id;
 - (NSString *) name;
 - (NSString *) tagline;

-- (NSString *) icon;
+- (UIImage *) icon;

 - (NSString *) homepage;
 - (NSString *) depiction;
 - (Address *) author;
 
 - (NSString *) homepage;
 - (NSString *) depiction;
 - (Address *) author;
 

+- (NSString *) support;
+

 - (NSArray *) files;
 - (NSArray *) relationships;
 - (NSArray *) warnings;
 - (NSArray *) files;
 - (NSArray *) relationships;
 - (NSArray *) warnings;


@@ -1123,46 +1626,69 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (bool) hasSupportingRole;
 - (BOOL) hasTag:(NSString *)tag;
 - (NSString *) primaryPurpose;
 - (bool) hasSupportingRole;
 - (BOOL) hasTag:(NSString *)tag;
 - (NSString *) primaryPurpose;

+- (NSArray *) purposes;
+- (bool) isCommercial;

 
 

+- (uint32_t) compareByPrefix;

 - (NSComparisonResult) compareByName:(Package *)package;
 - (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;
 
 
 - (void) install;
 - (void) remove;
 

-- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search;
-- (NSNumber *) isInstalledAndVisible:(NSNumber *)number;
-- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)section;
-- (NSNumber *) isVisibleInSource:(Source *)source;
+- (bool) isUnfilteredAndSearchedForBy:(NSString *)search;
+- (bool) isInstalledAndVisible:(NSNumber *)number;
+- (bool) isVisiblyUninstalledInSection:(NSString *)section;
+- (bool) isVisibleInSource:(Source *)source;

 
 @end
 
 
 @end
 

-@implementation Package
+uint32_t PackageChangesRadix(Package *self, void *) {
+    union {
+        uint32_t key;

 
 

-- (void) dealloc {
-    if (source_ != nil)
-        [source_ release];
+        struct {
+            uint32_t timestamp : 30;
+            uint32_t ignored : 1;
+            uint32_t upgradable : 1;
+        } bits;
+    } value;

 
 

-    [latest_ release];
+    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<uint32_t>([[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 (installed_ != nil)
         [installed_ release];
 
     [id_ release];

-    if (name_ != nil)
-        [name_ release];
-    [tagline_ release];
-    if (icon_ != nil)
-        [icon_ release];
-    if (depiction_ != nil)
-        [depiction_ release];
-    if (homepage_ != nil)
-        [homepage_ release];
-    if (sponsor_ != nil)
-        [sponsor_ release];
-    if (author_ != nil)
-        [author_ release];
+    if (sponsor$_ != nil)
+        [sponsor$_ release];
+    if (author$_ != nil)
+        [author$_ release];

     if (tags_ != nil)
         [tags_ release];
     if (role_ != nil)
     if (tags_ != nil)
         [tags_ release];
     if (role_ != nil)


@@ -1170,12 +1696,25 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
     if (relationships_ != nil)
         [relationships_ release];
 
     if (relationships_ != nil)
         [relationships_ release];

+    if (metadata_ != nil)
+        [metadata_ release];

 
     [super dealloc];
 }
 
 
     [super dealloc];
 }
 

++ (NSString *) webScriptNameForSelector:(SEL)selector {
+    if (selector == @selector(hasTag:))
+        return @"hasTag";
+    else
+        return nil;
+}
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector {
+    return [self webScriptNameForSelector:selector] == nil;
+}
+

 + (NSArray *) _attributeKeys {
 + (NSArray *) _attributeKeys {

-    return [NSArray arrayWithObjects:@"applications", @"author", @"depiction", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"maintainer", @"name", @"section", @"size", @"source", @"sponsor", @"tagline", @"warnings", nil];
+    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 {
 }
 
 - (NSArray *) attributeKeys {


@@ -1186,84 +1725,201 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
 }
 
     return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
 }
 

-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database {

     if ((self = [super init]) != nil) {
     if ((self = [super init]) != nil) {

+    _profile(Package$initWithIterator)
+    @synchronized (database) {
+        era_ = [database era];
+

         iterator_ = iterator;
         database_ = database;
 
         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];
-            depiction_ = Scour("depiction", begin, end);
-            if (depiction_ != nil)
-                depiction_ = [depiction_ retain];
-            homepage_ = Scour("homepage", begin, end);
-            if (homepage_ == nil)
-                homepage_ = Scour("website", begin, end);
-            if ([homepage_ isEqualToString:depiction_])
-                homepage_ = nil;
-            if (homepage_ != nil)
-                homepage_ = [homepage_ retain];
-            NSString *sponsor = Scour("sponsor", begin, end);
-            if (sponsor != nil)
-                sponsor_ = [[Address addressWithString:sponsor] retain];
-            NSString *author = Scour("author", begin, end);
-            if (author != nil)
-                author_ = [[Address addressWithString:author] retain];
-            NSString *tags = Scour("tag", begin, end);
-            if (tags != nil)
-                tags_ = [[tags componentsSeparatedByString:@", "] retain];
-        }
+        NSString *latest = version_.end() ? nil : [NSString stringWithUTF8String:version_.VerStr()];

 
 

-        if (tags_ != nil)
-            for (int i(0), e([tags_ count]); i != e; ++i) {
-                NSString *tag = [tags_ objectAtIndex:i];
-                if ([tag hasPrefix:@"role::"]) {
-                    role_ = [[tag substringFromIndex:6] retain];
-                    break;
+        _profile(Package$initWithIterator$Latest)
+            latest_ = latest == nil ? nil : [StripVersion(latest) retain];
+        _end
+
+        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<char *>(memchr(begin + 1, '\n', end - begin - 1));
+                        if (begin == NULL)
+                            break;
+                    } else if (const char *colon = static_cast<char *>(memchr(begin, ':', end - begin))) {
+                        const char *name(begin);
+                        size_t size(colon - begin);
+
+                        begin = static_cast<char *>(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;
+                    }

             }
 
             }
 

-        NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
-        if (metadata == nil || [metadata count] == 0) {
-            metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                now_, @"FirstSeen",
-            nil];
+            metadata_ = [metadata_ retain];

 
 

-            [Packages_ setObject:metadata forKey:id_];
-            Changed_ = true;
-        }
-    } return self;
+            if (changed) {
+                [Packages_ setObject:metadata_ forKey:key];
+                Changed_ = true;
+            }
+        _end
+
+        _profile(Package$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]
     return [[[Package alloc]

-        initWithIterator:iterator 
+        initWithIterator:iterator
+        withZone:zone
+        inPool:pool

         database:database
     ] autorelease];
 }
         database:database
     ] autorelease];
 }


@@ -1273,27 +1929,58 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (NSString *) section {
 }
 
 - (NSString *) section {

-    const char *section = iterator_.Section();
-    if (section == NULL)
+    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;
         return nil;

+}

 
 

-    NSString *name = [[NSString stringWithUTF8String:section] stringByReplacingCharacter:' ' withCharacter:'_'];
+- (NSString *) longSection {
+    return LocalizeSection(section_);
+}

 
 

-  lookup:
-    if (NSDictionary *value = [SectionMap_ objectForKey:name])
-        if (NSString *rename = [value objectForKey:@"Rename"]) {
-            name = rename;
-            goto lookup;
-        }
+- (NSString *) shortSection {
+    return [[NSBundle mainBundle] localizedStringForKey:[self simpleSection] value:nil table:@"Sections"];
+}

 
 

-    return [name stringByReplacingCharacter:'_' withCharacter:' '];
+- (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_);
 }
 
 - (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 {
 }
 
 - (size_t) size {


@@ -1312,7 +1999,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         return nil;
 
     NSCharacterSet *whitespace = [NSCharacterSet whitespaceCharacterSet];
         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];
     }
         NSString *trim = [[lines objectAtIndex:i] stringByTrimmingCharactersInSet:whitespace];
         [trimmed addObject:trim];
     }


@@ -1320,13 +2007,46 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return [trimmed componentsJoinedByString:@"\n"];
 }
 
     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 {
 }
 
 - (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 {
 }
 
 - (NSString *) latest {


@@ -1344,16 +2064,16 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (BOOL) upgradableAndEssential:(BOOL)essential {
     pkgCache::VerIterator current = iterator_.CurrentVer();
 
 - (BOOL) upgradableAndEssential:(BOOL)essential {
     pkgCache::VerIterator current = iterator_.CurrentVer();
 

+    bool value;

     if (current.end())
     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 {
 }
 
 - (BOOL) essential {

-    return (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES;
+    return essential_;

 }
 
 - (BOOL) broken {
 }
 
 - (BOOL) broken {


@@ -1393,26 +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)
     switch (state.Mode) {
         case pkgDepCache::ModeDelete:
             if ((state.iFlags & pkgDepCache::Purge) != 0)

-                return @"Purge";
+                return @"PURGE";

             else
             else

-                return @"Remove";
+                return @"REMOVE";

         case pkgDepCache::ModeKeep:
         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;
         case pkgDepCache::ModeInstall:
             else
                 return nil;
         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:
                 case -1:

-                    return @"Downgrade";
+                    return @"DOWNGRADE";

                 case 0:
                 case 0:

-                    return @"Install";
+                    return @"INSTALL";

                 case 1:
                 case 1:

-                    return @"Upgrade";
+                    return @"UPGRADE";

                 case 2:
                 case 2:

-                    return @"New Install";
+                    return @"NEW_INSTALL";

                 default:
                     _assert(false);
             }
                 default:
                     _assert(false);
             }


@@ -1433,8 +2155,21 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return tagline_;
 }
 
     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 {
 }
 
 - (NSString *) homepage {


@@ -1446,11 +2181,23 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (Address *) sponsor {
 }
 
 - (Address *) sponsor {

-    return sponsor_;
+    if (sponsor$_ == nil) {
+        if (sponsor_.empty())
+            return nil;
+        sponsor$_ = [[Address addressWithString:sponsor_] retain];
+    } return sponsor$_;

 }
 
 - (Address *) author {
 }
 
 - (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 {
 }
 
 - (NSArray *) files {


@@ -1479,9 +2226,11 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
     size_t length(strlen(name));
     if (length < 2) invalid:
 
     size_t length(strlen(name));
     if (length < 2) invalid:

-        [warnings addObject:@"illegal package identifier"];
+        [warnings addObject:CYLocalize("ILLEGAL_PACKAGE_IDENTIFIER")];

     else for (size_t i(0); i != length; ++i)
         if (
     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] != '.')
             (name[i] < 'a' || name[i] > 'z') &&
             (name[i] < '0' || name[i] > '9') &&
             (i == 0 || name[i] != '+' && name[i] != '-' && name[i] != '.')


@@ -1489,19 +2238,27 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
     if (strcmp(name, "cydia") != 0) {
         bool cydia = false;
 
     if (strcmp(name, "cydia") != 0) {
         bool cydia = false;

+        bool _private = false;

         bool stash = 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;
         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;
 
                 else if (!stash && [file isEqualToString:@"/var/stash"])
                     stash = true;
 

-        if (cydia)
-            [warnings addObject:@"files installed into Cydia.app"];
+        /* 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)
         if (stash)

-            [warnings addObject:@"files installed to /var/stash"];
+            [warnings addObject:[NSString stringWithFormat:CYLocalize("FILES_INSTALLED_TO"), @"/var/stash"]];

     }
 
     return [warnings count] == 0 ? nil : warnings;
     }
 
     return [warnings count] == 0 ? nil : warnings;


@@ -1544,8 +2301,17 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (Source *) source {
     if (!cached_) {
 
 - (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_;
     }
 
     return source_;


@@ -1561,15 +2327,15 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
     NSRange range;
 
 
     NSRange range;
 

-    range = [[self id] rangeOfString:text options:NSCaseInsensitiveSearch];
+    range = [[self id] rangeOfString:text options:MatchCompareOptions_];

     if (range.location != NSNotFound)
         return YES;
 
     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;
 
     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;
 
     if (range.location != NSNotFound)
         return YES;
 


@@ -1605,11 +2371,27 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return nil;
 }
 
     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];
 
 - (NSComparisonResult) compareByName:(Package *)package {
     NSString *lhs = [self name];
     NSString *rhs = [package name];
 

-    if ([lhs length] != 0 && [rhs length] != 0) {
+    /*if ([lhs length] != 0 && [rhs length] != 0) {

         unichar lhc = [lhs characterAtIndex:0];
         unichar rhc = [rhs characterAtIndex:0];
 
         unichar lhc = [lhs characterAtIndex:0];
         unichar rhc = [rhs characterAtIndex:0];
 


@@ -1619,63 +2401,52 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             return NSOrderedDescending;
     }
 
             return NSOrderedDescending;
     }
 

-    return [lhs compare:rhs options:CompareOptions_];
-}
+    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 compare:rhs options:CompareOptions_];
-        if (result != NSOrderedSame)
-            return result;
+- (uint32_t) compareBySection:(NSArray *)sections {
+    NSString *section([self section]);
+    for (size_t i(0), e([sections count]); i != e; ++i) {
+        if ([section isEqualToString:[[sections objectAtIndex:i] name]])
+            return i;

     }
 
     }
 

-    return NSOrderedSame;
+    return _not(uint32_t);

 }
 
 }
 

-- (NSComparisonResult) compareBySectionAndName:(Package *)package {
-    NSString *lhs = [self section];
-    NSString *rhs = [package section];
-
-    if (lhs == NULL && rhs != NULL)
-        return NSOrderedAscending;
-    else if (lhs != NULL && rhs == NULL)
-        return NSOrderedDescending;
-    else if (lhs != NULL && rhs != NULL) {
-        NSComparisonResult result = [lhs compare:rhs];
-        if (result != NSOrderedSame)
-            return result;
-    }
+- (uint32_t) compareForChanges {
+    union {
+        uint32_t key;

 
 

-    return [self compareByName:package];
-}
+        struct {
+            uint32_t timestamp : 30;
+            uint32_t ignored : 1;
+            uint32_t upgradable : 1;
+        } bits;
+    } value;

 
 

-- (NSComparisonResult) compareForChanges:(Package *)package {
-    BOOL lhs = [self upgradableAndEssential:YES];
-    BOOL rhs = [package upgradableAndEssential:YES];
+    bool upgradable([self upgradableAndEssential:YES]);
+    value.bits.upgradable = upgradable ? 1 : 0;

 
 

-    if (lhs != rhs)
-        return lhs ? NSOrderedAscending : NSOrderedDescending;
-    else if (!lhs) {
-        switch ([[self seen] compare:[package seen]]) {
-            case NSOrderedAscending:
-                return NSOrderedDescending;
-            case NSOrderedSame:
-                break;
-            case NSOrderedDescending:
-                return NSOrderedAscending;
-            default:
-                _assert(false);
-        }
+    if (upgradable) {
+        value.bits.timestamp = 0;
+        value.bits.ignored = [self ignored] ? 0 : 1;
+        value.bits.upgradable = 1;
+    } else {
+        value.bits.timestamp = static_cast<uint32_t>([[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 {
 }
 
 - (void) install {


@@ -1697,33 +2468,40 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [database_ cache]->MarkDelete(iterator_, true);
 }
 
     [database_ cache]->MarkDelete(iterator_, true);
 }
 

-- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search {
-    return [NSNumber numberWithBool:(
-        [self unfiltered] && [self matches:search]
-    )];
+- (bool) isUnfilteredAndSearchedForBy:(NSString *)search {
+    _profile(Package$isUnfilteredAndSearchedForBy)
+        bool value(true);
+
+        _profile(Package$isUnfilteredAndSearchedForBy$Unfiltered)
+            value &= [self unfiltered];
+        _end
+
+        _profile(Package$isUnfilteredAndSearchedForBy$Match)
+            value &= [self matches:search];
+        _end
+
+        return value;
+    _end

 }
 
 }
 

-- (NSNumber *) isInstalledAndVisible:(NSNumber *)number {
-    return [NSNumber numberWithBool:(
-        (![number boolValue] || [self visible]) && [self installed] != nil
-    )];
+- (bool) isInstalledAndVisible:(NSNumber *)number {
+    return (![number boolValue] || [self visible]) && [self installed] != nil;

 }
 
 }
 

-- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)name {
+- (bool) isVisiblyUninstalledInSection:(NSString *)name {

     NSString *section = [self section];
 
     NSString *section = [self section];
 

-    return [NSNumber numberWithBool:(
+    return

         [self visible] &&
         [self installed] == nil && (
             name == nil ||
             section == nil && [name length] == 0 ||
             [name isEqualToString:section]
         [self visible] &&
         [self installed] == nil && (
             name == nil ||
             section == nil && [name length] == 0 ||
             [name isEqualToString:section]

-        )
-    )];
+        );

 }
 
 }
 

-- (NSNumber *) isVisibleInSource:(Source *)source {
-    return [NSNumber numberWithBool:([self source] == source && [self visible])];
+- (bool) isVisibleInSource:(Source *)source {
+    return [self source] == source && [self visible];

 }
 
 @end
 }
 
 @end


@@ -1731,24 +2509,35 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 /* Section Class {{{ */
 @interface Section : NSObject {
     NSString *name_;
 /* Section Class {{{ */
 @interface Section : NSObject {
     NSString *name_;

+    unichar index_;

     size_t row_;
     size_t count_;
     size_t row_;
     size_t count_;

+    NSString *localized_;

 }
 
 - (NSComparisonResult) compareByName:(Section *)section;
 - (Section *) initWithName:(NSString *)name;
 - (Section *) initWithName:(NSString *)name row:(size_t)row;
 }
 
 - (NSComparisonResult) 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;
 - (NSString *) name;

+- (unichar) index;
+

 - (size_t) row;
 - (size_t) count;
 - (size_t) row;
 - (size_t) count;

+
+- (void) addToRow;

 - (void) addToCount;
 
 - (void) addToCount;
 

+- (void) setCount:(size_t)count;
+

 @end
 
 @implementation Section
 
 - (void) dealloc {
     [name_ release];
 @end
 
 @implementation Section
 
 - (void) dealloc {
     [name_ release];

+    if (localized_ != nil)
+        [localized_ release];

     [super dealloc];
 }
 
     [super dealloc];
 }
 


@@ -1766,7 +2555,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             return NSOrderedDescending;
     }
 
             return NSOrderedDescending;
     }
 

-    return [lhs compare:rhs options:CompareOptions_];
+    return [lhs compare:rhs options:LaxCompareOptions_];

 }
 
 - (Section *) initWithName:(NSString *)name {
 }
 
 - (Section *) initWithName:(NSString *)name {


@@ -1776,6 +2565,17 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (Section *) initWithName:(NSString *)name row:(size_t)row {
     if ((self = [super init]) != nil) {
         name_ = [name retain];
 - (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;
 }
         row_ = row;
     } return self;
 }


@@ -1784,6 +2584,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return name_;
 }
 
     return name_;
 }
 

+- (unichar) index {
+    return index_;
+}
+

 - (size_t) row {
     return row_;
 }
 - (size_t) row {
     return row_;
 }


@@ -1792,10 +2596,22 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return count_;
 }
 
     return count_;
 }
 

+- (void) addToRow {
+    ++row_;
+}
+

 - (void) addToCount {
     ++count_;
 }
 
 - (void) addToCount {
     ++count_;
 }
 

+- (void) setCount:(size_t)count {
+    count_ = count;
+}
+
+- (NSString *) localized {
+    return localized_;
+}
+

 @end
 /* }}} */
 
 @end
 /* }}} */
 


@@ -1805,8 +2621,22 @@ static NSArray *Finishes_;
 /* Database Implementation {{{ */
 @implementation Database
 
 /* 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);
 - (void) dealloc {
     _assert(false);

+    NSRecycleZone(zone_);
+    // XXX: malloc_destroy_zone(zone_);
+    apr_pool_destroy(pool_);

     [super dealloc];
 }
 
     [super dealloc];
 }
 


@@ -1865,9 +2695,9 @@ static NSArray *Finishes_;
                     withObject:[NSArray arrayWithObjects:string, id, nil]
                     waitUntilDone:YES
                 ];
                     withObject:[NSArray arrayWithObjects:string, id, nil]
                     waitUntilDone:YES
                 ];

-            else if (type == "pmstatus")
+            else if (type == "pmstatus") {

                 [delegate_ setProgressTitle:string];
                 [delegate_ setProgressTitle:string];

-            else if (type == "pmconffile")
+            } else if (type == "pmconffile")

                 [delegate_ setConfigurationData:string];
             else _assert(false);
         } else _assert(false);
                 [delegate_ setConfigurationData:string];
             else _assert(false);
         } else _assert(false);


@@ -1897,7 +2727,7 @@ static NSArray *Finishes_;
     if (static_cast<pkgDepCache *>(cache_) == NULL)
         return nil;
     pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String]));
     if (static_cast<pkgDepCache *>(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 {
 }
 
 - (Database *) init {


@@ -1908,6 +2738,9 @@ static NSArray *Finishes_;
         fetcher_ = NULL;
         lock_ = NULL;
 
         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];
 
         sources_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
         packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
 


@@ -1972,6 +2805,10 @@ static NSArray *Finishes_;
     return *fetcher_;
 }
 
     return *fetcher_;
 }
 

+- (pkgSourceList &) list {
+    return *list_;
+}
+

 - (NSArray *) packages {
     return packages_;
 }
 - (NSArray *) packages {
     return packages_;
 }


@@ -2044,7 +2881,11 @@ static NSArray *Finishes_;
     return issues;
 }
 
     return issues;
 }
 

-- (void) reloadData {
+- (void) reloadData { _pooled
+    @synchronized (self) {
+        ++era_;
+    }
+

     _error->Discard();
 
     delete list_;
     _error->Discard();
 
     delete list_;


@@ -2063,6 +2904,10 @@ static NSArray *Finishes_;
 
     cache_.Close();
 
 
     cache_.Close();
 

+    apr_pool_clear(pool_);
+    NSRecycleZone(zone_);
+
+    _trace();

     if (!cache_.Open(progress_, true)) {
         std::string error;
         if (!_error->PopMessage(error))
     if (!cache_.Open(progress_, true)) {
         std::string error;
         if (!_error->PopMessage(error))


@@ -2081,6 +2926,7 @@ static NSArray *Finishes_;
 
         return;
     }
 
         return;
     }

+    _trace();

 
     now_ = [[NSDate date] retain];
 
 
     now_ = [[NSDate date] retain];
 


@@ -2113,11 +2959,16 @@ static NSArray *Finishes_;
     }
 
     [packages_ removeAllObjects];
     }
 
     [packages_ removeAllObjects];

+    _trace();

     for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
     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];
             [packages_ addObject:package];

-
+    _trace();

     [packages_ sortUsingSelector:@selector(compareByName:)];
     [packages_ sortUsingSelector:@selector(compareByName:)];

+    _trace();
+
+    _config->Set("Acquire::http::Timeout", 15);
+    _config->Set("Acquire::http::MaxParallel", 4);

 }
 
 - (void) configure {
 }
 
 - (void) configure {


@@ -2193,7 +3044,9 @@ static NSArray *Finishes_;
         failed = true;
 
         [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
         failed = true;
 
         [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)

-            withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:error.c_str()], nil]
+            withObject:[NSArray arrayWithObjects:
+                [NSString stringWithUTF8String:error.c_str()],
+            nil]

             waitUntilDone:YES
         ];
     }
             waitUntilDone:YES
         ];
     }


@@ -2336,6 +3189,7 @@ static NSArray *Finishes_;
 @end
 /* }}} */
 
 @end
 /* }}} */
 

+#if 0

 /* Mail Composition {{{ */
 @interface MailToView : PopUpView {
     MailComposeController *controller_;
 /* Mail Composition {{{ */
 @interface MailToView : PopUpView {
     MailComposeController *controller_;


@@ -2352,8 +3206,6 @@ static NSArray *Finishes_;
     [super dealloc];
 }
 
     [super dealloc];
 }
 

-#include "internals.h"
-

 - (void) mailComposeControllerWillAttemptToSend:(MailComposeController *)controller {
     NSLog(@"will");
 }
 - (void) mailComposeControllerWillAttemptToSend:(MailComposeController *)controller {
     NSLog(@"will");
 }


@@ -2362,8 +3214,8 @@ static NSArray *Finishes_;
     NSLog(@"did:%@", delivery);
 // [UIApp setStatusBarShowsProgress:NO];
 if ([controller error]){
     NSLog(@"did:%@", delivery);
 // [UIApp setStatusBarShowsProgress:NO];
 if ([controller error]){

-NSArray *buttons = [NSArray arrayWithObjects:@"OK", nil];
-UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:@"Error" buttons:buttons defaultButtonIndex:0 delegate:self context:self];
+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];
 }
 [mailAlertSheet setBodyText:[controller error]];
 [mailAlertSheet popupAlertAnimated:YES];
 }


@@ -2371,13 +3223,16 @@ UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:@"Error" bu
 
 - (void) showError {
     NSLog(@"%@", [controller_ error]);
 
 - (void) showError {
     NSLog(@"%@", [controller_ error]);

-    NSArray *buttons = [NSArray arrayWithObjects:@"OK", nil];
-    UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:@"Error" buttons:buttons defaultButtonIndex:0 delegate:self context:self];
+    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];
 }
 
 - (void) deliverMessage { _pooled
     [mailAlertSheet setBodyText:[controller_ error]];
     [mailAlertSheet popupAlertAnimated:YES];
 }
 
 - (void) deliverMessage { _pooled

+    setuid(501);
+    setgid(501);
+

     if (![controller_ deliverMessage])
         [self performSelectorOnMainThread:@selector(showError) withObject:nil waitUntilDone:NO];
 }
     if (![controller_ deliverMessage])
         [self performSelectorOnMainThread:@selector(showError) withObject:nil waitUntilDone:NO];
 }


@@ -2403,6 +3258,8 @@ UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:@"Error" bu
 
 @end
 /* }}} */
 
 @end
 /* }}} */

+#endif
+

 /* Confirmation View {{{ */
 bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (!iterator.end())
 /* Confirmation View {{{ */
 bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (!iterator.end())


@@ -2422,9 +3279,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @protocol ConfirmationViewDelegate
 - (void) cancel;
 - (void) confirm;
 @protocol ConfirmationViewDelegate
 - (void) cancel;
 - (void) confirm;

+- (void) queue;

 @end
 
 @interface ConfirmationView : BrowserView {
 @end
 
 @interface ConfirmationView : BrowserView {

+    _transient Database *database_;

     UIActionSheet *essential_;
     NSArray *changes_;
     NSArray *issues_;
     UIActionSheet *essential_;
     NSArray *changes_;
     NSArray *issues_;


@@ -2454,9 +3313,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
 }
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {

-    NSString *context = [sheet context];
+    NSString *context([sheet context]);

 
 

-    if ([context isEqualToString:@"remove"])
+    if ([context isEqualToString:@"remove"]) {

         switch (button) {
             case 1:
                 [self cancel];
         switch (button) {
             case 1:
                 [self cancel];


@@ -2469,21 +3328,26 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             default:
                 _assert(false);
         }
             default:
                 _assert(false);
         }

-    else if ([context isEqualToString:@"unable"])
-        [self cancel];

 
 

-    [sheet dismiss];
+        [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 {
 }
 
 - (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"];
     [window setValue:changes_ forKey:@"changes"];
     [window setValue:issues_ forKey:@"issues"];
     [window setValue:sizes_ forKey:@"sizes"];

-    [super webView:sender didClearWindowObject:window forFrame:frame];

 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {

-    if ((self = [super initWithBook:book database:database]) != nil) {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+

         NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16];
         NSMutableArray *reinstalling = [NSMutableArray arrayWithCapacity:16];
         NSMutableArray *upgrading = [NSMutableArray arrayWithCapacity:16];
         NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16];
         NSMutableArray *reinstalling = [NSMutableArray arrayWithCapacity:16];
         NSMutableArray *upgrading = [NSMutableArray arrayWithCapacity:16];


@@ -2496,8 +3360,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
         pkgCacheFile &cache([database_ cache]);
         NSArray *packages = [database_ packages];
 
         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]);
 
             pkgCache::PkgIterator iterator = [package iterator];
             pkgDepCache::StateCache &state(cache[iterator]);
 


@@ -2524,11 +3387,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         if (!remove)
             essential_ = nil;
         else if (Advanced_ || true) {
         if (!remove)
             essential_ = nil;
         else if (Advanced_ || true) {

+            NSString *parenthetical(CYLocalize("PARENTHETICAL"));
+

             essential_ = [[UIActionSheet alloc]
             essential_ = [[UIActionSheet alloc]

-                initWithTitle:@"Removing Essentials"
+                initWithTitle:CYLocalize("REMOVING_ESSENTIALS")

                 buttons:[NSArray arrayWithObjects:
                 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
                 nil]
                 defaultButtonIndex:0
                 delegate:self


@@ -2538,17 +3403,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 #ifndef __OBJC2__
             [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]];
 #endif
 #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_ = [[UIActionSheet alloc]
         } else {
             essential_ = [[UIActionSheet alloc]

-                initWithTitle:@"Unable to Comply"
-                buttons:[NSArray arrayWithObjects:@"Okay", nil]
+                initWithTitle:CYLocalize("UNABLE_TO_COMPLY")
+                buttons:[NSArray arrayWithObjects:CYLocalize("OKAY"), nil]

                 defaultButtonIndex:0
                 delegate:self
                 context:@"unable"
             ];
 
                 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")];

         }
 
         changes_ = [[NSArray alloc] initWithObjects:
         }
 
         changes_ = [[NSArray alloc] initWithObjects:


@@ -2573,28 +3438,35 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     } return self;
 }
 
     } return self;
 }
 

-// XXX: replace with <title/>
-- (NSString *) title {
-    return issues_ == nil ? @"Confirm Changes" : @"Cannot Comply";
-}
-

 - (NSString *) backButtonTitle {
 - (NSString *) backButtonTitle {

-    return @"Confirm";
+    return CYLocalize("CONFIRM");

 }
 
 - (NSString *) leftButtonTitle {
 }
 
 - (NSString *) leftButtonTitle {

-    return @"Cancel";
+    return [NSString stringWithFormat:CYLocalize("SLASH_DELIMITED"), CYLocalize("CANCEL"), CYLocalize("QUEUE")];
+}
+
+- (id) rightButtonTitle {
+    return issues_ != nil ? nil : [super rightButtonTitle];

 }
 
 }
 

-- (NSString *) _rightButtonTitle {
-    return issues_ == nil ? @"Confirm" : nil;
+- (id) _rightButtonTitle {
+#if AlwaysReload || IgnoreInstall
+    return [super _rightButtonTitle];
+#else
+    return CYLocalize("CONFIRM");
+#endif

 }
 
 - (void) _leftButtonClicked {
     [self cancel];
 }
 
 }
 
 - (void) _leftButtonClicked {
     [self cancel];
 }
 

+#if !AlwaysReload

 - (void) _rightButtonClicked {
 - (void) _rightButtonClicked {

+#if IgnoreInstall
+    return [super _rightButtonClicked];
+#endif

     if (essential_ != nil)
         [essential_ popupAlertAnimated:YES];
     else {
     if (essential_ != nil)
         [essential_ popupAlertAnimated:YES];
     else {


@@ -2603,6 +3475,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [delegate_ confirm];
     }
 }
         [delegate_ confirm];
     }
 }

+#endif

 
 @end
 /* }}} */
 
 @end
 /* }}} */


@@ -2663,9 +3536,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     id delegate_;
     BOOL running_;
     SHA1SumValue springlist_;
     id delegate_;
     BOOL running_;
     SHA1SumValue springlist_;

+    SHA1SumValue notifyconf_;

     SHA1SumValue sandplate_;
     SHA1SumValue sandplate_;

-    size_t received_;
-    NSTimeInterval last_;

 }
 
 - (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
 }
 
 - (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;


@@ -2765,6 +3637,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
         [status_ setCentersHorizontally:YES];
         //[status_ setFont:font];
 
         [status_ setCentersHorizontally:YES];
         //[status_ setFont:font];

+        _trace();

 
         output_ = [[UITextView alloc] initWithFrame:CGRectMake(
             10,
 
         output_ = [[UITextView alloc] initWithFrame:CGRectMake(
             10,


@@ -2772,6 +3645,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             bounds.size.width - 20,
             bounds.size.height - navsize.height - 62 - navrect.size.height
         )];
             bounds.size.width - 20,
             bounds.size.height - navsize.height - 62 - navrect.size.height
         )];

+        _trace();

 
         //[output_ setTextFont:@"Courier New"];
         [output_ setTextSize:12];
 
         //[output_ setTextFont:@"Courier New"];
         [output_ setTextSize:12];


@@ -2815,8 +3689,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
 }
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {

-    NSString *context = [sheet context];
-    if ([context isEqualToString:@"conffile"]) {
+    NSString *context([sheet context]);
+
+    if ([context isEqualToString:@"error"])
+        [sheet dismiss];
+    else if ([context isEqualToString:@"conffile"]) {

         FILE *input = [database_ input];
 
         switch (button) {
         FILE *input = [database_ input];
 
         switch (button) {


@@ -2831,9 +3708,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             default:
                 _assert(false);
         }
             default:
                 _assert(false);
         }

-    }

 
 

-    [sheet dismiss];
+        [sheet dismiss];
+    }

 }
 
 - (void) closeButtonPushed {
 }
 
 - (void) closeButtonPushed {


@@ -2864,7 +3741,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) _retachThread {
     UINavigationItem *item = [navbar_ topItem];
 
 - (void) _retachThread {
     UINavigationItem *item = [navbar_ topItem];

-    [item setTitle:@"Complete"];
+    [item setTitle:CYLocalize("COMPLETE")];

 
     [overlay_ addSubview:close_];
     [progress_ removeFromSuperview];
 
     [overlay_ addSubview:close_];
     [progress_ removeFromSuperview];


@@ -2881,6 +3758,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             Finish_ = 4;
     }
 
             Finish_ = 4;
     }
 

+    if (Finish_ < 4) {
+        FileFd file(NotifyConfig_, FileFd::ReadOnly);
+        MMap mmap(file, MMap::ReadOnly);
+        SHA1Summation sha1;
+        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+        if (!(notifyconf_ == sha1.Result()))
+            Finish_ = 4;
+    }
+

     if (Finish_ < 3) {
         FileFd file(SpringBoard_, FileFd::ReadOnly);
         MMap mmap(file, MMap::ReadOnly);
     if (Finish_ < 3) {
         FileFd file(SpringBoard_, FileFd::ReadOnly);
         MMap mmap(file, MMap::ReadOnly);


@@ -2891,11 +3777,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     }
 
     switch (Finish_) {
     }
 
     switch (Finish_) {

-        case 0: [close_ setTitle:@"Return to Cydia"]; break;
-        case 1: [close_ setTitle:@"Close Cydia (Restart)"]; break;
-        case 2: [close_ setTitle:@"Restart SpringBoard"]; break;
-        case 3: [close_ setTitle:@"Reload SpringBoard"]; break;
-        case 4: [close_ setTitle:@"Reboot Device"]; break;
+        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"
     }
 
 #define Cache_ "/User/Library/Caches/com.apple.mobile.installation.plist"


@@ -2923,9 +3809,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
                     NSString *plist = [path stringByAppendingPathComponent:@"Info.plist"];
                     if (NSMutableDictionary *info = [[NSMutableDictionary alloc] initWithContentsOfFile:plist]) {
                         [info autorelease];
                     NSString *plist = [path stringByAppendingPathComponent:@"Info.plist"];
                     if (NSMutableDictionary *info = [[NSMutableDictionary alloc] initWithContentsOfFile:plist]) {
                         [info autorelease];

-                        [info setObject:path forKey:@"Path"];
-                        [info setObject:@"System" forKey:@"ApplicationType"];
-                        [system addInfoDictionary:info];
+                        if ([info objectForKey:@"CFBundleIdentifier"] != nil) {
+                            [info setObject:path forKey:@"Path"];
+                            [info setObject:@"System" forKey:@"ApplicationType"];
+                            [system addInfoDictionary:info];
+                        }

                     }
                 }
         } else goto error;
                     }
                 }
         } else goto error;


@@ -2961,9 +3849,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [output_ setText:@""];
     [progress_ setProgress:0];
 
     [output_ setText:@""];
     [progress_ setProgress:0];
 

-    received_ = 0;
-    last_ = 0;//[NSDate timeIntervalSinceReferenceDate];
-

     [close_ removeFromSuperview];
     [overlay_ addSubview:progress_];
     [overlay_ addSubview:status_];
     [close_ removeFromSuperview];
     [overlay_ addSubview:progress_];
     [overlay_ addSubview:status_];


@@ -2979,6 +3864,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         sandplate_ = sha1.Result();
     }
 
         sandplate_ = sha1.Result();
     }
 

+    {
+        FileFd file(NotifyConfig_, FileFd::ReadOnly);
+        MMap mmap(file, MMap::ReadOnly);
+        SHA1Summation sha1;
+        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+        notifyconf_ = sha1.Result();
+    }
+

     {
         FileFd file(SpringBoard_, FileFd::ReadOnly);
         MMap mmap(file, MMap::ReadOnly);
     {
         FileFd file(SpringBoard_, FileFd::ReadOnly);
         MMap mmap(file, MMap::ReadOnly);


@@ -3005,7 +3898,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         detachNewThreadSelector:selector
         toTarget:database_
         withObject:nil
         detachNewThreadSelector:selector
         toTarget:database_
         withObject:nil

-        title:@"Repairing"
+        title:CYLocalize("REPAIRING")

     ];
 }
 
     ];
 }
 


@@ -3022,7 +3915,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
         initWithTitle:(package == nil ? id : [package name])
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
         initWithTitle:(package == nil ? id : [package name])

-        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+        buttons:[NSArray arrayWithObjects:CYLocalize("OKAY"), nil]

         defaultButtonIndex:0
         delegate:self
         context:@"error"
         defaultButtonIndex:0
         delegate:self
         context:@"error"


@@ -3049,7 +3942,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) startProgress {
 }
 
 - (void) startProgress {

-    last_ = [NSDate timeIntervalSinceReferenceDate];

 }
 
 - (void) addProgressOutput:(NSString *)output {
 }
 
 - (void) addProgressOutput:(NSString *)output {


@@ -3061,15 +3953,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (bool) isCancelling:(size_t)received {
 }
 
 - (bool) isCancelling:(size_t)received {

-    if (last_ != 0) {
-        NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
-        if (received_ != received) {
-            received_ = received;
-            last_ = now;
-        } else if (now - last_ > 30)
-            return true;
-    }
-

     return false;
 }
 
     return false;
 }
 


@@ -3082,26 +3965,30 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     //NSString *nfile = conffile_r[2];
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
     //NSString *nfile = conffile_r[2];
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]

-        initWithTitle:@"Configuration Upgrade"
+        initWithTitle:CYLocalize("CONFIGURATION_UPGRADE")

         buttons:[NSArray arrayWithObjects:
         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];
 
         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 {
     [sheet popupAlertAnimated:YES];
 }
 
 - (void) _setProgressTitle:(NSString *)title {

-    [status_ setText:title];
+    NSMutableArray *words([[title componentsSeparatedByString:@" "] mutableCopy]);
+    for (size_t i(0), e([words count]); i != e; ++i) {
+        NSString *word([words objectAtIndex:i]);
+        if (Package *package = [database_ packageWithName:word])
+            [words replaceObjectAtIndex:i withObject:[package name]];
+    }
+
+    [status_ setText:[words componentsJoinedByString:@" "]];

 }
 
 - (void) _setProgressPercent:(NSNumber *)percent {
 }
 
 - (void) _setProgressPercent:(NSNumber *)percent {


@@ -3123,12 +4010,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 /* }}} */
 
 /* Package Cell {{{ */
 /* }}} */
 
 /* Package Cell {{{ */

-@interface PackageCell : UISimpleTableCell {
+@interface PackageCell : UITableCell {

     UIImage *icon_;
     NSString *name_;
     NSString *description_;
     UIImage *icon_;
     NSString *name_;
     NSString *description_;

+    bool commercial_;

     NSString *source_;
     UIImage *badge_;
     NSString *source_;
     UIImage *badge_;

+    bool cached_;
+    Package *package_;

 #ifdef USE_BADGES
     UITextLabel *status_;
 #endif
 #ifdef USE_BADGES
     UITextLabel *status_;
 #endif


@@ -3168,6 +4058,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [badge_ release];
         badge_ = nil;
     }
         [badge_ release];
         badge_ = nil;
     }

+
+    [package_ release];
+    package_ = nil;

 }
 
 - (void) dealloc {
 }
 
 - (void) dealloc {


@@ -3192,24 +4085,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self clearPackage];
 
     Source *source = [package source];
     [self clearPackage];
 
     Source *source = [package source];

-    NSString *section = [package section];
-    if (section != nil)
-        section = Simplify(section);
-
-    icon_ = nil;
-    if (NSString *icon = [package icon])
-        icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];
-    if (icon_ == nil) if (section != nil)
-        icon_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]];
-    if (icon_ == nil) if (NSString *icon = [source defaultIcon])
-        icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];
-    if (icon_ == nil)
-        icon_ = [UIImage applicationImageNamed:@"unknown.png"];
-
-    icon_ = [icon_ retain];

 
 

+    icon_ = [[package icon] retain];

     name_ = [[package name] retain];
     description_ = [[package tagline] retain];
     name_ = [[package name] retain];
     description_ = [[package tagline] retain];

+    commercial_ = [package isCommercial];
+
+    package_ = [package retain];

 
     NSString *label = nil;
     bool trusted = false;
 
     NSString *label = nil;
     bool trusted = false;


@@ -3218,15 +4100,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         label = [source label];
         trusted = [source trusted];
     } else if ([[package id] isEqualToString:@"firmware"])
         label = [source label];
         trusted = [source trusted];
     } else if ([[package id] isEqualToString:@"firmware"])

-        label = @"Apple";
+        label = CYLocalize("APPLE");

     else
     else

-        label = @"Unknown/Local";
+        label = [NSString stringWithFormat:CYLocalize("SLASH_DELIMITED"), CYLocalize("UNKNOWN"), CYLocalize("LOCAL")];

 
 

-    NSString *from = [NSString stringWithFormat:@"from %@", label];
+    NSString *from(label);

 
 

-    if (section != nil && ![section isEqualToString:label])
-        from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]];
+    NSString *section = [package simpleSection];
+    if (section != nil && ![section isEqualToString:label]) {
+        section = [[NSBundle mainBundle] localizedStringForKey:section value:nil table:@"Sections"];
+        from = [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), from, section];
+    }

 
 

+    from = [NSString stringWithFormat:CYLocalize("FROM"), label];

     source_ = [from retain];
 
     if (NSString *purpose = [package primaryPurpose])
     source_ = [from retain];
 
     if (NSString *purpose = [package primaryPurpose])


@@ -3236,20 +4122,51 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 #ifdef USE_BADGES
     if (NSString *mode = [package mode]) {
         [badge_ setImage:[UIImage applicationImageNamed:
 #ifdef USE_BADGES
     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_ setText:[NSString stringWithFormat:CYLocalize("QUEUED_FOR"), CYLocalize(mode)]];

         [status_ setColor:[UIColor colorWithCGColor:Blueish_]];
     } else if ([package half]) {
         [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
         [status_ setColor:[UIColor colorWithCGColor:Blueish_]];
     } else if ([package half]) {
         [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];

-        [status_ setText:@"Package Damaged"];
+        [status_ setText:CYLocalize("PACKAGE_DAMAGED")];

         [status_ setColor:[UIColor redColor]];
     } else {
         [badge_ setImage:nil];
         [status_ setText:nil];
     }
 #endif
         [status_ setColor:[UIColor redColor]];
     } else {
         [badge_ setImage:nil];
         [status_ setText:nil];
     }
 #endif

+
+    cached_ = false;
+}
+
+- (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];
+
+        [self setBackgroundColor:color];
+        cached_ = true;
+    }
+
+    [super drawRect:rect];
+}
+
+- (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) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
 }
 
 - (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {


@@ -3279,17 +4196,22 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         UISetColor(White_);
 
     if (!selected)
         UISetColor(White_);
 
     if (!selected)

-        UISetColor(Black_);
+        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)
     [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(Gray_);
+        UISetColor(commercial_ ? Purplish_ : Gray_);

     [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
 
     [super drawContentInRect:rect selected:selected];
 }
 
     [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
 
     [super drawContentInRect:rect selected:selected];
 }
 

+- (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;
 + (int) heightForPackage:(Package *)package {
     NSString *tagline([package tagline]);
     int height = tagline == nil || [tagline length] == 0 ? -17 : 0;


@@ -3376,17 +4298,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self clearSection];
 
     if (section == nil) {
     [self clearSection];
 
     if (section == nil) {

-        name_ = [@"All Packages" retain];
+        name_ = [CYLocalize("ALL_PACKAGES") retain];

         count_ = nil;
     } else {
         section_ = [section name];
         if (section_ != nil)
             section_ = [section_ retain];
         count_ = nil;
     } else {
         section_ = [section name];
         if (section_ != nil)
             section_ = [section_ retain];

-        name_  = [(section_ == nil ? @"(No Section)" : section_) retain];
+        name_  = [(section_ == nil ? CYLocalize("NO_SECTION") : section_) retain];

         count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
 
         if (editing_)
         count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
 
         if (editing_)

-            [switch_ setValue:isSectionVisible(section_) animated:NO];
+            [switch_ setValue:(isSectionVisible(section_) ? 1 : 0) animated:NO];

     }
 }
 
     }
 }
 


@@ -3470,7 +4392,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [self addSubview:list_];
 
         UITableColumn *column = [[[UITableColumn alloc]
         [self addSubview:list_];
 
         UITableColumn *column = [[[UITableColumn alloc]

-            initWithTitle:@"Name"
+            initWithTitle:CYLocalize("NAME")

             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];


@@ -3538,19 +4460,21 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) title {
 }
 
 - (NSString *) title {

-    return @"Installed Files";
+    return CYLocalize("INSTALLED_FILES");

 }
 
 - (NSString *) backButtonTitle {
 }
 
 - (NSString *) backButtonTitle {

-    return @"Files";
+    return CYLocalize("FILES");

 }
 
 @end
 /* }}} */
 /* Package View {{{ */
 @interface PackageView : BrowserView {
 }
 
 @end
 /* }}} */
 /* Package View {{{ */
 @interface PackageView : BrowserView {

+    _transient Database *database_;

     Package *package_;
     NSString *name_;
     Package *package_;
     NSString *name_;

+    bool commercial_;

     NSMutableArray *buttons_;
 }
 
     NSMutableArray *buttons_;
 }
 


@@ -3570,44 +4494,58 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [super dealloc];
 }
 
     [super dealloc];
 }
 

+/*- (void) release {
+    if ([self retainCount] == 1)
+        [delegate_ setPackageView:self];
+    [super release];
+}*/
+
+/* XXX: this is not safe at all... localization of /fail/ */

 - (void) _clickButtonWithName:(NSString *)name {
 - (void) _clickButtonWithName:(NSString *)name {

-    if ([name isEqualToString:@"Install"])
+    if ([name isEqualToString:CYLocalize("CLEAR")])
+        [delegate_ clearPackage:package_];
+    else if ([name isEqualToString:CYLocalize("INSTALL")])

         [delegate_ installPackage:package_];
         [delegate_ installPackage:package_];

-    else if ([name isEqualToString:@"Reinstall"])
+    else if ([name isEqualToString:CYLocalize("REINSTALL")])

         [delegate_ installPackage:package_];
         [delegate_ installPackage:package_];

-    else if ([name isEqualToString:@"Remove"])
+    else if ([name isEqualToString:CYLocalize("REMOVE")])

         [delegate_ removePackage:package_];
         [delegate_ removePackage:package_];

-    else if ([name isEqualToString:@"Upgrade"])
+    else if ([name isEqualToString:CYLocalize("UPGRADE")])

         [delegate_ installPackage:package_];
     else _assert(false);
 }
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
         [delegate_ installPackage:package_];
     else _assert(false);
 }
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {

-    int count = [buttons_ count];
-    _assert(count != 0);
-    _assert(button <= count + 1);
+    NSString *context([sheet context]);

 
 

-    if (count != button - 1)
-        [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];
+    if ([context isEqualToString:@"modify"]) {
+        int count = [buttons_ count];
+        _assert(count != 0);
+        _assert(button <= count + 1);

 
 

-    [sheet dismiss];
+        if (count != button - 1)
+            [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];
+
+        [sheet dismiss];
+    } else
+        [super alertSheet:sheet buttonClicked:button];

 }
 
 - (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
 }
 
 - (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {

-    [[frame windowObject] evaluateWebScript:@"document.base.target = '_top'"];

     return [super webView:sender didFinishLoadForFrame:frame];
 }
 
 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
     return [super webView:sender didFinishLoadForFrame:frame];
 }
 
 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {

-    [window setValue:package_ forKey:@"package"];

     [super webView:sender didClearWindowObject:window forFrame:frame];
     [super webView:sender didClearWindowObject:window forFrame:frame];

+    [window setValue:package_ forKey:@"package"];

 }
 
 }
 

-#if 0
-- (void) _rightButtonClicked {
-    /*[super _rightButtonClicked];
-    return;*/
+- (bool) _allowJavaScriptPanel {
+    return commercial_;
+}

 
 

+#if !AlwaysReload
+- (void) __rightButtonClicked {

     int count = [buttons_ count];
     _assert(count != 0);
 
     int count = [buttons_ count];
     _assert(count != 0);
 


@@ -3616,22 +4554,29 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     else {
         NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)];
         [buttons addObjectsFromArray:buttons_];
     else {
         NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)];
         [buttons addObjectsFromArray:buttons_];

-        [buttons addObject:@"Cancel"];
+        [buttons addObject:CYLocalize("CANCEL")];

 
         [delegate_ slideUp:[[[UIActionSheet alloc]
             initWithTitle:nil
             buttons:buttons
 
         [delegate_ slideUp:[[[UIActionSheet alloc]
             initWithTitle:nil
             buttons:buttons

-            defaultButtonIndex:2
+            defaultButtonIndex:([buttons count] - 1)

             delegate:self
             delegate:self

-            context:@"manage"
+            context:@"modify"

         ] autorelease]];
     }
 }
         ] autorelease]];
     }
 }

+
+- (void) _rightButtonClicked {
+    if (commercial_)
+        [super _rightButtonClicked];
+    else
+        [self __rightButtonClicked];
+}

 #endif
 
 #endif
 

-- (NSString *) _rightButtonTitle {
+- (id) _rightButtonTitle {

     int count = [buttons_ count];
     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 *) backButtonTitle {
 }
 
 - (NSString *) backButtonTitle {


@@ -3639,9 +4584,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {

-    if ((self = [super initWithBook:book database:database]) != nil) {
+    if ((self = [super initWithBook:book]) != nil) {

         database_ = database;
         buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
         database_ = database;
         buttons_ = [[NSMutableArray alloc] initWithCapacity:4];

+        [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]];

     } return self;
 }
 
     } return self;
 }
 


@@ -3661,43 +4607,66 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (package != nil) {
         package_ = [package retain];
         name_ = [[package id] retain];
     if (package != nil) {
         package_ = [package retain];
         name_ = [[package id] retain];

+        commercial_ = [package isCommercial];

 
 

-        [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]];
-
+        if ([package_ mode] != nil)
+            [buttons_ addObject:CYLocalize("CLEAR")];

         if ([package_ source] == nil);
         else if ([package_ upgradableAndEssential:NO])
         if ([package_ source] == nil);
         else if ([package_ upgradableAndEssential:NO])

-            [buttons_ addObject:@"Upgrade"];
+            [buttons_ addObject:CYLocalize("UPGRADE")];

         else if ([package_ installed] == nil)
         else if ([package_ installed] == nil)

-            [buttons_ addObject:@"Install"];
+            [buttons_ addObject:CYLocalize("INSTALL")];

         else
         else

-            [buttons_ addObject:@"Reinstall"];
+            [buttons_ addObject:CYLocalize("REINSTALL")];

         if ([package_ installed] != nil)
         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_];
+        }

     }
     }

-}

 
 

-- (void) reloadData {
-    [self setPackage:[database_ packageWithName:name_]];

     [self reloadButtons];
 }
 
     [self reloadButtons];
 }
 

-@end
+- (bool) isLoading {
+    return commercial_ ? [super isLoading] : false;
+}
+
+- (void) reloadData {
+    [self setPackage:[database_ packageWithName:name_]];
+}
+
+@end

 /* }}} */
 /* Package Table {{{ */
 @interface PackageTable : RVPage {
     _transient Database *database_;
     NSString *title_;
 /* }}} */
 /* Package Table {{{ */
 @interface PackageTable : RVPage {
     _transient Database *database_;
     NSString *title_;

-    SEL filter_;
-    id object_;

     NSMutableArray *packages_;
     NSMutableArray *sections_;
     UISectionList *list_;
 }
 
     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) setDelegate:(id)delegate;

-- (void) setObject:(id)object;

 
 - (void) reloadData;
 - (void) resetCursor;
 
 - (void) reloadData;
 - (void) resetCursor;


@@ -3714,8 +4683,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [list_ setDataSource:nil];
 
     [title_ release];
     [list_ setDataSource:nil];
 
     [title_ release];

-    if (object_ != nil)
-        [object_ release];

     [packages_ release];
     [sections_ release];
     [list_ release];
     [packages_ release];
     [sections_ release];
     [list_ release];


@@ -3759,18 +4726,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         return;
 
     Package *package = [packages_ objectAtIndex:row];
         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 setPackage:package];

+    [view setDelegate:delegate_];

     [book_ pushPage:view];
 }
 
     [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];
     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];
 
         packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
         sections_ = [[NSMutableArray arrayWithCapacity:16] retain];


@@ -3779,7 +4745,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [list_ setDataSource:self];
 
         UITableColumn *column = [[[UITableColumn alloc]
         [list_ setDataSource:self];
 
         UITableColumn *column = [[[UITableColumn alloc]

-            initWithTitle:@"Name"
+            initWithTitle:CYLocalize("NAME")

             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];


@@ -3791,7 +4757,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [table setReusesTableCells:YES];
 
         [self addSubview:list_];
         [table setReusesTableCells:YES];
 
         [self addSubview:list_];

-        [self reloadData];

 
         [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
         [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
 
         [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
         [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];


@@ -3802,13 +4767,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     delegate_ = delegate;
 }
 
     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 {
 }
 
 - (void) reloadData {


@@ -3817,27 +4777,41 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [packages_ removeAllObjects];
     [sections_ removeAllObjects];
 
     [packages_ removeAllObjects];
     [sections_ removeAllObjects];
 

-    for (size_t i(0); i != [packages count]; ++i) {
-        Package *package([packages objectAtIndex:i]);
-        if ([package valid] && [[package performSelector:filter_ withObject:object_] boolValue])
-            [packages_ addObject:package];
-    }
+    _profile(PackageTable$reloadData$Filter)
+        for (Package *package in packages)
+            if ([self hasPackage:package])
+                [packages_ addObject:package];
+    _end

 
     Section *section = nil;
 
 
     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 {
 }
 
 - (NSString *) title {


@@ -3860,6 +4834,58 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [list_ setShouldHideHeaderInShortLists:hide];
 }
 
     [list_ setShouldHideHeaderInShortLists:hide];
 }
 

+@end
+/* }}} */
+/* Filtered Package Table {{{ */
+@interface FilteredPackageTable : PackageTable {
+    SEL filter_;
+    IMP imp_;
+    id object_;
+}
+
+- (void) setObject:(id)object;
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object;
+
+@end
+
+@implementation FilteredPackageTable
+
+- (void) dealloc {
+    if (object_ != nil)
+        [object_ release];
+    [super dealloc];
+}
+
+- (void) setObject:(id)object {
+    if (object_ != nil)
+        [object_ release];
+    if (object == nil)
+        object_ = nil;
+    else
+        object_ = [object retain];
+}
+
+- (bool) hasPackage:(Package *)package {
+    _profile(FilteredPackageTable$hasPackage)
+        return [package valid] && (*reinterpret_cast<bool (*)(id, SEL, id)>(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];
+
+        /* XXX: this is an unsafe optimization of doomy hell */
+        Method method = class_getInstanceMethod([Package class], filter);
+        imp_ = method_getImplementation(method);
+        _assert(imp_ != NULL);
+
+        [self reloadData];
+    } return self;
+}
+

 @end
 /* }}} */
 
 @end
 /* }}} */
 


@@ -4005,8 +5031,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
     switch (section + (offset_ == 0 ? 1 : 0)) {
 
 - (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
     switch (section + (offset_ == 0 ? 1 : 0)) {

-        case 0: return @"Entered by User";
-        case 1: return @"Installed by Packages";
+        case 0: return CYLocalize("ENTERED_BY_USER");
+        case 1: return CYLocalize("INSTALLED_BY_PACKAGE");

 
         default:
             _assert(false);
 
         default:
             _assert(false);


@@ -4056,7 +5082,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     Source *source = [sources_ objectAtIndex:row];
 
 
     Source *source = [sources_ objectAtIndex:row];
 

-    PackageTable *packages = [[[PackageTable alloc]
+    PackageTable *packages = [[[FilteredPackageTable alloc]

         initWithBook:book_
         database:database_
         title:[source label]
         initWithBook:book_
         database:database_
         title:[source label]


@@ -4084,6 +5110,35 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [delegate_ syncData];
 }
 
     [delegate_ syncData];
 }
 

+- (void) complete {
+    [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys:
+        @"deb", @"Type",
+        href_, @"URI",
+        @"./", @"Distribution",
+    nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]];
+
+    [delegate_ syncData];
+}
+
+- (NSString *) getWarning {
+    NSString *href(href_);
+    NSRange colon([href rangeOfString:@"://"]);
+    if (colon.location != NSNotFound)
+        href = [href substringFromIndex:(colon.location + 3)];
+    href = [href stringByAddingPercentEscapes];
+    href = [@"http://cydia.saurik.com/api/repotag/" stringByAppendingString:href];
+    href = [href stringByCachingURLWithCurrentCDN];
+
+    NSURL *url([NSURL URLWithString:href]);
+
+    NSStringEncoding encoding;
+    NSError *error(nil);
+
+    if (NSString *warning = [NSString stringWithContentsOfURL:url usedEncoding:&encoding error:&error])
+        return [warning length] == 0 ? nil : warning;
+    return nil;
+}
+

 - (void) _endConnection:(NSURLConnection *)connection {
     NSURLConnection **field = NULL;
     if (connection == trivial_bz2_)
 - (void) _endConnection:(NSURLConnection *)connection {
     NSURLConnection **field = NULL;
     if (connection == trivial_bz2_)


@@ -4098,25 +5153,30 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         trivial_bz2_ == nil &&
         trivial_gz_ == nil
     ) {
         trivial_bz2_ == nil &&
         trivial_gz_ == nil
     ) {

-        [delegate_ setStatusBarShowsProgress:NO];
-
-        [hud_ show:NO];
-        [hud_ removeFromSuperview];
-        [hud_ autorelease];
-        hud_ = nil;
+        bool defer(false);

 
         if (trivial_) {
 
         if (trivial_) {

-            [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                @"deb", @"Type",
-                href_, @"URI",
-                @"./", @"Distribution",
-            nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]];
-
-            [delegate_ syncData];
+            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]
         } else if (error_ != nil) {
             UIActionSheet *sheet = [[[UIActionSheet alloc]

-                initWithTitle:@"Verification Error"
-                buttons:[NSArray arrayWithObjects:@"OK", nil]
+                initWithTitle:CYLocalize("VERIFICATION_ERROR")
+                buttons:[NSArray arrayWithObjects:CYLocalize("OK"), nil]

                 defaultButtonIndex:0
                 delegate:self
                 context:@"urlerror"
                 defaultButtonIndex:0
                 delegate:self
                 context:@"urlerror"


@@ -4126,19 +5186,27 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             [sheet popupAlertAnimated:YES];
         } else {
             UIActionSheet *sheet = [[[UIActionSheet alloc]
             [sheet popupAlertAnimated:YES];
         } else {
             UIActionSheet *sheet = [[[UIActionSheet alloc]

-                initWithTitle:@"Did not Find Repository"
-                buttons:[NSArray arrayWithObjects:@"OK", nil]
+                initWithTitle:CYLocalize("NOT_REPOSITORY")
+                buttons:[NSArray arrayWithObjects:CYLocalize("OK"), nil]

                 defaultButtonIndex:0
                 delegate:self
                 context:@"trivial"
             ] autorelease];
 
                 defaultButtonIndex:0
                 delegate:self
                 context:@"trivial"
             ] autorelease];
 

-            [sheet setBodyText:@"The indicated repository could not be found. This could be because you are trying to add a legacy Installer repository (these are not supported). Also, this interface is only capable of working with exact repository URLs. If you host a repository and are having issues please contact the author of Cydia with any questions you have."];
+            [sheet setBodyText:CYLocalize("NOT_REPOSITORY_EX")];

             [sheet popupAlertAnimated:YES];
         }
 
             [sheet popupAlertAnimated:YES];
         }
 

-        [href_ release];
-        href_ = nil;
+        [delegate_ setStatusBarShowsProgress:NO];
+        [delegate_ removeProgressHUD:hud_];
+
+        [hud_ autorelease];
+        hud_ = nil;
+
+        if (!defer) {
+            [href_ release];
+            href_ = nil;
+        }

 
         if (error_ != nil) {
             [error_ release];
 
         if (error_ != nil) {
             [error_ release];


@@ -4174,12 +5242,21 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     [request setHTTPMethod:method];
 
 
     [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 {
     return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
 }
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {

-    NSString *context = [sheet context];
-    if ([context isEqualToString:@"source"])
+    NSString *context([sheet context]);
+
+    if ([context isEqualToString:@"source"]) {

         switch (button) {
             case 1: {
                 NSString *href = [[sheet textField] text];
         switch (button) {
             case 1: {
                 NSString *href = [[sheet textField] text];


@@ -4198,8 +5275,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
                 trivial_ = false;
 
 
                 trivial_ = false;
 

-                hud_ = [delegate_ addProgressHUD];
-                [hud_ setText:@"Verifying URL"];
+                hud_ = [[delegate_ addProgressHUD] retain];
+                [hud_ setText:CYLocalize("VERIFYING_URL")];

             } break;
 
             case 2:
             } break;
 
             case 2:


@@ -4209,7 +5286,29 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
                 _assert(false);
         }
 
                 _assert(false);
         }
 

-    [sheet dismiss];
+        [sheet dismiss];
+    } else if ([context isEqualToString:@"trivial"])
+        [sheet dismiss];
+    else if ([context isEqualToString:@"urlerror"])
+        [sheet dismiss];
+    else if ([context isEqualToString:@"warning"]) {
+        switch (button) {
+            case 1:
+                [self complete];
+            break;
+
+            case 2:
+            break;
+
+            default:
+                _assert(false);
+        }
+
+        [href_ release];
+        href_ = nil;
+
+        [sheet dismiss];
+    }

 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {


@@ -4225,7 +5324,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [list_ setDataSource:self];
 
         UITableColumn *column = [[UITableColumn alloc]
         [list_ setDataSource:self];
 
         UITableColumn *column = [[UITableColumn alloc]

-            initWithTitle:@"Name"
+            initWithTitle:CYLocalize("NAME")

             identifier:@"name"
             width:[self frame].size.width
         ];
             identifier:@"name"
             width:[self frame].size.width
         ];


@@ -4248,7 +5347,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     [sources_ removeAllObjects];
     [sources_ addObjectsFromArray:[database_ sources]];
 
     [sources_ removeAllObjects];
     [sources_ addObjectsFromArray:[database_ sources]];

+    _trace();

     [sources_ sortUsingSelector:@selector(compareByNameAndType:)];
     [sources_ sortUsingSelector:@selector(compareByNameAndType:)];

+    _trace();

 
     int count = [sources_ count];
     for (offset_ = 0; offset_ != count; ++offset_) {
 
     int count = [sources_ count];
     for (offset_ = 0; offset_ != count; ++offset_) {


@@ -4271,19 +5372,23 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ] autorelease]];*/
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
     ] autorelease]];*/
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]

-        initWithTitle:@"Enter Cydia/APT URL"
-        buttons:[NSArray arrayWithObjects:@"Add Source", @"Cancel", nil]
+        initWithTitle:CYLocalize("ENTER_APT_URL")
+        buttons:[NSArray arrayWithObjects:CYLocalize("ADD_SOURCE"), CYLocalize("CANCEL"), nil]

         defaultButtonIndex:0
         delegate:self
         context:@"source"
     ] autorelease];
 
         defaultButtonIndex:0
         delegate:self
         context:@"source"
     ] autorelease];
 

+    [sheet setNumberOfRows:1];
+

     [sheet addTextFieldWithValue:@"http://" label:@""];
 
     UITextInputTraits *traits = [[sheet textField] textInputTraits];
     [sheet addTextFieldWithValue:@"http://" label:@""];
 
     UITextInputTraits *traits = [[sheet textField] textInputTraits];

-    [traits setAutocapitalizationType:0];
-    [traits setKeyboardType:3];
-    [traits setAutocorrectionType:1];
+    [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+    [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
+    [traits setKeyboardType:UIKeyboardTypeURL];
+    // XXX: UIReturnKeyDone
+    [traits setReturnKeyType:UIReturnKeyNext];

 
     [sheet popupAlertAnimated:YES];
 }
 
     [sheet popupAlertAnimated:YES];
 }


@@ -4296,15 +5401,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) title {
 }
 
 - (NSString *) title {

-    return @"Sources";
+    return CYLocalize("SOURCES");

 }
 
 - (NSString *) leftButtonTitle {
 }
 
 - (NSString *) leftButtonTitle {

-    return [[list_ table] isRowDeletionEnabled] ? @"Add" : nil;
+    return [[list_ table] isRowDeletionEnabled] ? CYLocalize("ADD") : nil;

 }
 
 }
 

-- (NSString *) rightButtonTitle {
-    return [[list_ table] isRowDeletionEnabled] ? @"Done" : @"Edit";
+- (id) rightButtonTitle {
+    return [[list_ table] isRowDeletionEnabled] ? CYLocalize("DONE") : CYLocalize("EDIT");

 }
 
 - (UINavigationButtonStyle) rightButtonStyle {
 }
 
 - (UINavigationButtonStyle) rightButtonStyle {


@@ -4317,7 +5422,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 /* Installed View {{{ */
 @interface InstalledView : RVPage {
     _transient Database *database_;
 /* Installed View {{{ */
 @interface InstalledView : RVPage {
     _transient Database *database_;

-    PackageTable *packages_;
+    FilteredPackageTable *packages_;

     BOOL expert_;
 }
 
     BOOL expert_;
 }
 


@@ -4336,7 +5441,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if ((self = [super initWithBook:book]) != nil) {
         database_ = database;
 
     if ((self = [super initWithBook:book]) != nil) {
         database_ = database;
 

-        packages_ = [[PackageTable alloc]
+        packages_ = [[FilteredPackageTable alloc]

             initWithBook:book
             database:database
             title:nil
             initWithBook:book
             database:database
             title:nil


@@ -4367,15 +5472,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) title {
 }
 
 - (NSString *) title {

-    return @"Installed";
+    return CYLocalize("INSTALLED");

 }
 
 - (NSString *) backButtonTitle {
 }
 
 - (NSString *) backButtonTitle {

-    return @"Packages";
+    return CYLocalize("PACKAGES");

 }
 
 }
 

-- (NSString *) rightButtonTitle {
-    return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? @"Expert" : @"Simple";
+- (id) rightButtonTitle {
+    return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? CYLocalize("EXPERT") : CYLocalize("SIMPLE");

 }
 
 - (UINavigationButtonStyle) rightButtonStyle {
 }
 
 - (UINavigationButtonStyle) rightButtonStyle {


@@ -4399,20 +5504,25 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @implementation HomeView
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
 @implementation HomeView
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {

-    [sheet dismiss];
+    NSString *context([sheet context]);
+
+    if ([context isEqualToString:@"about"])
+        [sheet dismiss];
+    else
+        [super alertSheet:sheet buttonClicked:button];

 }
 
 - (void) _leftButtonClicked {
     UIActionSheet *sheet = [[[UIActionSheet alloc]
 }
 
 - (void) _leftButtonClicked {
     UIActionSheet *sheet = [[[UIActionSheet alloc]

-        initWithTitle:@"About Cydia Installer"
-        buttons:[NSArray arrayWithObjects:@"Close", nil]
+        initWithTitle:CYLocalize("ABOUT_CYDIA")
+        buttons:[NSArray arrayWithObjects:CYLocalize("CLOSE"), nil]

         defaultButtonIndex:0
         delegate:self
         context:@"about"
     ] autorelease];
 
     [sheet setBodyText:
         defaultButtonIndex:0
         delegate:self
         context:@"about"
     ] autorelease];
 
     [sheet setBodyText:

-        @"Copyright (C) 2008\n"
+        @"Copyright (C) 2008-2009\n"

         "Jay Freeman (saurik)\n"
         "saurik@saurik.com\n"
         "http://www.saurik.com/\n"
         "Jay Freeman (saurik)\n"
         "saurik@saurik.com\n"
         "http://www.saurik.com/\n"


@@ -4430,7 +5540,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) leftButtonTitle {
 }
 
 - (NSString *) leftButtonTitle {

-    return @"About";
+    return CYLocalize("ABOUT");

 }
 
 @end
 }
 
 @end


@@ -4444,7 +5554,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @implementation ManageView
 
 - (NSString *) title {
 @implementation ManageView
 
 - (NSString *) title {

-    return @"Manage";
+    return CYLocalize("MANAGE");

 }
 
 - (void) _leftButtonClicked {
 }
 
 - (void) _leftButtonClicked {


@@ -4452,546 +5562,379 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) leftButtonTitle {
 }
 
 - (NSString *) leftButtonTitle {

-    return @"Settings";
-}
-
-- (NSString *) _rightButtonTitle {
-    return nil;
-}
-
-@end
-/* }}} */
-
-@interface WebView (Cydia)
-- (void) setScriptDebugDelegate:(id)delegate;
-- (void) _setFormDelegate:(id)delegate;
-- (void) _setUIKitDelegate:(id)delegate;
-- (void) setWebMailDelegate:(id)delegate;
-- (void) _setLayoutInterval:(float)interval;
-@end
-
-/* Indirect Delegate {{{ */
-@interface IndirectDelegate : NSProxy {
-    _transient volatile id delegate_;
+    return CYLocalize("SETTINGS");

 }
 
 }
 

-- (void) setDelegate:(id)delegate;
-- (id) initWithDelegate:(id)delegate;
-@end
-
-@implementation IndirectDelegate
-
-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
+#if !AlwaysReload
+- (id) _rightButtonTitle {
+    return Queuing_ ? CYLocalize("QUEUE") : nil;

 }
 
 }
 

-- (id) initWithDelegate:(id)delegate {
-    delegate_ = delegate;
-    return self;
+- (UINavigationButtonStyle) rightButtonStyle {
+    return Queuing_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;

 }
 
 }
 

-- (NSMethodSignature*) methodSignatureForSelector:(SEL)sel {
-    if (delegate_ != nil)
-        if (NSMethodSignature *sig = [delegate_ methodSignatureForSelector:sel])
-            return sig;
-    // XXX: I fucking hate Apple so very very bad
-    return [NSMethodSignature signatureWithObjCTypes:"v@:"];
+- (void) _rightButtonClicked {
+    [delegate_ queue];

 }
 }

+#endif

 
 

-- (void) forwardInvocation:(NSInvocation *)inv {
-    SEL sel = [inv selector];
-    if (delegate_ != nil && [delegate_ respondsToSelector:sel])
-        [inv invokeWithTarget:delegate_];
+- (bool) isLoading {
+    return false;

 }
 
 @end
 /* }}} */
 }
 
 @end
 /* }}} */

-/* Browser Implementation {{{ */
-@implementation BrowserView
-
-- (void) dealloc {
-    WebView *webview = [webview_ webView];
-    [webview setFrameLoadDelegate:nil];
-    [webview setResourceLoadDelegate:nil];
-    [webview setUIDelegate:nil];
-    [webview setScriptDebugDelegate:nil];
-    [webview setPolicyDelegate:nil];

 
 

-    [webview setDownloadDelegate:nil];
+#include <BrowserView.m>

 
 

-    [webview _setFormDelegate:nil];
-    [webview _setUIKitDelegate:nil];
-    [webview setWebMailDelegate:nil];
-    [webview setEditingDelegate:nil];
-
-    [webview_ setDelegate:nil];
-    [webview_ setGestureDelegate:nil];
-
-    //NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-
-    [webview close];
+/* Cydia Book {{{ */
+@interface CYBook : RVBook <
+    ProgressDelegate
+> {
+    _transient Database *database_;
+    UINavigationBar *overlay_;
+    UINavigationBar *underlay_;
+    UIProgressIndicator *indicator_;
+    UITextLabel *prompt_;
+    UIProgressBar *progress_;
+    UINavigationButton *cancel_;
+    bool updating_;
+}

 
 

-#if RecycleWebViews
-    [webview_ removeFromSuperview];
-    [Documents_ addObject:[webview_ autorelease]];
-#else
-    [webview_ release];
-#endif
+- (id) initWithFrame:(CGRect)frame database:(Database *)database;
+- (void) update;
+- (BOOL) updating;

 
 

-    [indirect_ setDelegate:nil];
-    [indirect_ release];
+@end

 
 

-    [scroller_ setDelegate:nil];
+@implementation CYBook

 
 

-    [scroller_ release];
-    [urls_ release];
+- (void) dealloc {
+    [overlay_ release];

     [indicator_ release];
     [indicator_ release];

-    if (title_ != nil)
-        [title_ release];
+    [prompt_ release];
+    [progress_ release];
+    [cancel_ release];

     [super dealloc];
 }
 
     [super dealloc];
 }
 

-- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
-    [self loadRequest:[NSURLRequest
-        requestWithURL:url
-        cachePolicy:policy
-        timeoutInterval:30.0
-    ]];
+- (NSString *) getTitleForPage:(RVPage *)page {
+    return [super getTitleForPage:page];

 }
 
 }
 

-- (void) loadURL:(NSURL *)url {
-    [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy];
+- (BOOL) updating {
+    return updating_;

 }
 
 }
 

-- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request {
-    NSMutableURLRequest *copy = [request mutableCopy];
-
-    if (Machine_ != NULL)
-        [copy addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
-    if (UniqueID_ != nil)
-        [copy addValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"];
+- (void) update {
+    [UIView beginAnimations:nil context:NULL];

 
 

-    if (Role_ != nil)
-        [copy addValue:Role_ forHTTPHeaderField:@"X-Role"];
+    CGRect ovrframe = [overlay_ frame];
+    ovrframe.origin.y = 0;
+    [overlay_ setFrame:ovrframe];

 
 

-    return copy;
-}
+    CGRect barframe = [navbar_ frame];
+    barframe.origin.y += ovrframe.size.height;
+    [navbar_ setFrame:barframe];

 
 

-- (void) loadRequest:(NSURLRequest *)request {
-    pushed_ = true;
-    [webview_ loadRequest:request];
-}
+    CGRect trnframe = [transition_ frame];
+    trnframe.origin.y += ovrframe.size.height;
+    trnframe.size.height -= ovrframe.size.height;
+    [transition_ setFrame:trnframe];

 
 

-- (void) reloadURL {
-    if ([urls_ count] == 0)
-        return;
-    NSURL *url = [[[urls_ lastObject] retain] autorelease];
-    [urls_ removeLastObject];
-    [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData];
-}
+    [UIView endAnimations];

 
 

-- (WebView *) webView {
-    return [webview_ webView];
-}
+    [indicator_ startAnimation];
+    [prompt_ setText:CYLocalize("UPDATING_DATABASE")];
+    [progress_ setProgress:0];

 
 

-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame {
-    [scroller_ setContentSize:frame.size];
-}
+    updating_ = true;
+    [overlay_ addSubview:cancel_];

 
 

-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
-    [self view:sender didSetFrame:frame];
+    [NSThread
+        detachNewThreadSelector:@selector(_update)
+        toTarget:self
+        withObject:nil
+    ];

 }
 
 }
 

-- (void) pushPage:(RVPage *)page {
-    [self setBackButtonTitle:title_];
-    [page setDelegate:delegate_];
-    [book_ pushPage:page];
-}
+- (void) _update_ {
+    updating_ = false;

 
 

-- (BOOL) getSpecial:(NSURL *)url {
-    NSString *href([url absoluteString]);
-    NSString *scheme([[url scheme] lowercaseString]);
+    [indicator_ stopAnimation];

 
 

-    RVPage *page = nil;
+    [UIView beginAnimations:nil context:NULL];

 
 

-    if ([href hasPrefix:@"apptapp://package/"])
-        page = [delegate_ pageForPackage:[href substringFromIndex:18]];
-    else if ([scheme isEqualToString:@"cydia"])
-        page = [delegate_ pageForURL:url hasTag:NULL];
-    else if (![scheme isEqualToString:@"apptapp"])
-        return false;
+    CGRect ovrframe = [overlay_ frame];
+    ovrframe.origin.y = -ovrframe.size.height;
+    [overlay_ setFrame:ovrframe];

 
 

-    if (page != nil)
-        [self pushPage:page];
-    return true;
-}
+    CGRect barframe = [navbar_ frame];
+    barframe.origin.y -= ovrframe.size.height;
+    [navbar_ setFrame:barframe];

 
 

-- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
-    [window setValue:delegate_ forKey:@"cydia"];
-}
+    CGRect trnframe = [transition_ frame];
+    trnframe.origin.y -= ovrframe.size.height;
+    trnframe.size.height += ovrframe.size.height;
+    [transition_ setFrame:trnframe];

 
 

-- (void) webView:(WebView *)sender decidePolicyForNewWindowAction:(NSDictionary *)dictionary request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id<WebPolicyDecisionListener>)listener {
-    if (NSURL *url = [request URL]) {
-        if (![self getSpecial:url]) {
-            NSString *scheme([[url scheme] lowercaseString]);
-            if ([scheme isEqualToString:@"mailto"])
-                [delegate_ openMailToURL:url];
-            else goto use;
-        }
+    [UIView commitAnimations];

 
 

-        [listener ignore];
-    } else use:
-        [listener use];
+    [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0];

 }
 
 }
 

-- (void) webView:(WebView *)sender decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
-    NSURL *url([request URL]);
-
-    if (url == nil) use: {
-        [listener use];
-        return;
-    }
+- (id) initWithFrame:(CGRect)frame database:(Database *)database {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        database_ = database;

 
 

-    const NSArray *capability(reinterpret_cast<const NSArray *>(GSSystemGetCapability(kGSDisplayIdentifiersCapability)));
+        CGRect ovrrect = [navbar_ bounds];
+        ovrrect.size.height = [UINavigationBar defaultSize].height;
+        ovrrect.origin.y = -ovrrect.size.height;

 
 

-    if (
-        [capability containsObject:@"com.apple.Maps"] && [url mapsURL] ||
-        [capability containsObject:@"com.apple.youtube"] && [url youTubeURL]
-    ) {
-      open:
-        [UIApp openURL:url];
-      ignore:
-        [listener ignore];
-        return;
-    }
+        overlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect];
+        [self addSubview:overlay_];

 
 

-    int store(_not(int));
-    if (NSURL *itms = [url itmsURL:&store]) {
-        if (
-            store == 1 && [capability containsObject:@"com.apple.MobileStore"] ||
-            store == 2 && [capability containsObject:@"com.apple.AppStore"]
-        ) {
-            url = itms;
-            goto open;
-        }
-    }
-
-    NSString *scheme([[url scheme] lowercaseString]);
+        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_];

 
 

-    if ([scheme isEqualToString:@"tel"]) {
-        // XXX: intelligence
-        goto open;
-    }
+        [overlay_ setBarStyle:1];
+        [underlay_ setBarStyle:1];

 
 

-    if ([scheme isEqualToString:@"mailto"]) {
-        [delegate_ openMailToURL:url];
-        goto ignore;
-    }
+        int barstyle = [overlay_ _barStyle:NO];
+        bool ugly = barstyle == 0;

 
 

-    if ([self getSpecial:url])
-        goto ignore;
-    else if ([WebView _canHandleRequest:request])
-        goto use;
-    else if ([url isSpringboardHandledURL])
-        goto open;
-    else
-        goto use;
-}
+        UIProgressIndicatorStyle style = ugly ?
+            UIProgressIndicatorStyleMediumBrown :
+            UIProgressIndicatorStyleMediumWhite;

 
 

-- (void) webView:(WebView *)sender setStatusText:(NSString *)text {
-    //lprintf("Status:%s\n", [text UTF8String]);
-}
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
+        unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
+        CGRect indrect = {{indoffset, indoffset}, indsize};

 
 

-- (void) _pushPage {
-    if (pushed_)
-        return;
-    pushed_ = true;
-    [book_ pushPage:self];
-}
+        indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
+        [indicator_ setStyle:style];
+        [overlay_ addSubview:indicator_];

 
 

-- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
-    NSURL *url = [request URL];
-    if ([self getSpecial:url])
-        return nil;
-    [self _pushPage];
-    return [self _addHeadersToRequest:request];
-}
+        CGSize prmsize = {215, indsize.height + 4};

 
 

-- (WebView *) _createWebViewWithRequest:(NSURLRequest *)request pushed:(BOOL)pushed {
-    [self setBackButtonTitle:title_];
+        CGRect prmrect = {{
+            indoffset * 2 + indsize.width,
+#ifdef __OBJC2__
+            -1 +
+#endif
+            unsigned(ovrrect.size.height - prmsize.height) / 2
+        }, prmsize};

 
 

-    BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
-    [browser setDelegate:delegate_];
+        UIFont *font = [UIFont systemFontOfSize:15];

 
 

-    if (pushed) {
-        [browser loadRequest:[self _addHeadersToRequest:request]];
-        [book_ pushPage:browser];
-    }
+        prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];

 
 

-    return [browser webView];
-}
+        [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
+        [prompt_ setBackgroundColor:[UIColor clearColor]];
+        [prompt_ setFont:font];

 
 

-- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
-    return [self _createWebViewWithRequest:request pushed:(request != nil)];
-}
+        [overlay_ addSubview:prompt_];

 
 

-- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request windowFeatures:(NSDictionary *)features {
-    return [self _createWebViewWithRequest:request pushed:YES];
-}
+        CGSize prgsize = {75, 100};

 
 

-- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
-    if ([frame parentFrame] != nil)
-        return;
+        CGRect prgrect = {{
+            ovrrect.size.width - prgsize.width - 10,
+            (ovrrect.size.height - prgsize.height) / 2
+        } , prgsize};

 
 

-    title_ = [title retain];
-    [book_ reloadTitleForPage:self];
-}
+        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
+        [progress_ setStyle:0];
+        [overlay_ addSubview:progress_];

 
 

-- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
-    if ([frame parentFrame] != nil)
-        return;
+        cancel_ = [[UINavigationButton alloc] initWithTitle:CYLocalize("CANCEL") style:UINavigationButtonStyleHighlighted];
+        [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside];

 
 

-    reloading_ = false;
-    loading_ = true;
-    [indicator_ startAnimation];
-    [self reloadButtons];
+        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];

 
 

-    if (title_ != nil) {
-        [title_ release];
-        title_ = nil;
-    }
+        [cancel_ setBarStyle:barstyle];
+    } return self;
+}

 
 

-    [book_ reloadTitleForPage:self];
+- (void) _onCancel {
+    updating_ = false;
+    [cancel_ removeFromSuperview];
+}

 
 

-    WebView *webview = [webview_ webView];
-    NSString *href = [webview mainFrameURL];
-    [urls_ addObject:[NSURL URLWithString:href]];
+- (void) _update { _pooled
+    Status status;
+    status.setDelegate(self);

 
 

-    [scroller_ scrollPointVisibleAtTopLeft:CGPointZero];
+    [database_ updateWithStatus:status];

 
 

-    CGRect webrect = [scroller_ bounds];
-    webrect.size.height = 0;
-    [webview_ setFrame:webrect];
+    [self
+        performSelectorOnMainThread:@selector(_update_)
+        withObject:nil
+        waitUntilDone:NO
+    ];

 }
 
 }
 

-- (void) _finishLoading {
-    if (!reloading_) {
-        loading_ = false;
-        [indicator_ stopAnimation];
-        [self reloadButtons];
-    }
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    [prompt_ setText:[NSString stringWithFormat:CYLocalize("ERROR_MESSAGE"), error]];

 }
 
 }
 

-- (BOOL) webView:(WebView *)sender shouldScrollToPoint:(struct CGPoint)point forFrame:(WebFrame *)frame {
-    return [webview_ webView:sender shouldScrollToPoint:point forFrame:frame];
+- (void) setProgressTitle:(NSString *)title {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressTitle:)
+        withObject:title
+        waitUntilDone:YES
+    ];

 }
 
 }
 

-- (void) webView:(WebView *)sender didReceiveViewportArguments:(id)arguments forFrame:(WebFrame *)frame {
-    return [webview_ webView:sender didReceiveViewportArguments:arguments forFrame:frame];
+- (void) setProgressPercent:(float)percent {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressPercent:)
+        withObject:[NSNumber numberWithFloat:percent]
+        waitUntilDone:YES
+    ];

 }
 
 }
 

-- (void) webView:(WebView *)sender needsScrollNotifications:(id)notifications forFrame:(WebFrame *)frame {
-    return [webview_ webView:sender needsScrollNotifications:notifications forFrame:frame];
+- (void) startProgress {

 }
 
 }
 

-- (void) webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame {
-    return [webview_ webView:sender didCommitLoadForFrame:frame];
+- (void) addProgressOutput:(NSString *)output {
+    [self
+        performSelectorOnMainThread:@selector(_addProgressOutput:)
+        withObject:output
+        waitUntilDone:YES
+    ];

 }
 
 }
 

-- (void) webView:(WebView *)sender didReceiveDocTypeForFrame:(WebFrame *)frame {
-    return [webview_ webView:sender didReceiveDocTypeForFrame:frame];
+- (bool) isCancelling:(size_t)received {
+    return !updating_;

 }
 
 }
 

-- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
-    if ([frame parentFrame] == nil)
-        [self _finishLoading];
-    return [webview_ webView:sender didFinishLoadForFrame:frame];
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    [sheet dismiss];

 }
 
 }
 

-- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
-    if ([frame parentFrame] != nil)
-        return;
-    [self _finishLoading];
-
-    [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",
-        [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString],
-        [[error localizedDescription] stringByAddingPercentEscapes]
-    ]]];
+- (void) _setProgressTitle:(NSString *)title {
+    [prompt_ setText:title];

 }
 
 }
 

-- (void) webView:(WebView *)sender addMessageToConsole:(NSDictionary *)dictionary {
-#if ForSaurik
-    lprintf("Console:%s\n", [[dictionary description] UTF8String]);
-#endif
+- (void) _setProgressPercent:(NSNumber *)percent {
+    [progress_ setProgress:[percent floatValue]];

 }
 
 }
 

-- (id) initWithBook:(RVBook *)book database:(Database *)database {
-    if ((self = [super initWithBook:book]) != nil) {
-        database_ = database;
-        loading_ = false;
-
-        struct CGRect bounds = [self bounds];
-
-        UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:bounds] autorelease];
-        [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
-        [self addSubview:pinstripe];
-
-        scroller_ = [[UIScroller alloc] initWithFrame:bounds];
-        [self addSubview:scroller_];
-
-        [scroller_ setScrollingEnabled:YES];
-        [scroller_ setAdjustForContentSizeChange:YES];
-        [scroller_ setClipsSubviews:YES];
-        [scroller_ setAllowsRubberBanding:YES];
-        [scroller_ setScrollDecelerationFactor:0.99];
-        [scroller_ setDelegate:self];
-
-        CGRect webrect = [scroller_ bounds];
-        webrect.size.height = 0;
-
-        WebView *webview;
-
-#if RecycleWebViews
-        webview_ = [Documents_ lastObject];
-        if (webview_ != nil) {
-            webview_ = [webview_ retain];
-            webview = [webview_ webView];
-            [Documents_ removeLastObject];
-            [webview_ setFrame:webrect];
-        } else {
-#else
-        if (true) {
-#endif
-            webview_ = [[UIWebDocumentView alloc] initWithFrame:webrect];
-            webview = [webview_ webView];
-
-            [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
-
-            [webview_ setAllowsMessaging:YES];
-
-            [webview_ setTilingEnabled:YES];
-            [webview_ setDrawsGrid:NO];
-            [webview_ setLogsTilingChanges:NO];
-            [webview_ setTileMinificationFilter:kCAFilterNearest];
-            [webview_ setDetectsPhoneNumbers:NO];
-            [webview_ setAutoresizes:YES];
-
-            [webview_ setViewportSize:CGSizeMake(980, -1) forDocumentTypes:0x10];
-            [webview_ setViewportSize:CGSizeMake(320, -1) forDocumentTypes:0x2];
-            [webview_ setViewportSize:CGSizeMake(320, -1) forDocumentTypes:0x8];
-
-            [webview_ _setDocumentType:0x4];
-
-            [webview_ setZoomsFocusedFormControl:YES];
-            [webview_ setContentsPosition:7];
-            [webview_ setEnabledGestures:0xa];
-            [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:0x4];
-            [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:0x7];
-
-            [webview_ setSmoothsFonts:YES];
-
-            [webview _setUsesLoaderCache:YES];
-            [webview setGroupName:@"Cydia"];
-            //[webview _setLayoutInterval:0.5];
-        }
-
-        [webview_ setDelegate:self];
-        [webview_ setGestureDelegate:self];
-        [scroller_ addSubview:webview_];
-
-        //NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-
-        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:UIProgressIndicatorStyleMediumWhite];
-        indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 12, indsize.width, indsize.height)];
-        [indicator_ setStyle:UIProgressIndicatorStyleMediumWhite];
-
-        Package *package([database_ packageWithName:@"cydia"]);
-        NSString *application = package == nil ? @"Cydia" : [NSString
-            stringWithFormat:@"Cydia/%@",
-            [package installed]
-        ]; [webview setApplicationNameForUserAgent:application];
-
-        indirect_ = [[IndirectDelegate alloc] initWithDelegate:self];
-
-        [webview setFrameLoadDelegate:self];
-        [webview setResourceLoadDelegate:indirect_];
-        [webview setUIDelegate:self];
-        [webview setScriptDebugDelegate:self];
-        [webview setPolicyDelegate:self];
-
-        urls_ = [[NSMutableArray alloc] initWithCapacity:16];
-
-        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
-        [scroller_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
-        [pinstripe setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
-    } return self;
+- (void) _addProgressOutput:(NSString *)output {

 }
 
 }
 

-- (void) didFinishGesturesInView:(UIView *)view forEvent:(id)event {
-    [webview_ redrawScaledDocument];
+@end
+/* }}} */
+/* Cydia:// Protocol {{{ */
+@interface CydiaURLProtocol : NSURLProtocol {

 }
 
 }
 

-- (void) _rightButtonClicked {
-    reloading_ = true;
-    [self reloadURL];
-}
+@end

 
 

-- (NSString *) _rightButtonTitle {
-    return @"Reload";
-}
+@implementation CydiaURLProtocol

 
 

-- (NSString *) rightButtonTitle {
-    return loading_ ? @"" : [self _rightButtonTitle];
++ (BOOL) canInitWithRequest:(NSURLRequest *)request {
+    NSURL *url([request URL]);
+    if (url == nil)
+        return NO;
+    NSString *scheme([[url scheme] lowercaseString]);
+    if (scheme == nil || ![scheme isEqualToString:@"cydia"])
+        return NO;
+    return YES;

 }
 
 }
 

-- (NSString *) title {
-    return title_ == nil ? @"Loading" : title_;
++ (NSURLRequest *) canonicalRequestForRequest:(NSURLRequest *)request {
+    return request;

 }
 
 }
 

-- (NSString *) backButtonTitle {
-    return @"Browser";
-}
+- (void) _returnPNGWithImage:(UIImage *)icon forRequest:(NSURLRequest *)request {
+    id<NSURLProtocolClient> client([self client]);
+    if (icon == nil)
+        [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist userInfo:nil]];
+    else {
+        NSData *data(UIImagePNGRepresentation(icon));

 
 

-- (void) setPageActive:(BOOL)active {
-    if (!active)
-        [indicator_ removeFromSuperview];
-    else
-        [[book_ navigationBar] addSubview:indicator_];
+        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) resetViewAnimated:(BOOL)animated {
-}
+- (void) startLoading {
+    id<NSURLProtocolClient> client([self client]);
+    NSURLRequest *request([self request]);

 
 

-- (void) setPushed:(bool)pushed {
-    pushed_ = pushed;
-}
+    NSURL *url([request URL]);
+    NSString *href([url absoluteString]);

 
 

-@end
-/* }}} */
+    NSString *path([href substringFromIndex:8]);
+    NSRange slash([path rangeOfString:@"/"]);

 
 

-@interface CYBook : RVBook <
-    ProgressDelegate
-> {
-    _transient Database *database_;
-    UINavigationBar *overlay_;
-    UINavigationBar *underlay_;
-    UIProgressIndicator *indicator_;
-    UITextLabel *prompt_;
-    UIProgressBar *progress_;
-    UINavigationButton *cancel_;
-    bool updating_;
-    size_t received_;
-    NSTimeInterval last_;
+    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 {

 }
 
 }
 

-- (id) initWithFrame:(CGRect)frame database:(Database *)database;
-- (void) update;
-- (BOOL) updating;
-

 @end
 @end

+/* }}} */

 
 

-/* Install View {{{ */
-@interface InstallView : RVPage {
+/* Sections View {{{ */
+@interface SectionsView : RVPage {

     _transient Database *database_;
     NSMutableArray *sections_;
     NSMutableArray *filtered_;
     _transient Database *database_;
     NSMutableArray *sections_;
     NSMutableArray *filtered_;


@@ -5007,7 +5950,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @end
 
 
 @end
 

-@implementation InstallView
+@implementation SectionsView

 
 - (void) dealloc {
     [list_ setDataSource:nil];
 
 - (void) dealloc {
     [list_ setDataSource:nil];


@@ -5059,20 +6002,20 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (row == 0) {
         section = nil;
         name = nil;
     if (row == 0) {
         section = nil;
         name = nil;

-        title = @"All Packages";
+        title = CYLocalize("ALL_PACKAGES");

     } else {
         section = [filtered_ objectAtIndex:(row - 1)];
         name = [section name];
 
         if (name != nil)
     } else {
         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 = @"";
         else {
             name = @"";

-            title = @"(No Section)";
+            title = CYLocalize("NO_SECTION");

         }
     }
 
         }
     }
 

-    PackageTable *table = [[[PackageTable alloc]
+    PackageTable *table = [[[FilteredPackageTable alloc]

         initWithBook:book_
         database:database_
         title:title
         initWithBook:book_
         database:database_
         title:title


@@ -5099,7 +6042,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [transition_ transition:0 toView:list_];
 
         UITableColumn *column = [[[UITableColumn alloc]
         [transition_ transition:0 toView:list_];
 
         UITableColumn *column = [[[UITableColumn alloc]

-            initWithTitle:@"Name"
+            initWithTitle:CYLocalize("NAME")

             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];


@@ -5123,46 +6066,85 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [sections_ removeAllObjects];
     [filtered_ removeAllObjects];
 
     [sections_ removeAllObjects];
     [filtered_ removeAllObjects];
 

-    NSMutableArray *filtered = [NSMutableArray arrayWithCapacity:[packages count]];
-    NSMutableDictionary *sections = [NSMutableDictionary dictionaryWithCapacity:32];
+#if 0
+    typedef __gnu_cxx::hash_map<NSString *, Section *, NSStringMapHash, NSStringMapEqual> SectionMap;
+    SectionMap sections;
+    sections.resize(64);
+#else
+    NSMutableDictionary *sections([NSMutableDictionary dictionaryWithCapacity:32]);
+#endif

 
 

-    for (size_t i(0); i != [packages count]; ++i) {
-        Package *package([packages objectAtIndex:i]);
+    _trace();
+    for (Package *package in packages) {

         NSString *name([package section]);
         NSString *name([package section]);

+        NSString *key(name == nil ? @"" : name);
+
+#if 0
+        Section **section;
+
+        _profile(SectionsView$reloadData$Section)
+            section = &sections[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;

 
 

-        if (name != nil) {
-            Section *section([sections objectForKey:name]);
+        _profile(SectionsView$reloadData$Section)
+            section = [sections objectForKey:key];

             if (section == nil) {
             if (section == nil) {

-                section = [[[Section alloc] initWithName:name] autorelease];
-                [sections setObject:section forKey:name];
+                _profile(SectionsView$reloadData$Section$Allocate)
+                    section = [[[Section alloc] initWithName:name] autorelease];
+                    [sections setObject:section forKey:key];
+                _end

             }
             }

-        }
+        _end
+
+        [section addToCount];

 
 

-        if ([package valid] && [package installed] == nil && [package visible])
-            [filtered addObject:package];
+        _profile(SectionsView$reloadData$Filter)
+            if (![package valid] || [package installed] != nil || ![package visible])
+                continue;
+        _end
+
+        [section addToRow];
+#endif

     }
     }

+    _trace();

 
 

+#if 0
+    for (SectionMap::const_iterator i(sections.begin()), e(sections.end()); i != e; ++i)
+        [sections_ addObject:i->second];
+#else

     [sections_ addObjectsFromArray:[sections allValues]];
     [sections_ addObjectsFromArray:[sections allValues]];

-    [sections_ sortUsingSelector:@selector(compareByName:)];
+#endif

 
 

-    [filtered sortUsingSelector:@selector(compareBySection:)];
+    [sections_ sortUsingSelector:@selector(compareByName:)];

 
 

-    Section *section = nil;
-    for (size_t offset = 0, count = [filtered count]; offset != count; ++offset) {
-        Package *package = [filtered objectAtIndex:offset];
-        NSString *name = [package section];
-
-        if (section == nil || name != nil && ![[section name] isEqualToString:name]) {
-            section = name == nil ?
-                [[[Section alloc] initWithName:nil] autorelease] :
-                [sections objectForKey:name];
-            [filtered_ addObject:section];
-        }
+    for (Section *section in sections_) {
+        size_t count([section row]);
+        if ([section row] == 0)
+            continue;

 
 

-        [section addToCount];
+        section = [[[Section alloc] initWithName:[section name]] autorelease];
+        [section setCount:count];
+        [filtered_ addObject:section];

     }
 
     [list_ reloadData];
     }
 
     [list_ reloadData];

+    _trace();

 }
 
 - (void) resetView {
 }
 
 - (void) resetView {


@@ -5177,24 +6159,22 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (void) _rightButtonClicked {
     if ((editing_ = !editing_))
         [list_ reloadData];
 - (void) _rightButtonClicked {
     if ((editing_ = !editing_))
         [list_ reloadData];

-    else {
+    else

         [delegate_ updateData];
         [delegate_ updateData];

-    }
-

     [book_ reloadTitleForPage:self];
     [book_ reloadButtonsForPage:self];
 }
 
 - (NSString *) title {
     [book_ reloadTitleForPage:self];
     [book_ reloadButtonsForPage:self];
 }
 
 - (NSString *) title {

-    return editing_ ? @"Section Visibility" : @"Install by Section";
+    return editing_ ? CYLocalize("SECTION_VISIBILITY") : CYLocalize("INSTALL_BY_SECTION");

 }
 
 - (NSString *) backButtonTitle {
 }
 
 - (NSString *) backButtonTitle {

-    return @"Sections";
+    return CYLocalize("SECTIONS");

 }
 
 }
 

-- (NSString *) rightButtonTitle {
-    return [sections_ count] == 0 ? nil : editing_ ? @"Done" : @"Edit";
+- (id) rightButtonTitle {
+    return [sections_ count] == 0 ? nil : editing_ ? CYLocalize("DONE") : CYLocalize("EDIT");

 }
 
 - (UINavigationButtonStyle) rightButtonStyle {
 }
 
 - (UINavigationButtonStyle) rightButtonStyle {


@@ -5238,6 +6218,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
 }
 
 - (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {

+    NSLog(@"titleForSection:%u", section);

     return [[sections_ objectAtIndex:section] name];
 }
 
     return [[sections_ objectAtIndex:section] name];
 }
 


@@ -5269,7 +6250,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (row == INT_MAX)
         return;
     Package *package = [packages_ objectAtIndex:row];
     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];
     [view setDelegate:delegate_];
     [view setPackage:package];
     [book_ pushPage:view];


@@ -5299,7 +6280,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         //[list_ setSectionListStyle:1];
 
         UITableColumn *column = [[[UITableColumn alloc]
         //[list_ setSectionListStyle:1];
 
         UITableColumn *column = [[[UITableColumn alloc]

-            initWithTitle:@"Name"
+            initWithTitle:CYLocalize("NAME")

             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];


@@ -5323,53 +6304,80 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [packages_ removeAllObjects];
     [sections_ removeAllObjects];
 
     [packages_ removeAllObjects];
     [sections_ removeAllObjects];
 

-    for (size_t i(0); i != [packages count]; ++i) {
-        Package *package([packages objectAtIndex:i]);
-
+    _trace();
+    for (Package *package in packages)

         if (
             [package installed] == nil && [package valid] && [package visible] ||
         if (
             [package installed] == nil && [package valid] && [package visible] ||

-            [package upgradableAndEssential:NO]
+            [package upgradableAndEssential:YES]

         )
             [packages_ addObject:package];
         )
             [packages_ addObject:package];

-    }

 
 

-    [packages_ sortUsingSelector:@selector(compareForChanges:)];
+    _trace();
+    [packages_ radixSortUsingFunction:reinterpret_cast<uint32_t (*)(id, void *)>(&PackageChangesRadix) withArgument:NULL];
+    _trace();

 
 

-    Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades"] autorelease];
+    Section *upgradable = [[[Section alloc] initWithName:CYLocalize("AVAILABLE_UPGRADES")] autorelease];
+    Section *ignored = [[[Section alloc] initWithName:CYLocalize("IGNORED_UPGRADES")] autorelease];

     Section *section = nil;
     Section *section = nil;

+    NSDate *last = nil;

 
     upgrades_ = 0;
     bool unseens = false;
 
     CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
 
 
     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];
 
     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;
             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;

 
 

-            if (section == nil || ![[section name] isEqualToString:name]) {
-                section = [[[Section alloc] initWithName:name row:offset] autorelease];
-                [sections_ addObject:section];
+                NSString *name;
+                if (seen == nil)
+                    name = CYLocalize("UNKNOWN");
+                else {
+                    _profile(ChangesView$reloadData$Format)
+                        name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
+                    _end
+
+                    [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];
             [section addToCount];

+        } else if ([package ignored])
+            [ignored addToCount];
+        else {
+            ++upgrades_;
+            [upgradable addToCount];

         }
     }
         }
     }

+    _trace();

 
     CFRelease(formatter);
 
 
     CFRelease(formatter);
 


@@ -5380,6 +6388,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [sections_ removeLastObject];
     }
 
         [sections_ removeLastObject];
     }
 

+    if ([ignored count] != 0)
+        [sections_ insertObject:ignored atIndex:0];

     if (upgrades_ != 0)
         [sections_ insertObject:upgradable atIndex:0];
 
     if (upgrades_ != 0)
         [sections_ insertObject:upgradable atIndex:0];
 


@@ -5392,15 +6402,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) leftButtonTitle {
 }
 
 - (NSString *) leftButtonTitle {

-    return [(CYBook *)book_ updating] ? nil : @"Refresh";
+    return [(CYBook *)book_ updating] ? nil : CYLocalize("REFRESH");

 }
 
 }
 

-- (NSString *) rightButtonTitle {
-    return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade (%u)", upgrades_];
+- (id) rightButtonTitle {
+    return upgrades_ == 0 ? nil : [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), CYLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]];

 }
 
 - (NSString *) title {
 }
 
 - (NSString *) title {

-    return @"Changes";
+    return CYLocalize("CHANGES");

 }
 
 @end
 }
 
 @end


@@ -5414,7 +6424,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     UIView *accessory_;
     UISearchField *field_;
     UITransitionView *transition_;
     UIView *accessory_;
     UISearchField *field_;
     UITransitionView *transition_;

-    PackageTable *table_;
+    FilteredPackageTable *table_;

     UIPreferencesTable *advanced_;
     UIView *dimmed_;
     bool flipped_;
     UIPreferencesTable *advanced_;
     UIView *dimmed_;
     bool flipped_;


@@ -5446,7 +6456,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
     switch (group) {
 
 - (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);
     }
 
         default: _assert(false);
     }


@@ -5532,10 +6542,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if ((self = [super initWithBook:book]) != nil) {
         CGRect pageBounds = [book_ pageBounds];
 
     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_];
 
         transition_ = [[UITransitionView alloc] initWithFrame:pageBounds];
         [self addSubview:transition_];
 


@@ -5549,7 +6555,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         CGColor dimmed(space_, 0, 0, 0, 0.5);
         [dimmed_ setBackgroundColor:[UIColor colorWithCGColor:dimmed]];
 
         CGColor dimmed(space_, 0, 0, 0, 0.5);
         [dimmed_ setBackgroundColor:[UIColor colorWithCGColor:dimmed]];
 

-        table_ = [[PackageTable alloc]
+        table_ = [[FilteredPackageTable alloc]

             initWithBook:book
             database:database
             title:nil
             initWithBook:book
             database:database
             title:nil


@@ -5583,15 +6589,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         UIFont *font = [UIFont systemFontOfSize:16];
         [field_ setFont:font];
 
         UIFont *font = [UIFont systemFontOfSize:16];
         [field_ setFont:font];
 

-        [field_ setPlaceholder:@"Package Names & Descriptions"];
+        [field_ setPlaceholder:CYLocalize("SEARCH_EX")];

         [field_ setDelegate:self];
 
         [field_ setPaddingTop:5];
 
         [field_ setDelegate:self];
 
         [field_ setPaddingTop:5];
 

-        UITextInputTraits *traits = [field_ textInputTraits];
-        [traits setAutocapitalizationType:0];
-        [traits setAutocorrectionType:1];
-        [traits setReturnKeyType:6];
+        UITextInputTraits *traits([field_ textInputTraits]);
+        [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+        [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
+        [traits setReturnKeyType:UIReturnKeySearch];

 
         CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height}};
 
 
         CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height}};
 


@@ -5643,7 +6649,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (flipped_)
         [self flipPage];
     [table_ setObject:[field_ text]];
     if (flipped_)
         [self flipPage];
     [table_ setObject:[field_ text]];

-    [table_ reloadData];
+    _profile(SearchView$reloadData)
+        [table_ reloadData];
+    _end
+    PrintTimes();

     [table_ resetCursor];
 }
 
     [table_ resetCursor];
 }
 


@@ -5656,7 +6665,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) backButtonTitle {
 }
 
 - (NSString *) backButtonTitle {

-    return @"Search";
+    return CYLocalize("SEARCH");

 }
 
 - (void) setDelegate:(id)delegate {
 }
 
 - (void) setDelegate:(id)delegate {


@@ -5667,237 +6676,236 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 
 @end
 /* }}} */
 

-@implementation CYBook
-
-- (void) dealloc {
-    [overlay_ release];
-    [indicator_ release];
-    [prompt_ release];
-    [progress_ release];
-    [cancel_ release];
-    [super dealloc];
-}
-
-- (NSString *) getTitleForPage:(RVPage *)page {
-    return Simplify([super getTitleForPage:page]);
-}
-
-- (BOOL) updating {
-    return updating_;
+@interface SettingsView : RVPage {
+    _transient Database *database_;
+    NSString *name_;
+    Package *package_;
+    UIPreferencesTable *table_;
+    _UISwitchSlider *subscribedSwitch_;
+    _UISwitchSlider *ignoredSwitch_;
+    UIPreferencesControlTableCell *subscribedCell_;
+    UIPreferencesControlTableCell *ignoredCell_;

 }
 
 }
 

-- (void) update {
-    [UIView beginAnimations:nil context:NULL];
+- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package;

 
 

-    CGRect ovrframe = [overlay_ frame];
-    ovrframe.origin.y = 0;
-    [overlay_ setFrame:ovrframe];
-
-    CGRect barframe = [navbar_ frame];
-    barframe.origin.y += ovrframe.size.height;
-    [navbar_ setFrame:barframe];
+@end

 
 

-    CGRect trnframe = [transition_ frame];
-    trnframe.origin.y += ovrframe.size.height;
-    trnframe.size.height -= ovrframe.size.height;
-    [transition_ setFrame:trnframe];
+@implementation SettingsView

 
 

-    [UIView endAnimations];
+- (void) dealloc {
+    [table_ setDataSource:nil];

 
 

-    [indicator_ startAnimation];
-    [prompt_ setText:@"Updating Database"];
-    [progress_ setProgress:0];
+    [name_ release];
+    if (package_ != nil)
+        [package_ release];
+    [table_ release];
+    [subscribedSwitch_ release];
+    [ignoredSwitch_ release];
+    [subscribedCell_ release];
+    [ignoredCell_ release];
+    [super dealloc];
+}

 
 

-    received_ = 0;
-    last_ = [NSDate timeIntervalSinceReferenceDate];
-    updating_ = true;
-    [overlay_ addSubview:cancel_];
+- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
+    if (package_ == nil)
+        return 0;

 
 

-    [NSThread
-        detachNewThreadSelector:@selector(_update)
-        toTarget:self
-        withObject:nil
-    ];
+    return 2;

 }
 
 }
 

-- (void) _update_ {
-    updating_ = false;
+- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
+    if (package_ == nil)
+        return nil;

 
 

-    [indicator_ stopAnimation];
+    switch (group) {
+        case 0: return nil;
+        case 1: return nil;

 
 

-    [UIView beginAnimations:nil context:NULL];
+        default: _assert(false);
+    }

 
 

-    CGRect ovrframe = [overlay_ frame];
-    ovrframe.origin.y = -ovrframe.size.height;
-    [overlay_ setFrame:ovrframe];
+    return nil;
+}

 
 

-    CGRect barframe = [navbar_ frame];
-    barframe.origin.y -= ovrframe.size.height;
-    [navbar_ setFrame:barframe];
+- (BOOL) preferencesTable:(UIPreferencesTable *)table isLabelGroup:(int)group {
+    if (package_ == nil)
+        return NO;

 
 

-    CGRect trnframe = [transition_ frame];
-    trnframe.origin.y -= ovrframe.size.height;
-    trnframe.size.height += ovrframe.size.height;
-    [transition_ setFrame:trnframe];
+    switch (group) {
+        case 0: return NO;
+        case 1: return YES;

 
 

-    [UIView commitAnimations];
+        default: _assert(false);
+    }

 
 

-    [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0];
+    return NO;

 }
 
 }
 

-- (id) initWithFrame:(CGRect)frame database:(Database *)database {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        database_ = database;
+- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
+    if (package_ == nil)
+        return 0;

 
 

-        CGRect ovrrect = [navbar_ bounds];
-        ovrrect.size.height = [UINavigationBar defaultSize].height;
-        ovrrect.origin.y = -ovrrect.size.height;
+    switch (group) {
+        case 0: return 1;
+        case 1: return 1;

 
 

-        overlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect];
-        [self addSubview:overlay_];
+        default: _assert(false);
+    }

 
 

-        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_];
+    return 0;
+}

 
 

-        [overlay_ setBarStyle:1];
-        [underlay_ setBarStyle:1];
+- (void) onSomething:(UIPreferencesControlTableCell *)cell withKey:(NSString *)key {
+    if (package_ == nil)
+        return;

 
 

-        int barstyle = [overlay_ _barStyle:NO];
-        bool ugly = barstyle == 0;
+    _UISwitchSlider *slider([cell control]);
+    BOOL value([slider value] != 0);
+    NSMutableDictionary *metadata([package_ metadata]);

 
 

-        UIProgressIndicatorStyle style = ugly ?
-            UIProgressIndicatorStyleMediumBrown :
-            UIProgressIndicatorStyleMediumWhite;
+    BOOL before;
+    if (NSNumber *number = [metadata objectForKey:key])
+        before = [number boolValue];
+    else
+        before = NO;

 
 

-        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
-        unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
-        CGRect indrect = {{indoffset, indoffset}, indsize};
+    if (value != before) {
+        [metadata setObject:[NSNumber numberWithBool:value] forKey:key];
+        Changed_ = true;
+        [delegate_ updateData];
+    }
+}

 
 

-        indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
-        [indicator_ setStyle:style];
-        [overlay_ addSubview:indicator_];
+- (void) onSubscribed:(UIPreferencesControlTableCell *)cell {
+    [self onSomething:cell withKey:@"IsSubscribed"];
+}

 
 

-        CGSize prmsize = {215, indsize.height + 4};
+- (void) onIgnored:(UIPreferencesControlTableCell *)cell {
+    [self onSomething:cell withKey:@"IsIgnored"];
+}

 
 

-        CGRect prmrect = {{
-            indoffset * 2 + indsize.width,
-#ifdef __OBJC2__
-            -1 +
-#endif
-            unsigned(ovrrect.size.height - prmsize.height) / 2
-        }, prmsize};
+- (id) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
+    if (package_ == nil)
+        return nil;

 
 

-        UIFont *font = [UIFont systemFontOfSize:15];
+    switch (group) {
+        case 0: switch (row) {
+            case 0:
+                return subscribedCell_;
+            case 1:
+                return ignoredCell_;
+            default: _assert(false);
+        } break;
+
+        case 1: switch (row) {
+            case 0: {
+                UIPreferencesControlTableCell *cell([[[UIPreferencesControlTableCell alloc] init] autorelease]);
+                [cell setShowSelection:NO];
+                [cell setTitle:CYLocalize("SHOW_ALL_CHANGES_EX")];
+                return cell;
+            }

 
 

-        prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
+            default: _assert(false);
+        } break;

 
 

-        [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
-        [prompt_ setBackgroundColor:[UIColor clearColor]];
-        [prompt_ setFont:font];
+        default: _assert(false);
+    }

 
 

-        [overlay_ addSubview:prompt_];
+    return nil;
+}

 
 

-        CGSize prgsize = {75, 100};
+- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package {
+    if ((self = [super initWithBook:book])) {
+        database_ = database;
+        name_ = [package retain];

 
 

-        CGRect prgrect = {{
-            ovrrect.size.width - prgsize.width - 10,
-            (ovrrect.size.height - prgsize.height) / 2
-        } , prgsize};
+        table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]];
+        [self addSubview:table_];

 
 

-        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
-        [progress_ setStyle:0];
-        [overlay_ addSubview:progress_];
+        subscribedSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)];
+        [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:kUIControlEventMouseUpInside];

 
 

-        cancel_ = [[UINavigationButton alloc] initWithTitle:@"Cancel" style:UINavigationButtonStyleHighlighted];
-        [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside];
+        ignoredSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)];
+        [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:kUIControlEventMouseUpInside];

 
 

-        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];
+        subscribedCell_ = [[UIPreferencesControlTableCell alloc] init];
+        [subscribedCell_ setShowSelection:NO];
+        [subscribedCell_ setTitle:CYLocalize("SHOW_ALL_CHANGES")];
+        [subscribedCell_ setControl:subscribedSwitch_];

 
 

-        [cancel_ setBarStyle:barstyle];
+        ignoredCell_ = [[UIPreferencesControlTableCell alloc] init];
+        [ignoredCell_ setShowSelection:NO];
+        [ignoredCell_ setTitle:CYLocalize("IGNORE_UPGRADES")];
+        [ignoredCell_ setControl:ignoredSwitch_];
+
+        [table_ setDataSource:self];
+        [self reloadData];

     } return self;
 }
 
     } return self;
 }
 

-- (void) _onCancel {
-    updating_ = false;
-    [cancel_ removeFromSuperview];
+- (void) resetViewAnimated:(BOOL)animated {
+    [table_ resetViewAnimated:animated];

 }
 
 }
 

-- (void) _update { _pooled
-    Status status;
-    status.setDelegate(self);
-
-    [database_ updateWithStatus:status];
+- (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];
+    }

 
 

-    [self
-        performSelectorOnMainThread:@selector(_update_)
-        withObject:nil
-        waitUntilDone:NO
-    ];
+    [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

 
 

-- (void) setProgressPercent:(float)percent {
-    [self
-        performSelectorOnMainThread:@selector(_setProgressPercent:)
-        withObject:[NSNumber numberWithFloat:percent]
-        waitUntilDone:YES
-    ];
+/* Signature View {{{ */
+@interface SignatureView : BrowserView {
+    _transient Database *database_;
+    NSString *package_;

 }
 
 }
 

-- (void) startProgress {
-}
+- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package;

 
 

-- (void) addProgressOutput:(NSString *)output {
-    [self
-        performSelectorOnMainThread:@selector(_addProgressOutput:)
-        withObject:output
-        waitUntilDone:YES
-    ];
-}
+@end

 
 

-- (bool) isCancelling:(size_t)received {
-    NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
-    if (received_ != received) {
-        received_ = received;
-        last_ = now;
-    } else if (now - last_ > 15)
-        return true;
-    return !updating_;
+@implementation SignatureView
+
+- (void) dealloc {
+    [package_ release];
+    [super dealloc];

 }
 
 }
 

-- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
-    [sheet dismiss];
+- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+    // XXX: dude!
+    [super webView:sender didClearWindowObject:window forFrame:frame];

 }
 
 }
 

-- (void) _setProgressTitle:(NSString *)title {
-    [prompt_ setText:title];
+- (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) _setProgressPercent:(NSNumber *)percent {
-    [progress_ setProgress:[percent floatValue]];
+- (void) resetViewAnimated:(BOOL)animated {

 }
 
 }
 

-- (void) _addProgressOutput:(NSString *)output {
+- (void) reloadData {
+    [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"signature" ofType:@"html"]]];

 }
 
 @end
 }
 
 @end

+/* }}} */

 
 @interface Cydia : UIApplication <
     ConfirmationViewDelegate,
 
 @interface Cydia : UIApplication <
     ConfirmationViewDelegate,


@@ -5925,10 +6933,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     UIKeyboard *keyboard_;
     UIProgressHUD *hud_;
 
     UIKeyboard *keyboard_;
     UIProgressHUD *hud_;
 

-    InstallView *install_;
+    SectionsView *sections_;

     ChangesView *changes_;
     ManageView *manage_;
     SearchView *search_;
     ChangesView *changes_;
     ManageView *manage_;
     SearchView *search_;

+
+    PackageView *package_;

 }
 
 @end
 }
 
 @end


@@ -5940,45 +6950,50 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         int count = [broken_ count];
 
         UIActionSheet *sheet = [[[UIActionSheet alloc]
         int count = [broken_ count];
 
         UIActionSheet *sheet = [[[UIActionSheet alloc]

-            initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
+            initWithTitle:(count == 1 ? CYLocalize("HALFINSTALLED_PACKAGE") : [NSString stringWithFormat:CYLocalize("HALFINSTALLED_PACKAGES"), count])

             buttons:[NSArray arrayWithObjects:
             buttons:[NSArray arrayWithObjects:

-                @"Forcibly Clear",
-                @"Ignore (Temporary)",
+                CYLocalize("FORCIBLY_CLEAR"),
+                CYLocalize("TEMPORARY_IGNORE"),

             nil]
             defaultButtonIndex:0
             delegate:self
             context:@"fixhalf"
         ] autorelease];
 
             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];
 
         UIActionSheet *sheet = [[[UIActionSheet alloc]
         [sheet popupAlertAnimated:YES];
     } else if (!Ignored_ && [essential_ count] != 0) {
         int count = [essential_ count];
 
         UIActionSheet *sheet = [[[UIActionSheet alloc]

-            initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
+            initWithTitle:(count == 1 ? CYLocalize("ESSENTIAL_UPGRADE") : [NSString stringWithFormat:CYLocalize("ESSENTIAL_UPGRADES"), count])

             buttons:[NSArray arrayWithObjects:
             buttons:[NSArray arrayWithObjects:

-                @"Upgrade Essential",
-                @"Upgrade Everything",
-                @"Ignore (Temporary)",
+                CYLocalize("UPGRADE_ESSENTIAL"),
+                CYLocalize("COMPLETE_UPGRADE"),
+                CYLocalize("TEMPORARY_IGNORE"),

             nil]
             defaultButtonIndex:0
             delegate:self
             context:@"upgrade"
         ] autorelease];
 
             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 {
         [sheet popupAlertAnimated:YES];
     }
 }
 
 - (void) _reloadData {

-    /*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
-    [hud setText:@"Reloading Data"];
-    [overlay_ addSubview:hud];
-    [hud show:YES];*/
+    UIView *block();
+
+    static bool loaded(false);
+    UIProgressHUD *hud([self addProgressHUD]);
+    [hud setText:(loaded ? CYLocalize("RELOADING_DATA") : CYLocalize("LOADING_DATA"))];
+    loaded = true;

 
 

-    [database_ reloadData];
+    [database_ yieldToSelector:@selector(reloadData) withObject:nil];
+    _trace();
+
+    [self removeProgressHUD:hud];

 
     size_t changes(0);
 
 
     size_t changes(0);
 


@@ -6000,36 +7015,58 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         NSString *badge([[NSNumber numberWithInt:changes] stringValue]);
         [buttonbar_ setBadgeValue:badge forButton:3];
         if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
         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];
     } 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];
 
     [self updateData];
 

-#if !ForSaurik
+    // XXX: what is this line of code for?

     if ([packages count] == 0);
     if ([packages count] == 0);

-    else if (Loaded_)
-#endif
+    else if (Loaded_ || ManualRefresh) loaded:

         [self _loaded];
         [self _loaded];

-#if !ForSaurik

     else {
         Loaded_ = YES;
     else {
         Loaded_ = YES;

+
+        if (NSDate *update = [Metadata_ objectForKey:@"LastUpdate"]) {
+            NSTimeInterval interval([update timeIntervalSinceNow]);
+            if (interval <= 0 && interval > -600)
+                goto loaded;
+        }
+

         [book_ update];
     }
         [book_ update];
     }

-#endif
-
-    /*[hud show:NO];
-    [hud removeFromSuperview];*/

 }
 
 - (void) _saveConfig {
     if (Changed_) {
 }
 
 - (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;
     }
 }
         Changed_ = false;
     }
 }


@@ -6038,11 +7075,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self _saveConfig];
 
     /* XXX: this is just stupid */
     [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];
         [changes_ reloadData];

-    if (tag_ != 5)
+    if (tag_ != 5 && search_ != nil)

         [search_ reloadData];
 
     [book_ reloadData];
         [search_ reloadData];
 
     [book_ reloadData];


@@ -6058,8 +7095,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     NSArray *keys = [Sources_ allKeys];
 
 
     NSArray *keys = [Sources_ allKeys];
 

-    for (int i(0), e([keys count]); i != e; ++i) {
-        NSString *key = [keys objectAtIndex:i];
+    for (NSString *key in keys) {

         NSDictionary *source = [Sources_ objectForKey:key];
 
         fprintf(file, "%s %s %s\n",
         NSDictionary *source = [Sources_ objectForKey:key];
 
         fprintf(file, "%s %s %s\n",


@@ -6077,7 +7113,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         detachNewThreadSelector:@selector(update_)
         toTarget:self
         withObject:nil
         detachNewThreadSelector:@selector(update_)
         toTarget:self
         withObject:nil

-        title:@"Updating Sources"
+        title:CYLocalize("UPDATING_SOURCES")

     ];
 }
 
     ];
 }
 


@@ -6096,17 +7132,39 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         _error->Discard();
 }
 
         _error->Discard();
 }
 

+- (void) popUpBook:(RVBook *)book {
+    [underlay_ popSubview:book];
+}
+
+- (CGRect) popUpBounds {
+    return [underlay_ bounds];
+}
+

 - (void) perform {
     [database_ prepare];
 
 - (void) perform {
     [database_ prepare];
 

-    confirm_ = [[RVBook alloc] initWithFrame:[underlay_ bounds]];
+    confirm_ = [[RVBook alloc] initWithFrame:[self popUpBounds]];

     [confirm_ setDelegate:self];
 
     ConfirmationView *page([[[ConfirmationView alloc] initWithBook:confirm_ database:database_] autorelease]);
     [page setDelegate:self];
 
     [confirm_ setPage:page];
     [confirm_ setDelegate:self];
 
     ConfirmationView *page([[[ConfirmationView alloc] initWithBook:confirm_ database:database_] autorelease]);
     [page setDelegate:self];
 
     [confirm_ setPage:page];

-    [underlay_ popSubview:confirm_];
+    [self popUpBook:confirm_];
+}
+
+- (void) queue {
+    @synchronized (self) {
+        [self perform];
+    }
+}
+
+- (void) clearPackage:(Package *)package {
+    @synchronized (self) {
+        [package clear];
+        [self resolve];
+        [self perform];
+    }

 }
 
 - (void) installPackage:(Package *)package {
 }
 
 - (void) installPackage:(Package *)package {


@@ -6133,8 +7191,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) cancel {
 }
 
 - (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) {
         [self _reloadData];
     @synchronized (self) {
         [self _reloadData];

+

         if (confirm_ != nil) {
             [confirm_ release];
             confirm_ = nil;
         if (confirm_ != nil) {
             [confirm_ release];
             confirm_ = nil;


@@ -6150,7 +7219,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         detachNewThreadSelector:@selector(perform)
         toTarget:database_
         withObject:nil
         detachNewThreadSelector:@selector(perform)
         toTarget:database_
         withObject:nil

-        title:@"Running"
+        title:CYLocalize("RUNNING")

     ];
 }
 
     ];
 }
 


@@ -6161,6 +7230,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [database_ perform];
 }
 
     [database_ perform];
 }
 

+/* XXX: replace and localize */

 - (void) bootstrap {
     [progress_
         detachNewThreadSelector:@selector(bootstrap_)
 - (void) bootstrap {
     [progress_
         detachNewThreadSelector:@selector(bootstrap_)


@@ -6176,7 +7246,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [confirm_ popFromSuperviewAnimated:NO];
     }
 
         [confirm_ popFromSuperviewAnimated:NO];
     }
 

-    [self cancel];
+    [self complete];

 }
 
 - (void) setPage:(RVPage *)page {
 }
 
 - (void) setPage:(RVPage *)page {


@@ -6186,7 +7256,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class {
 }
 
 - (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class {

-    BrowserView *browser = [[[_class alloc] initWithBook:book_ database:database_] autorelease];
+    BrowserView *browser = [[[_class alloc] initWithBook:book_] autorelease];

     [browser loadURL:url];
     return browser;
 }
     [browser loadURL:url];
     return browser;
 }


@@ -6195,18 +7265,24 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self setPage:[self _pageForURL:[NSURL URLWithString:@"http://cydia.saurik.com/"] withClass:[HomeView class]]];
 }
 
     [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)
 - (void) buttonBarItemTapped:(id)sender {
     unsigned tag = [sender tag];
     if (tag == tag_) {
         [book_ resetViewAnimated:YES];
         return;
     } else if (tag_ == 2 && tag != 2)

-        [install_ resetView];
+        [[self sectionsView] resetView];

 
     switch (tag) {
         case 1: [self _setHomePage]; break;
 
 
     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;
         case 3: [self setPage:changes_]; break;
         case 4: [self setPage:manage_]; break;
         case 5: [self setPage:search_]; break;


@@ -6223,28 +7299,49 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) askForSettings {
 }
 
 - (void) askForSettings {

+    NSString *parenthetical(CYLocalize("PARENTHETICAL"));
+

     UIActionSheet *role = [[[UIActionSheet alloc]
     UIActionSheet *role = [[[UIActionSheet alloc]

-        initWithTitle:@"Who Are You?"
+        initWithTitle:CYLocalize("WHO_ARE_YOU")

         buttons:[NSArray arrayWithObjects:
         buttons:[NSArray arrayWithObjects:

-            @"User (Graphical Only)",
-            @"Hacker (+ Command Line)",
-            @"Developer (No Filters)",
+            [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];
 
         nil]
         defaultButtonIndex:-1
         delegate:self
         context:@"role"
     ] autorelease];
 

-    [role setBodyText:@"Not all of the packages available via Cydia are designed to be used by all users. Please categorize yourself so that Cydia can apply helpful filters.\n\nThis choice can be changed from \"Settings\" under the \"Manage\" tab."];
+    [role setBodyText:CYLocalize("ROLE_EX")];

     [role popupAlertAnimated:YES];
 }
 
     [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;
+    }
+
+    return view;
+}
+

 - (void) finish {
     if (hud_ != nil) {
         [self setStatusBarShowsProgress:NO];
 - (void) finish {
     if (hud_ != nil) {
         [self setStatusBarShowsProgress:NO];

+        [self removeProgressHUD:hud_];

 
 

-        [hud_ show:NO];
-        [hud_ removeFromSuperview];

         [hud_ autorelease];
         hud_ = nil;
 
         [hud_ autorelease];
         hud_ = nil;
 


@@ -6262,6 +7359,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         return;
     }
 
         return;
     }
 

+    _trace();

     overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];
 
     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];
 
     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];


@@ -6280,7 +7378,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             @"home-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:1], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"home-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:1], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,

-            @"Home", kUIButtonBarButtonTitle,
+            CYLocalize("HOME"), kUIButtonBarButtonTitle,

             @"0", kUIButtonBarButtonType,
         nil],
 
             @"0", kUIButtonBarButtonType,
         nil],
 


@@ -6290,7 +7388,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             @"install-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:2], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"install-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:2], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,

-            @"Sections", kUIButtonBarButtonTitle,
+            CYLocalize("SECTIONS"), kUIButtonBarButtonTitle,

             @"0", kUIButtonBarButtonType,
         nil],
 
             @"0", kUIButtonBarButtonType,
         nil],
 


@@ -6300,7 +7398,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             @"changes-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:3], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"changes-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:3], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,

-            @"Changes", kUIButtonBarButtonTitle,
+            CYLocalize("CHANGES"), kUIButtonBarButtonTitle,

             @"0", kUIButtonBarButtonType,
         nil],
 
             @"0", kUIButtonBarButtonType,
         nil],
 


@@ -6310,7 +7408,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             @"manage-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:4], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"manage-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:4], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,

-            @"Manage", kUIButtonBarButtonTitle,
+            CYLocalize("MANAGE"), kUIButtonBarButtonTitle,

             @"0", kUIButtonBarButtonType,
         nil],
 
             @"0", kUIButtonBarButtonType,
         nil],
 


@@ -6320,7 +7418,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             @"search-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:5], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"search-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:5], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,

-            @"Search", kUIButtonBarButtonTitle,
+            CYLocalize("SEARCH"), kUIButtonBarButtonTitle,

             @"0", kUIButtonBarButtonType,
         nil],
     nil];
             @"0", kUIButtonBarButtonType,
         nil],
     nil];


@@ -6354,10 +7452,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     CGSize keysize = [UIKeyboard defaultSize];
     CGRect keyrect = {{0, [overlay_ bounds].size.height}, keysize};
     keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect];
     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_];
 
     [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_];
     search_ = [[SearchView alloc] initWithBook:book_ database:database_];
 
     changes_ = [[ChangesView alloc] initWithBook:book_ database:database_];
     search_ = [[SearchView alloc] initWithBook:book_ database:database_];
 


@@ -6366,10 +7469,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         withClass:[ManageView class]
     ] retain];
 
         withClass:[ManageView class]
     ] retain];
 

-    if (!bootstrap_)
-        [underlay_ addSubview:overlay_];
+    [self setPackageView:[self packageView]];

 
 

-    [self reloadData];
+    PrintTimes();

 
     if (bootstrap_)
         [self bootstrap];
 
     if (bootstrap_)
         [self bootstrap];


@@ -6378,13 +7480,47 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
 }
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {

-    NSString *context = [sheet context];
-    if ([context isEqualToString:@"fixhalf"])
+    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) {
         switch (button) {
             case 1:
                 @synchronized (self) {

-                    for (int i = 0, e = [broken_ count]; i != e; ++i) {
-                        Package *broken = [broken_ objectAtIndex:i];
+                    for (Package *broken in broken_) {

                         [broken remove];
 
                         NSString *id = [broken id];
                         [broken remove];
 
                         NSString *id = [broken id];


@@ -6407,7 +7543,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             default:
                 _assert(false);
         }
             default:
                 _assert(false);
         }

-    else if ([context isEqualToString:@"role"]) {
+
+        [sheet dismiss];
+    } else if ([context isEqualToString:@"role"]) {

         switch (button) {
             case 1: Role_ = @"User"; break;
             case 2: Role_ = @"Hacker"; break;
         switch (button) {
             case 1: Role_ = @"User"; break;
             case 2: Role_ = @"Hacker"; break;


@@ -6432,14 +7570,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             [self updateData];
         else
             [self finish];
             [self updateData];
         else
             [self finish];

-    } else if ([context isEqualToString:@"upgrade"])
+
+        [sheet dismiss];
+    } else if ([context isEqualToString:@"upgrade"]) {

         switch (button) {
             case 1:
                 @synchronized (self) {
         switch (button) {
             case 1:
                 @synchronized (self) {

-                    for (int i = 0, e = [essential_ count]; i != e; ++i) {
-                        Package *essential = [essential_ objectAtIndex:i];
+                    for (Package *essential in essential_)

                         [essential install];
                         [essential install];

-                    }

 
                     [self resolve];
                     [self perform];
 
                     [self resolve];
                     [self perform];


@@ -6458,7 +7596,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
                 _assert(false);
         }
 
                 _assert(false);
         }
 

-    [sheet dismiss];
+        [sheet dismiss];
+    }

 }
 
 - (void) reorganize { _pooled
 }
 
 - (void) reorganize { _pooled


@@ -6482,33 +7621,48 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (UIProgressHUD *) addProgressHUD {
 }
 
 - (UIProgressHUD *) addProgressHUD {

-    UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
+    UIProgressHUD *hud([[[UIProgressHUD alloc] initWithWindow:window_] autorelease]);
+    [window_ setUserInteractionEnabled:NO];

     [hud show:YES];
     [hud show:YES];

-    [underlay_ addSubview:hud];
+    [progress_ addSubview:hud];

     return hud;
 }
 
     return hud;
 }
 

+- (void) removeProgressHUD:(UIProgressHUD *)hud {
+    [hud show:NO];
+    [hud removeFromSuperview];
+    [window_ setUserInteractionEnabled:YES];
+}
+

 - (void) openMailToURL:(NSURL *)url {
 - (void) openMailToURL:(NSURL *)url {

+// XXX: this makes me sad
+#if 0

     [[[MailToView alloc] initWithView:underlay_ delegate:self url:url] autorelease];
     [[[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]) {
 }
 
 - (RVPage *) pageForPackage:(NSString *)name {
     if (Package *package = [database_ packageWithName:name]) {

-        PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+        PackageView *view([self packageView]);

         [view setPackage:package];
         return view;
     } else {
         UIActionSheet *sheet = [[[UIActionSheet alloc]
         [view setPackage:package];
         return view;
     } else {
         UIActionSheet *sheet = [[[UIActionSheet alloc]

-            initWithTitle:@"Cannot Locate Package"
-            buttons:[NSArray arrayWithObjects:@"Close", nil]
+            initWithTitle:CYLocalize("CANNOT_LOCATE_PACKAGE")
+            buttons:[NSArray arrayWithObjects:CYLocalize("CLOSE"), nil]

             defaultButtonIndex:0
             delegate:self
             context:@"missing"
         ] autorelease];
 
             defaultButtonIndex:0
             delegate:self
             context:@"missing"
         ] autorelease];
 

-        [sheet setBodyText:[NSString stringWithFormat:
-            @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
-        , name]];
+        [sheet setBodyText:[NSString stringWithFormat:CYLocalize("PACKAGE_CANNOT_BE_FOUND"), name]];

 
         [sheet popupAlertAnimated:YES];
         return nil;
 
         [sheet popupAlertAnimated:YES];
         return nil;


@@ -6516,25 +7670,39 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag {
 }
 
 - (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag {

-    NSString *href = [url absoluteString];
-

     if (tag != NULL)
         tag = 0;
 
     if (tag != NULL)
         tag = 0;
 

-    if ([href isEqualToString:@"cydia://add-source"])
+    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];
         return [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease];

-    else if ([href isEqualToString:@"cydia://sources"])
+    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];
         return [[[SourceTable alloc] initWithBook:book_ database:database_] autorelease];

-    else if ([href isEqualToString:@"cydia://packages"])
+    else if ([path isEqualToString:@"/packages"])

         return [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease];
         return [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease];

-    else if ([href hasPrefix:@"cydia://url/"])
-        return [self _pageForURL:[NSURL URLWithString:[href substringFromIndex:12]] withClass:[BrowserView class]];
-    else if ([href hasPrefix:@"cydia://launch/"])
-        [self launchApplicationWithIdentifier:[href substringFromIndex:15] suspended:NO];
-    else if ([href hasPrefix:@"cydia://package/"])
-        return [self pageForPackage:[href substringFromIndex:16]];
-    else if ([href hasPrefix:@"cydia://files/"]) {
-        NSString *name = [href substringFromIndex:14];
+    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];
 
         if (Package *package = [database_ packageWithName:name]) {
             FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];


@@ -6557,6 +7725,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) applicationDidFinishLaunching:(id)unused {
 }
 
 - (void) applicationDidFinishLaunching:(id)unused {

+    _trace();

     Font12_ = [[UIFont systemFontOfSize:12] retain];
     Font12Bold_ = [[UIFont boldSystemFontOfSize:12] retain];
     Font14_ = [[UIFont systemFontOfSize:14] retain];
     Font12_ = [[UIFont systemFontOfSize:12] retain];
     Font12Bold_ = [[UIFont boldSystemFontOfSize:12] retain];
     Font14_ = [[UIFont systemFontOfSize:14] retain];


@@ -6571,6 +7740,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     essential_ = [[NSMutableArray alloc] initWithCapacity:4];
     broken_ = [[NSMutableArray alloc] initWithCapacity:4];
 
     essential_ = [[NSMutableArray alloc] initWithCapacity:4];
     broken_ = [[NSMutableArray alloc] initWithCapacity:4];
 

+    [NSURLProtocol registerClass:[CydiaURLProtocol class]];
+

     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     window_ = [[UIWindow alloc] initWithContentRect:screenrect];
 
     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     window_ = [[UIWindow alloc] initWithContentRect:screenrect];
 


@@ -6578,7 +7749,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [window_ makeKey:self];
     [window_ setHidden:NO];
 
     [window_ makeKey:self];
     [window_ setHidden:NO];
 

-    database_ = [[Database alloc] init];
+    database_ = [Database sharedInstance];

     progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
     [database_ setDelegate:progress_];
     [window_ setContentView:progress_];
     progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
     [database_ setDelegate:progress_];
     [window_ setContentView:progress_];


@@ -6599,8 +7770,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ) {
         [self setIdleTimerDisabled:YES];
 
     ) {
         [self setIdleTimerDisabled:YES];
 

-        hud_ = [self addProgressHUD];
-        [hud_ setText:@"Reorganizing\n\nWill Automatically\nRestart When Done"];
+        hud_ = [[self addProgressHUD] retain];
+        [hud_ setText:@"Reorganizing\n\nWill Automatically\nClose When Done"];

 
         [self setStatusBarShowsProgress:YES];
 
 
         [self setStatusBarShowsProgress:YES];
 


@@ -6613,23 +7784,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [self finish];
 }
 
         [self finish];
 }
 

-/* Web Scripting {{{ */
-+ (NSString *) webScriptNameForSelector:(SEL)selector {
-    if (selector == @selector(supports:))
-        return @"supports";
-    return nil;
-}
-
-+ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector {
-    NSLog(@"exc:%s", sel_getName(selector));
-    return selector != @selector(supports:);
-}
-
-- (BOOL) supports:(NSString *)feature {
-    return [feature isEqualToString:@"window.open"];
-}
-/* }}} */
-

 - (void) showKeyboard:(BOOL)show {
     CGSize keysize = [UIKeyboard defaultSize];
     CGRect keydown = {{0, [overlay_ bounds].size.height}, keysize};
 - (void) showKeyboard:(BOOL)show {
     CGSize keysize = [UIKeyboard defaultSize];
     CGRect keydown = {{0, [overlay_ bounds].size.height}, keysize};


@@ -6672,8 +7826,7 @@ void AddPreferences(NSString *plist) { _pooled
 
     bool cydia(false);
 
 
     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;
         NSString *label = [item objectForKey:@"label"];
         if (label != nil && [label isEqualToString:@"Cydia"]) {
             cydia = true;


@@ -6716,12 +7869,55 @@ id Dealloc_(id self, SEL selector) {
     return object;
 }*/
 
     return object;
 }*/
 

+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
 int main(int argc, char *argv[]) { _pooled

-    bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0;
+    _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;
+            }
+
+        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();
 
     App_ = [[NSBundle mainBundle] bundlePath];
     Home_ = NSHomeDirectory();

-    Locale_ = CFLocaleCopyCurrent();

 
     {
         NSString *plist = [Home_ stringByAppendingString:@"/Library/Preferences/com.apple.preferences.sounds.plist"];
 
     {
         NSString *plist = [Home_ stringByAppendingString:@"/Library/Preferences/com.apple.preferences.sounds.plist"];


@@ -6733,10 +7929,19 @@ int main(int argc, char *argv[]) { _pooled
     setuid(0);
     setgid(0);
 
     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);
     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<void (*)(UIWebDocumentView *, SEL, id)>(method_getImplementation(UIWebDocumentView$_setUIKitDelegate$));
+        method_setImplementation(UIWebDocumentView$_setUIKitDelegate$, reinterpret_cast<IMP>(&$UIWebDocumentView$_setUIKitDelegate$));
+    }

 
     /*Method alloc = class_getClassMethod([NSObject class], @selector(alloc));
     alloc_ = alloc->method_imp;
 
     /*Method alloc = class_getClassMethod([NSObject class], @selector(alloc));
     alloc_ = alloc->method_imp;


@@ -6767,11 +7972,24 @@ int main(int argc, char *argv[]) { _pooled
 
     UniqueID_ = [[UIDevice currentDevice] uniqueIdentifier];
 
 
     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");*/
 
     /*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];
+    _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"];
 
     else {
         Settings_ = [Metadata_ objectForKey:@"Settings"];
 


@@ -6802,11 +8020,16 @@ int main(int argc, char *argv[]) { _pooled
     Documents_ = [[[NSMutableArray alloc] initWithCapacity:4] autorelease];
 #endif
 
     Documents_ = [[[NSMutableArray alloc] initWithCapacity:4] autorelease];
 #endif
 

-    if (access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0)
-        dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);
+    if (substrate && access("/Applications/WinterBoard.app/WinterBoard.dylib", F_OK) == 0)
+        dlopen("/Applications/WinterBoard.app/WinterBoard.dylib", RTLD_LAZY | RTLD_GLOBAL);
+    /*if (substrate && access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0)
+        dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);*/

 
 

-    if (access("/User", F_OK) != 0)
+    if (access("/User", F_OK) != 0) {
+        _trace();

         system("/usr/libexec/cydia/firmware.sh");
         system("/usr/libexec/cydia/firmware.sh");

+        _trace();
+    }

 
     _assert([[NSFileManager defaultManager]
         createDirectoryAtPath:@"/var/cache/apt/archives/partial"
 
     _assert([[NSFileManager defaultManager]
         createDirectoryAtPath:@"/var/cache/apt/archives/partial"


@@ -6823,14 +8046,29 @@ int main(int argc, char *argv[]) { _pooled
     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);
     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];
 
 
     Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil];
 

-    SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease];
+    void (*$GSFontSetUseLegacyFontMetrics)(BOOL)(reinterpret_cast<void (*)(BOOL)>(dlsym(RTLD_DEFAULT, "GSFontSetUseLegacyFontMetrics")));
+    if ($GSFontSetUseLegacyFontMetrics != NULL)
+        $GSFontSetUseLegacyFontMetrics(YES);

 
 

-    UIApplicationUseLegacyEvents(YES);

     UIKeyboardDisableAutomaticAppearance();
 
     UIKeyboardDisableAutomaticAppearance();
 

+    _trace();

     int value = UIApplicationMain(argc, argv, @"Cydia", @"Cydia");
 
     CGColorSpaceRelease(space_);
     int value = UIApplicationMain(argc, argv, @"Cydia", @"Cydia");
 
     CGColorSpaceRelease(space_);