]> git.saurik.com Git - cydia.git/blobdiff - Cydia.mm
Added a cool finish.sh script.
[cydia.git] / Cydia.mm
index 04c0dbe956d34a5651dc7ceea7452db8fac39f82..1ad22345b4081b5d266630065c0edd20ec8beac0 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
+/* Cydia - iPhone UIKit Front-End for Debian APT
+ * Copyright (C) 2008  Jay Freeman (saurik)
+*/
+
+/*
+ *        Redistribution and use in source and binary
+ * forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer in the documentation
+ *    and/or other materials provided with the
+ *    distribution.
+ * 3. The name of the author may not be used to endorse
+ *    or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
 /* #include Directives {{{ */
-#include <Foundation/NSURL.h>
-#include <UIKit/UIKit.h>
-#import <GraphicsServices/GraphicsServices.h>
+#include <objc/objc.h>
+#include <objc/runtime.h>
+
+#include <CoreGraphics/CoreGraphics.h>
+#include <GraphicsServices/GraphicsServices.h>
+#include <Foundation/Foundation.h>
+
+#include <WebCore/DOMHTML.h>
+#import <QuartzCore/CALayer.h>
+
+#import <UIKit/UIKit.h>
+
+// XXX: remove
+#import <UIKit/UIActionSheet-Private.h>
+#import <UIKit/UIControl-UIControlPrivate.h>
+#import <UIKit/UIImage-UIImageDeprecated.h>
+#import <UIKit/UIImage-UIImagePrivate.h>
+#import <UIKit/UINavigationBar-Static.h>
+#import <UIKit/UIProgressHUD-Deprecated.h>
+#import <UIKit/UIToolbar-UIButtonBarPrivate.h>
+#import <UIKit/UIView-Deprecated.h>
+#import <UIKit/UIWindow-Static.h>
+
+// XXX: remove
+#import <UIKit/NSString-UIStringDrawingDeprecated.h>
+
+#include <WebKit/WebFrame.h>
+#include <WebKit/WebView.h>
 
 #include <sstream>
+#include <string>
+
 #include <ext/stdio_filebuf.h>
 
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/cachefile.h>
+#include <apt-pkg/clean.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/debmetaindex.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
+#include <apt-pkg/mmap.h>
 #include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/sha1.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/sptr.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/sysctl.h>
 
+#include <notify.h>
+#include <dlfcn.h>
+
 extern "C" {
 #include <mach-o/nlist.h>
 }
 
-#include <objc/objc-class.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <errno.h>
 #include <pcre.h>
-#include <string.h>
-/* }}} */
-/* Extension Keywords {{{ */
-#define _trace() fprintf(stderr, "_trace()@%s:%u[%s]\n", __FILE__, __LINE__, __FUNCTION__)
-
-#define _assert(test) do \
-    if (!(test)) { \
-        fprintf(stderr, "_assert(%d:%s)@%s:%u[%s]\n", errno, #test, __FILE__, __LINE__, __FUNCTION__); \
-        exit(-1); \
-    } \
-while (false)
+
+#import "BrowserView.h"
+#import "ResetView.h"
+#import "UICaboodle.h"
 /* }}} */
-/* Miscellaneous Messages {{{ */
-@interface WebView
-- (void) setApplicationNameForUserAgent:(NSString *)applicationName;
-- (id) frameLoadDelegate;
-- (void) setFrameLoadDelegate:(id)delegate;
+
+static const NSStringCompareOptions CompareOptions_ = NSCaseInsensitiveSearch | NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSForcedOrderingSearch;
+
+@interface WebView (Cydia)
+- (void) _setLayoutInterval:(float)interval;
 @end
 
-@interface NSString (Cydia)
-- (NSString *) stringByAddingPercentEscapes;
-- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;
+/* iPhoneOS 2.0 Compatibility {{{ */
+#ifdef __OBJC2__
+@interface UICGColor : NSObject {
+}
+
+- (id) initWithCGColor:(CGColorRef)color;
 @end
-/* }}} */
 
-/* Reset View (UIView) {{{ */
-@interface UIView (CYResetView)
-- (void) resetViewAnimated:(BOOL)animated;
+@interface NSObject (iPhoneOS)
+- (CGColorRef) cgColor;
+- (CGColorRef) CGColor;
+- (void) set;
 @end
 
-@implementation UIView (CYResetView)
+@implementation NSObject (iPhoneOS)
 
-- (void) resetViewAnimated:(BOOL)animated {
-    fprintf(stderr, "%s\n", self->isa->name);
-    _assert(false);
+- (CGColorRef) cgColor {
+    return [self CGColor];
+}
+
+- (CGColorRef) CGColor {
+    return (CGColorRef) self;
+}
+
+- (void) set {
+    [[[[objc_getClass("UICGColor") alloc] initWithCGColor:[self CGColor]] autorelease] set];
 }
 
 @end
-/* }}} */
-/* Reset View (UITable) {{{ */
-@interface UITable (CYResetView)
-- (void) resetViewAnimated:(BOOL)animated;
+
+@interface UITextView (iPhoneOS)
+- (void) setTextSize:(float)size;
 @end
 
-@implementation UITable (CYResetView)
+@implementation UITextView (iPhoneOS)
 
-- (void) resetViewAnimated:(BOOL)animated {
-    [self selectRow:-1 byExtendingSelection:NO withFade:animated];
+- (void) setTextSize:(float)size {
+    [self setFont:[[self font] fontWithSize:size]];
 }
 
 @end
+#endif
 /* }}} */
-/* Reset View (UISectionList) {{{ */
-@interface UISectionList (CYResetView)
-- (void) resetViewAnimated:(BOOL)animated;
+
+@interface UIApplication (IdleTimer)
+- (void) setIdleTimerDisabled:(char)arg0;
 @end
 
-@implementation UISectionList (CYResetView)
+extern "C" int UIApplicationMain(int argc, char *argv[], NSString *principalClassName, NSString *delegateClassName);
 
-- (void) resetViewAnimated:(BOOL)animated {
-    [[self table] resetViewAnimated:animated];
+extern NSString *kUIButtonBarButtonAction;
+extern NSString *kUIButtonBarButtonInfo;
+extern NSString *kUIButtonBarButtonInfoOffset;
+extern NSString *kUIButtonBarButtonSelectedInfo;
+extern NSString *kUIButtonBarButtonStyle;
+extern NSString *kUIButtonBarButtonTag;
+extern NSString *kUIButtonBarButtonTarget;
+extern NSString *kUIButtonBarButtonTitle;
+extern NSString *kUIButtonBarButtonTitleVerticalHeight;
+extern NSString *kUIButtonBarButtonTitleWidth;
+extern NSString *kUIButtonBarButtonType;
+
+typedef enum {
+    kUIProgressIndicatorStyleLargeWhite = 0,
+    kUIProgressIndicatorStyleMediumWhite = 1,
+    kUIProgressIndicatorStyleMediumBrown = 2,
+    kUIProgressIndicatorStyleSmallWhite = 3,
+    kUIProgressIndicatorStyleSmallBlack = 4,
+    kUIProgressIndicatorStyleTinyWhite = 5,
+} UIProgressIndicatorStyle;
+
+typedef enum {
+    kUIControlEventMouseDown = 1 << 0,
+    kUIControlEventMouseMovedInside = 1 << 2, // mouse moved inside control target
+    kUIControlEventMouseMovedOutside = 1 << 3, // mouse moved outside control target
+    kUIControlEventMouseUpInside = 1 << 6, // mouse up inside control target
+    kUIControlEventMouseUpOutside = 1 << 7, // mouse up outside control target
+    kUIControlAllEvents = (kUIControlEventMouseDown | kUIControlEventMouseMovedInside | kUIControlEventMouseMovedOutside | kUIControlEventMouseUpInside | kUIControlEventMouseUpOutside)
+} UIControlEventMasks;
+
+@interface NSString (UIKit)
+- (NSString *) stringByAddingPercentEscapes;
+- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;
+@end
+
+@interface NSString (Cydia)
++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length;
+- (NSComparisonResult) compareByPath:(NSString *)other;
+@end
+
+@implementation NSString (Cydia)
+
++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length {
+    char data[length + 1];
+    memcpy(data, bytes, length);
+    data[length] = '\0';
+    return [NSString stringWithUTF8String:data];
+}
+
+- (NSComparisonResult) compareByPath:(NSString *)other {
+    NSString *prefix = [self commonPrefixWithString:other options:0];
+    size_t length = [prefix length];
+
+    NSRange lrange = NSMakeRange(length, [self length] - length);
+    NSRange rrange = NSMakeRange(length, [other length] - length);
+
+    lrange = [self rangeOfString:@"/" options:0 range:lrange];
+    rrange = [other rangeOfString:@"/" options:0 range:rrange];
+
+    NSComparisonResult value;
+
+    if (lrange.location == NSNotFound && rrange.location == NSNotFound)
+        value = NSOrderedSame;
+    else if (lrange.location == NSNotFound)
+        value = NSOrderedAscending;
+    else if (rrange.location == NSNotFound)
+        value = NSOrderedDescending;
+    else
+        value = NSOrderedSame;
+
+    NSString *lpath = lrange.location == NSNotFound ? [self substringFromIndex:length] :
+        [self substringWithRange:NSMakeRange(length, lrange.location - length)];
+    NSString *rpath = rrange.location == NSNotFound ? [other substringFromIndex:length] :
+        [other substringWithRange:NSMakeRange(length, rrange.location - length)];
+
+    NSComparisonResult result = [lpath compare:rpath];
+    return result == NSOrderedSame ? value : result;
 }
 
 @end
-/* }}} */
 
 /* Perl-Compatible RegEx {{{ */
 class Pcre {
@@ -126,10 +277,12 @@ class Pcre {
     }
 
     NSString *operator [](size_t match) {
-        return [NSString
-            stringWithCString:(data_ + matches_[match * 2])
-            length:(matches_[match * 2 + 1] - matches_[match * 2])
-        ];
+        return [NSString stringWithUTF8Bytes:(data_ + matches_[match * 2]) length:(matches_[match * 2 + 1] - matches_[match * 2])];
+    }
+
+    bool operator ()(NSString *data) {
+        // XXX: length is for characters, not for bytes
+        return operator ()([data UTF8String], [data length]);
     }
 
     bool operator ()(const char *data, size_t size) {
@@ -138,46 +291,172 @@ class Pcre {
     }
 };
 /* }}} */
-/* CoreGraphicsServices Primitives {{{ */
+/* Mime Addresses {{{ */
+@interface Address : NSObject {
+    NSString *name_;
+    NSString *address_;
+}
+
+- (NSString *) name;
+- (NSString *) address;
+
++ (Address *) addressWithString:(NSString *)string;
+- (Address *) initWithString:(NSString *)string;
+@end
+
+@implementation Address
+
+- (void) dealloc {
+    [name_ release];
+    if (address_ != nil)
+        [address_ release];
+    [super dealloc];
+}
+
+- (NSString *) name {
+    return name_;
+}
+
+- (NSString *) address {
+    return address_;
+}
+
++ (Address *) addressWithString:(NSString *)string {
+    return [[[Address alloc] initWithString:string] autorelease];
+}
+
++ (NSArray *) _attributeKeys {
+    return [NSArray arrayWithObjects:@"address", @"name", nil];
+}
+
+- (NSArray *) attributeKeys {
+    return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+    return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
+- (Address *) initWithString:(NSString *)string {
+    if ((self = [super init]) != nil) {
+        const char *data = [string UTF8String];
+        size_t size = [string length];
+
+        static Pcre address_r("^\"?(.*)\"? <([^>]*)>$");
+
+        if (address_r(data, size)) {
+            name_ = [address_r[1] retain];
+            address_ = [address_r[2] retain];
+        } else {
+            name_ = [[NSString alloc]
+                initWithBytes:data
+                length:size
+                encoding:kCFStringEncodingUTF8
+            ];
+
+            address_ = nil;
+        }
+    } return self;
+}
+
+@end
+/* }}} */
+/* CoreGraphics Primitives {{{ */
 class CGColor {
   private:
     CGColorRef color_;
 
   public:
-    CGColor(CGColorSpaceRef space, float red, float green, float blue, float alpha) {
-        float color[] = {red, green, blue, alpha};
-        color_ = CGColorCreate(space, color);
+    CGColor() :
+        color_(NULL)
+    {
     }
 
-    ~CGColor() {
-        CGColorRelease(color_);
+    CGColor(CGColorSpaceRef space, float red, float green, float blue, float alpha) :
+        color_(NULL)
+    {
+        Set(space, red, green, blue, alpha);
     }
 
-    operator CGColorRef() {
-        return color_;
+    void Clear() {
+        if (color_ != NULL)
+            CGColorRelease(color_);
     }
-};
 
-class GSFont {
-  private:
-    GSFontRef font_;
+    ~CGColor() {
+        Clear();
+    }
 
-  public:
-    ~GSFont() {
-        /* XXX: no GSFontRelease()? */
-        CFRelease(font_);
+    void Set(CGColorSpaceRef space, float red, float green, float blue, float alpha) {
+        Clear();
+        float color[] = {red, green, blue, alpha};
+        color_ = CGColorCreate(space, color);
+    }
+
+    operator CGColorRef() {
+        return color_;
     }
 };
 /* }}} */
 
-static const int PulseInterval_ = 50000;
-const char *Machine_ = NULL;
-const char *SerialNumber_ = NULL;
-
-bool bootstrap_ = false;
+extern "C" void UISetColor(CGColorRef color);
 
+/* Random Global Variables {{{ */
+static const int PulseInterval_ = 50000;
+static const int ButtonBarHeight_ = 48;
+static const float KeyboardTime_ = 0.3f;
+static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist";
+
+static CGColor Blue_;
+static CGColor Blueish_;
+static CGColor Black_;
+static CGColor Off_;
+static CGColor Red_;
+static CGColor White_;
+static CGColor Gray_;
+
+static NSString *App_;
+static NSString *Home_;
+static BOOL Sounds_Keyboard_;
+
+static BOOL Advanced_;
+static BOOL Loaded_;
+static BOOL Ignored_;
+
+static UIFont *Font12_;
+static UIFont *Font12Bold_;
+static UIFont *Font14_;
+static UIFont *Font18Bold_;
+static UIFont *Font22Bold_;
+
+static const char *Firmware_ = NULL;
+static const char *Machine_ = NULL;
+static const NSString *UniqueID_ = NULL;
+
+unsigned Major_;
+unsigned Minor_;
+unsigned BugFix_;
+
+CFLocaleRef Locale_;
+CGColorSpaceRef space_;
+
+#define FW_LEAST(major, minor, bugfix) \
+    (major < Major_ || major == Major_ && \
+        (minor < Minor_ || minor == Minor_ && \
+            bugfix <= BugFix_))
+
+bool bootstrap_;
+bool reload_;
+
+static NSDictionary *SectionMap_;
 static NSMutableDictionary *Metadata_;
-static NSMutableDictionary *Packages_;
+static _transient NSMutableDictionary *Settings_;
+static _transient NSString *Role_;
+static _transient NSMutableDictionary *Packages_;
+static _transient NSMutableDictionary *Sections_;
+static _transient NSMutableDictionary *Sources_;
+static _transient NSMutableArray *Documents_;
+static bool Changed_;
 static NSDate *now_;
 
 NSString *GetLastUpdate() {
@@ -186,22 +465,18 @@ NSString *GetLastUpdate() {
     if (update == nil)
         return @"Never or Unknown";
 
-    CFLocaleRef locale = CFLocaleCopyCurrent();
-    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
     CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);
 
     CFRelease(formatter);
-    CFRelease(locale);
 
     return [(NSString *) formatted autorelease];
 }
-
-@protocol ProgressDelegate
-- (void) setError:(NSString *)error;
-- (void) setTitle:(NSString *)title;
-- (void) setPercent:(float)percent;
-- (void) addOutput:(NSString *)output;
-@end
+/* }}} */
+/* Display Helpers {{{ */
+inline float Interpolate(float begin, float end, float fraction) {
+    return (end - begin) * fraction + begin;
+}
 
 NSString *SizeString(double size) {
     unsigned power = 0;
@@ -215,22 +490,26 @@ NSString *SizeString(double size) {
     return [NSString stringWithFormat:@"%.1f%s", size, powers_[power]];
 }
 
+NSString *StripVersion(NSString *version) {
+    NSRange colon = [version rangeOfString:@":"];
+    if (colon.location != NSNotFound)
+        version = [version substringFromIndex:(colon.location + 1)];
+    return version;
+}
+
 static const float TextViewOffset_ = 22;
 
 UITextView *GetTextView(NSString *value, float left, bool html) {
     UITextView *text([[[UITextView alloc] initWithFrame:CGRectMake(left, 3, 310 - left, 1000)] autorelease]);
     [text setEditable:NO];
     [text setTextSize:16];
-    if (html)
+    /*if (html)
         [text setHTML:value];
-    else
+    else*/
         [text setText:value];
     [text setEnabled:NO];
 
-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-    CGColor clear(space, 0, 0, 0, 0);
-    [text setBackgroundColor:clear];
-    CGColorSpaceRelease(space);
+    [text setBackgroundColor:[UIColor clearColor]];
 
     CGRect frame = [text frame];
     [text setFrame:frame];
@@ -241,12 +520,82 @@ UITextView *GetTextView(NSString *value, float left, bool html) {
     return text;
 }
 
+NSString *Simplify(NSString *title) {
+    const char *data = [title UTF8String];
+    size_t size = [title length];
+
+    static Pcre square_r("^\\[(.*)\\]$");
+    if (square_r(data, size))
+        return Simplify(square_r[1]);
+
+    static Pcre paren_r("^\\((.*)\\)$");
+    if (paren_r(data, size))
+        return Simplify(paren_r[1]);
+
+    static Pcre title_r("^(.*?) \\(.*\\)$");
+    if (title_r(data, size))
+        return Simplify(title_r[1]);
+
+    return title;
+}
+/* }}} */
+
+bool isSectionVisible(NSString *section) {
+    NSDictionary *metadata = [Sections_ objectForKey:section];
+    NSNumber *hidden = metadata == nil ? nil : [metadata objectForKey:@"Hidden"];
+    return hidden == nil || ![hidden boolValue];
+}
+
+/* Delegate Prototypes {{{ */
+@class Package;
+@class Source;
+
+@interface NSObject (ProgressDelegate)
+@end
+
+@implementation NSObject(ProgressDelegate)
+
+- (void) _setProgressError:(NSArray *)args {
+    [self performSelector:@selector(setProgressError:forPackage:)
+        withObject:[args objectAtIndex:0]
+        withObject:([args count] == 1 ? nil : [args objectAtIndex:1])
+    ];
+}
+
+@end
+
+@protocol ProgressDelegate
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id;
+- (void) setProgressTitle:(NSString *)title;
+- (void) setProgressPercent:(float)percent;
+- (void) startProgress;
+- (void) addProgressOutput:(NSString *)output;
+- (bool) isCancelling:(size_t)received;
+@end
+
+@protocol ConfigurationDelegate
+- (void) repairWithSelector:(SEL)selector;
+- (void) setConfigurationData:(NSString *)data;
+@end
+
+@protocol CydiaDelegate
+- (void) installPackage:(Package *)package;
+- (void) removePackage:(Package *)package;
+- (void) slideUp:(UIActionSheet *)alert;
+- (void) distUpgrade;
+- (void) updateData;
+- (void) syncData;
+- (void) askForSettings;
+- (UIProgressHUD *) addProgressHUD;
+@end
+/* }}} */
+
 /* Status Delegation {{{ */
 class Status :
     public pkgAcquireStatus
 {
   private:
-    id delegate_;
+    _transient NSObject<ProgressDelegate> *delegate_;
 
   public:
     Status() :
@@ -266,7 +615,7 @@ class Status :
     }
 
     virtual void Fetch(pkgAcquire::ItemDesc &item) {
-        [delegate_ setTitle:[NSString stringWithCString:("Downloading " + item.ShortDesc).c_str()]];
+        [delegate_ setProgressTitle:[NSString stringWithUTF8String:("Downloading " + item.ShortDesc).c_str()]];
     }
 
     virtual void Done(pkgAcquire::ItemDesc &item) {
@@ -279,7 +628,10 @@ class Status :
         )
             return;
 
-        [delegate_ setError:[NSString stringWithCString:item.Owner->ErrorText.c_str()]];
+        [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+            withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()], nil]
+            waitUntilDone:YES
+        ];
     }
 
     virtual bool Pulse(pkgAcquire *Owner) {
@@ -290,11 +642,12 @@ class Status :
             double(TotalBytes + TotalItems)
         );
 
-        [delegate_ setPercent:percent];
-        return value;
+        [delegate_ setProgressPercent:percent];
+        return [delegate_ isCancelling:CurrentBytes] ? false : value;
     }
 
     virtual void Start() {
+        [delegate_ startProgress];
     }
 
     virtual void Stop() {
@@ -306,12 +659,12 @@ class Progress :
     public OpProgress
 {
   private:
-    id delegate_;
+    _transient id<ProgressDelegate> delegate_;
 
   protected:
     virtual void Update() {
-        [delegate_ setTitle:[NSString stringWithCString:Op.c_str()]];
-        [delegate_ setPercent:(Percent / 100)];
+        [delegate_ setProgressTitle:[NSString stringWithUTF8String:Op.c_str()]];
+        [delegate_ setProgressPercent:(Percent / 100)];
     }
 
   public:
@@ -325,960 +678,2656 @@ class Progress :
     }
 
     virtual void Done() {
-        [delegate_ setPercent:1];
+        [delegate_ setProgressPercent:1];
     }
 };
 /* }}} */
 
-/* External Constants {{{ */
-extern NSString *kUIButtonBarButtonAction;
-extern NSString *kUIButtonBarButtonInfo;
-extern NSString *kUIButtonBarButtonInfoOffset;
-extern NSString *kUIButtonBarButtonSelectedInfo;
-extern NSString *kUIButtonBarButtonStyle;
-extern NSString *kUIButtonBarButtonTag;
-extern NSString *kUIButtonBarButtonTarget;
-extern NSString *kUIButtonBarButtonTitle;
-extern NSString *kUIButtonBarButtonTitleVerticalHeight;
-extern NSString *kUIButtonBarButtonTitleWidth;
-extern NSString *kUIButtonBarButtonType;
+/* Database Interface {{{ */
+@interface Database : NSObject {
+    pkgCacheFile cache_;
+    pkgDepCache::Policy *policy_;
+    pkgRecords *records_;
+    pkgProblemResolver *resolver_;
+    pkgAcquire *fetcher_;
+    FileFd *lock_;
+    SPtr<pkgPackageManager> manager_;
+    pkgSourceList *list_;
+
+    NSMutableDictionary *sources_;
+    NSMutableArray *packages_;
+
+    _transient NSObject<ConfigurationDelegate, ProgressDelegate> *delegate_;
+    Status status_;
+    Progress progress_;
+
+    int cydiafd_;
+    int statusfd_;
+    FILE *input_;
+}
+
+- (void) _readCydia:(NSNumber *)fd;
+- (void) _readStatus:(NSNumber *)fd;
+- (void) _readOutput:(NSNumber *)fd;
+
+- (FILE *) input;
+
+- (Package *) packageWithName:(NSString *)name;
+
+- (Database *) init;
+- (pkgCacheFile &) cache;
+- (pkgDepCache::Policy *) policy;
+- (pkgRecords *) records;
+- (pkgProblemResolver *) resolver;
+- (pkgAcquire &) fetcher;
+- (NSArray *) packages;
+- (NSArray *) sources;
+- (void) reloadData;
+
+- (void) configure;
+- (void) prepare;
+- (void) perform;
+- (void) upgrade;
+- (void) update;
+
+- (void) updateWithStatus:(Status &)status;
+
+- (void) setDelegate:(id)delegate;
+- (Source *) getSource:(const pkgCache::PkgFileIterator &)file;
+@end
 /* }}} */
-/* Mime Addresses {{{ */
-Pcre email_r("^\"?(.*)\"? <([^>]*)>$");
 
-@interface Address : NSObject {
-    NSString *name_;
-    NSString *email_;
+/* Source Class {{{ */
+@interface Source : NSObject {
+    NSString *description_;
+    NSString *label_;
+    NSString *origin_;
+
+    NSString *uri_;
+    NSString *distribution_;
+    NSString *type_;
+    NSString *version_;
+
+    NSString *defaultIcon_;
+
+    NSDictionary *record_;
+    BOOL trusted_;
 }
 
-- (void) dealloc;
+- (Source *) initWithMetaIndex:(metaIndex *)index;
+
+- (NSComparisonResult) compareByNameAndType:(Source *)source;
+
+- (NSDictionary *) record;
+- (BOOL) trusted;
+
+- (NSString *) uri;
+- (NSString *) distribution;
+- (NSString *) type;
+- (NSString *) key;
+- (NSString *) host;
 
 - (NSString *) name;
-- (NSString *) email;
+- (NSString *) description;
+- (NSString *) label;
+- (NSString *) origin;
+- (NSString *) version;
+
+- (NSString *) defaultIcon;
 
-+ (Address *) addressWithString:(NSString *)string;
-- (Address *) initWithString:(NSString *)string;
 @end
 
-@implementation Address
+@implementation Source
 
 - (void) dealloc {
-    [name_ release];
-    if (email_ != nil)
-        [email_ release];
+    [uri_ release];
+    [distribution_ release];
+    [type_ release];
+
+    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];
+
     [super dealloc];
 }
 
-- (NSString *) name {
-    return name_;
++ (NSArray *) _attributeKeys {
+    return [NSArray arrayWithObjects:@"description", @"distribution", @"host", @"key", @"label", @"name", @"origin", @"trusted", @"type", @"uri", @"version", nil];
 }
 
-- (NSString *) email {
-    return email_;
+- (NSArray *) attributeKeys {
+    return [[self class] _attributeKeys];
 }
 
-+ (Address *) addressWithString:(NSString *)string {
-    return [[[Address alloc] initWithString:string] autorelease];
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+    return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
 }
 
-- (Address *) initWithString:(NSString *)string {
+- (Source *) initWithMetaIndex:(metaIndex *)index {
     if ((self = [super init]) != nil) {
-        const char *data = [string UTF8String];
-        size_t size = [string length];
-
-        if (email_r(data, size)) {
-            name_ = [email_r[1] retain];
-            email_ = [email_r[2] retain];
-        } else {
-            name_ = [[NSString stringWithCString:data length:size] retain];
-            email_ = 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;
+
+                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];
+            }
         }
+
+        record_ = [Sources_ objectForKey:[self key]];
+        if (record_ != nil)
+            record_ = [record_ retain];
     } return self;
 }
 
-@end
-/* }}} */
+- (NSComparisonResult) compareByNameAndType:(Source *)source {
+    NSDictionary *lhr = [self record];
+    NSDictionary *rhr = [source record];
 
-/* Right Alignment {{{ */
-@interface UIRightTextLabel : UITextLabel {
-    float       _savedRightEdgeX;
-    BOOL        _sizedtofit_flag;
-}
+    if (lhr != rhr)
+        return lhr == nil ? NSOrderedDescending : NSOrderedAscending;
 
-- (void) setFrame:(CGRect)frame;
-- (void) setText:(NSString *)text;
-- (void) realignText;
-@end
+    NSString *lhs = [self name];
+    NSString *rhs = [source name];
 
-@implementation UIRightTextLabel
+    if ([lhs length] != 0 && [rhs length] != 0) {
+        unichar lhc = [lhs characterAtIndex:0];
+        unichar rhc = [rhs characterAtIndex:0];
 
-- (void) setFrame:(CGRect)frame {
-    [super setFrame:frame];
-    if (_sizedtofit_flag == NO) {
-        _savedRightEdgeX = frame.origin.x;
-        [self realignText];
+        if (isalpha(lhc) && !isalpha(rhc))
+            return NSOrderedAscending;
+        else if (!isalpha(lhc) && isalpha(rhc))
+            return NSOrderedDescending;
     }
-}
 
-- (void) setText:(NSString *)text {
-    [super setText:text];
-    [self realignText];
+    return [lhs compare:rhs options:CompareOptions_];
 }
 
-- (void) realignText {
-    CGRect oldFrame = [self frame];
+- (NSDictionary *) record {
+    return record_;
+}
 
-    _sizedtofit_flag = YES;
-    [self sizeToFit]; // shrink down size so I can right align it
+- (BOOL) trusted {
+    return trusted_;
+}
 
-    CGRect newFrame = [self frame];
+- (NSString *) uri {
+    return uri_;
+}
 
-    oldFrame.origin.x = _savedRightEdgeX - newFrame.size.width;
-    oldFrame.size.width = newFrame.size.width;
-    [super setFrame:oldFrame];
-    _sizedtofit_flag = NO;
+- (NSString *) distribution {
+    return distribution_;
 }
 
-@end
-/* }}} */
-/* Linear Algebra {{{ */
-inline float interpolate(float begin, float end, float fraction) {
-    return (end - begin) * fraction + begin;
+- (NSString *) type {
+    return type_;
 }
-/* }}} */
 
-@class Package;
+- (NSString *) key {
+    return [NSString stringWithFormat:@"%@:%@:%@", type_, uri_, distribution_];
+}
 
-/* Database Interface {{{ */
-@interface Database : NSObject {
-    pkgCacheFile cache_;
-    pkgRecords *records_;
-    pkgProblemResolver *resolver_;
-    pkgAcquire *fetcher_;
-    FileFd *lock_;
-    SPtr<pkgPackageManager> manager_;
+- (NSString *) host {
+    return [[[NSURL URLWithString:[self uri]] host] lowercaseString];
+}
 
-    id delegate_;
-    Status status_;
-    Progress progress_;
-    int statusfd_;
+- (NSString *) name {
+    return origin_ == nil ? [self host] : origin_;
 }
 
-- (void) dealloc;
+- (NSString *) description {
+    return description_;
+}
 
-- (void) _readStatus:(NSNumber *)fd;
-- (void) _readOutput:(NSNumber *)fd;
+- (NSString *) label {
+    return label_ == nil ? [self host] : label_;
+}
 
-- (Package *) packageWithName:(NSString *)name;
+- (NSString *) origin {
+    return origin_;
+}
 
-- (Database *) init;
-- (pkgCacheFile &) cache;
-- (pkgRecords *) records;
-- (pkgProblemResolver *) resolver;
-- (pkgAcquire &) fetcher;
-- (void) reloadData;
+- (NSString *) version {
+    return version_;
+}
 
-- (void) prepare;
-- (void) perform;
-- (void) update;
-- (void) upgrade;
+- (NSString *) defaultIcon {
+    return defaultIcon_;
+}
 
-- (void) setDelegate:(id)delegate;
 @end
 /* }}} */
-
-/* Reset View {{{ */
-@interface ResetView : UIView {
-    UIPushButton *configure_;
-    UIPushButton *reload_;
-    NSMutableArray *views_;
-    UINavigationBar *navbar_;
-    UITransitionView *transition_;
-    bool resetting_;
-    id delegate_;
+/* Relationship Class {{{ */
+@interface Relationship : NSObject {
+    NSString *type_;
+    NSString *id_;
 }
 
-- (void) dealloc;
-
-- (void) navigationBar:(UINavigationBar *)navbar poppedItem:(UINavigationItem *)item;
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
-
-- (id) initWithFrame:(CGRect)frame;
-- (void) setDelegate:(id)delegate;
-
-- (void) configurePushed;
-- (void) reloadPushed;
+- (NSString *) type;
+- (NSString *) id;
+- (NSString *) name;
 
-- (void) pushView:(UIView *)view withTitle:(NSString *)title backButtonTitle:(NSString *)back rightButton:(NSString *)right;
-- (void) popViews:(unsigned)views;
-- (void) resetView:(BOOL)clear;
-- (void) _resetView;
-- (void) setPrompt;
 @end
 
-@implementation ResetView
+@implementation Relationship
 
 - (void) dealloc {
-    [configure_ release];
-    [reload_ release];
-    [transition_ release];
-    [navbar_ release];
-    [views_ release];
+    [type_ release];
+    [id_ release];
     [super dealloc];
 }
 
-- (void) navigationBar:(UINavigationBar *)navbar poppedItem:(UINavigationItem *)item {
-    [views_ removeLastObject];
-    UIView *view([views_ lastObject]);
-    [view resetViewAnimated:!resetting_];
+- (NSString *) type {
+    return type_;
+}
 
-    if (!resetting_) {
-        [transition_ transition:2 toView:view];
-        [self _resetView];
-    }
+- (NSString *) id {
+    return id_;
 }
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [sheet dismiss];
+- (NSString *) name {
+    _assert(false);
+    return nil;
 }
 
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        views_ = [[NSMutableArray arrayWithCapacity:4] retain];
+@end
+/* }}} */
+/* Package Class {{{ */
+NSString *Scour(const char *field, const char *begin, const char *end) {
+    size_t i(0), l(strlen(field));
 
-        struct CGRect bounds = [self bounds];
-        CGSize navsize = [UINavigationBar defaultSizeWithPrompt];
-        CGRect navrect = {{0, 0}, navsize};
+    for (;;) {
+        const char *name = begin + i;
+        const char *colon = name + l;
+        const char *value = colon + 1;
 
-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [self addSubview:navbar_];
+        if (
+            value < end &&
+            *colon == ':' &&
+            memcmp(name, field, l) == 0
+        ) {
+            while (value != end && value[0] == ' ')
+                ++value;
+            const char *line = std::find(value, end, '\n');
+            while (line != value && line[-1] == ' ')
+                --line;
 
-        [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
+            return [NSString stringWithUTF8Bytes:value length:(line - value)];
+        } else {
+            begin = std::find(begin, end, '\n');
+            if (begin == end)
+                return nil;
+            ++begin;
+        }
+    }
+}
 
-        transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
-            bounds.origin.x, bounds.origin.y + navsize.height, bounds.size.width, bounds.size.height - navsize.height
-        )];
+@interface Package : NSObject {
+    pkgCache::PkgIterator iterator_;
+    _transient Database *database_;
+    pkgCache::VerIterator version_;
+    pkgCache::VerFileIterator file_;
 
-        //configure_ = [[UIPushButton alloc] initWithFrame:CGRectMake(15, 9, 17, 18)];
-        configure_ = [[UIPushButton alloc] initWithFrame:CGRectMake(10, 9, 17, 18)];
-        [configure_ setShowPressFeedback:YES];
-        [configure_ setImage:[UIImage applicationImageNamed:@"configure.png"]];
-        [configure_ addTarget:self action:@selector(configurePushed) forEvents:1];
+    Source *source_;
+    bool cached_;
 
-        //reload_ = [[UIPushButton alloc] initWithFrame:CGRectMake(288, 5, 18, 22)];
-        reload_ = [[UIPushButton alloc] initWithFrame:CGRectMake(293, 5, 18, 22)];
-        [reload_ setShowPressFeedback:YES];
-        [reload_ setImage:[UIImage applicationImageNamed:@"reload.png"]];
-        [reload_ addTarget:self action:@selector(reloadPushed) forEvents:1];
+    NSString *latest_;
+    NSString *installed_;
 
-        [navbar_ addSubview:configure_];
-        [navbar_ addSubview:reload_];
+    NSString *id_;
+    NSString *name_;
+    NSString *tagline_;
+    NSString *icon_;
+    NSString *depiction_;
+    NSString *homepage_;
+    Address *sponsor_;
+    Address *author_;
+    NSArray *tags_;
+    NSString *role_;
 
-        [self addSubview:transition_];
-    } return self;
+    NSArray *relationships_;
 }
 
-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
-}
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
 
-- (void) configurePushed {
-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-        initWithTitle:@"Sources Unimplemented"
-        buttons:[NSArray arrayWithObjects:@"Okay", nil]
-        defaultButtonIndex:0
-        delegate:self
-        context:self
-    ] autorelease];
+- (pkgCache::PkgIterator) iterator;
 
-    [sheet setBodyText:@"This feature will be implemented soon. In the mean time, you may add sources by adding .list files to '/etc/apt/sources.list.d' or modifying '/etc/apt/sources.list'."];
-    [sheet popupAlertAnimated:YES];
-}
+- (NSString *) section;
+- (Address *) maintainer;
+- (size_t) size;
+- (NSString *) description;
+- (NSString *) index;
 
-- (void) reloadPushed {
-    [delegate_ update];
-}
+- (NSDate *) seen;
 
-- (void) pushView:(UIView *)view withTitle:(NSString *)title backButtonTitle:(NSString *)back rightButton:(NSString *)right {
-    UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:title] autorelease];
-    [navbar_ pushNavigationItem:navitem];
-    [navitem setBackButtonTitle:back];
+- (NSString *) latest;
+- (NSString *) installed;
 
-    [navbar_ showButtonsWithLeftTitle:nil rightTitle:right];
+- (BOOL) valid;
+- (BOOL) upgradableAndEssential:(BOOL)essential;
+- (BOOL) essential;
+- (BOOL) broken;
+- (BOOL) unfiltered;
+- (BOOL) visible;
 
-    [transition_ transition:([views_ count] == 0 ? 0 : 1) toView:view];
-    [views_ addObject:view];
-}
+- (BOOL) half;
+- (BOOL) halfConfigured;
+- (BOOL) halfInstalled;
+- (BOOL) hasMode;
+- (NSString *) mode;
 
-- (void) popViews:(unsigned)views {
-    resetting_ = true;
-    for (unsigned i(0); i != views; ++i)
-        [navbar_ popNavigationItem];
-    resetting_ = false;
+- (NSString *) id;
+- (NSString *) name;
+- (NSString *) tagline;
+- (NSString *) icon;
+- (NSString *) homepage;
+- (NSString *) depiction;
+- (Address *) author;
 
-    [self _resetView];
-    [transition_ transition:2 toView:[views_ lastObject]];
-}
+- (NSArray *) relationships;
 
-- (void) resetView:(BOOL)clear {
-    resetting_ = true;
+- (Source *) source;
+- (NSString *) role;
 
-    if ([views_ count] > 1) {
-        [navbar_ disableAnimation];
-        while ([views_ count] != (clear ? 1 : 2))
-            [navbar_ popNavigationItem];
-        [navbar_ enableAnimation];
-        if (!clear)
-            [navbar_ popNavigationItem];
-    }
+- (BOOL) matches:(NSString *)text;
 
-    resetting_ = false;
+- (bool) hasSupportingRole;
+- (BOOL) hasTag:(NSString *)tag;
 
-    [self _resetView];
-    [transition_ transition:(clear ? 0 : 2) toView:[views_ lastObject]];
-}
+- (NSComparisonResult) compareByName:(Package *)package;
+- (NSComparisonResult) compareBySection:(Package *)package;
+- (NSComparisonResult) compareBySectionAndName:(Package *)package;
+- (NSComparisonResult) compareForChanges:(Package *)package;
 
-- (void) _resetView {
-    [navbar_ showButtonsWithLeftTitle:nil rightTitle:nil];
-}
+- (void) install;
+- (void) remove;
 
-- (void) setPrompt {
-    [navbar_ setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
-}
+- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search;
+- (NSNumber *) isInstalledAndVisible:(NSNumber *)number;
+- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)section;
+- (NSNumber *) isVisibleInSource:(Source *)source;
 
 @end
-/* }}} */
-/* Confirmation View {{{ */
-void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString *key) {
-    if ([packages count] == 0)
-        return;
 
-    UITextView *text = GetTextView([packages count] == 0 ? @"n/a" : [packages componentsJoinedByString:@", "], 110, false);
-    [fields setObject:text forKey:key];
+@implementation Package
+
+- (void) dealloc {
+    if (source_ != nil)
+        [source_ release];
 
-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-    CGColor blue(space, 0, 0, 0.4, 1);
-    [text setTextColor:blue];
-    CGColorSpaceRelease(space);
+    [latest_ 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 (tags_ != nil)
+        [tags_ release];
+    if (role_ != nil)
+        [role_ release];
+
+    if (relationships_ != nil)
+        [relationships_ release];
+
+    [super dealloc];
 }
 
-@protocol ConfirmationViewDelegate
-- (void) cancel;
-- (void) confirm;
-@end
++ (NSArray *) _attributeKeys {
+    return [NSArray arrayWithObjects:@"author", @"depiction", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"maintainer", @"name", @"section", @"size", @"source", @"sponsor", @"tagline", nil];
+}
 
-@interface ConfirmationView : UIView {
-    Database *database_;
-    id delegate_;
-    UITransitionView *transition_;
-    UIView *overlay_;
-    UINavigationBar *navbar_;
-    UIPreferencesTable *table_;
-    NSMutableDictionary *fields_;
-    UIAlertSheet *essential_;
+- (NSArray *) attributeKeys {
+    return [[self class] _attributeKeys];
 }
 
-- (void) dealloc;
-- (void) cancel;
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+    return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
 
-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
+    if ((self = [super init]) != nil) {
+        iterator_ = iterator;
+        database_ = database;
 
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table;
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group;
-- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed;
-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group;
-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group;
+        version_ = [database_ policy]->GetCandidateVer(iterator_);
+        latest_ = version_.end() ? nil : [StripVersion([NSString stringWithUTF8String:version_.VerStr()]) retain];
 
-- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate;
+        if (!version_.end())
+            file_ = version_.FileList();
+        else {
+            pkgCache &cache([database_ cache]);
+            file_ = pkgCache::VerFileIterator(cache, cache.VerFileP);
+        }
 
-@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];
+        }
 
-@implementation ConfirmationView
-#include "internals.h"
+        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;
+                }
+            }
 
-- (void) dealloc {
-    [transition_ release];
-    [overlay_ release];
-    [navbar_ release];
-    [table_ release];
-    [fields_ release];
-    if (essential_ != nil)
-        [essential_ release];
-    [super dealloc];
+        NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
+        if (metadata == nil || [metadata count] == 0) {
+            metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                now_, @"FirstSeen",
+            nil];
+
+            [Packages_ setObject:metadata forKey:id_];
+            Changed_ = true;
+        }
+    } return self;
 }
 
-- (void) cancel {
-    [transition_ transition:7 toView:nil];
-    [delegate_ cancel];
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
+    return [[[Package alloc]
+        initWithIterator:iterator 
+        database:database
+    ] autorelease];
 }
 
-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
-    if (from != nil && to == nil)
-        [self removeFromSuperview];
+- (pkgCache::PkgIterator) iterator {
+    return iterator_;
 }
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    switch (button) {
-        case 0:
-            if (essential_ != nil)
-                [essential_ popupAlertAnimated:YES];
-            else
-                [delegate_ confirm];
-        break;
+- (NSString *) section {
+    const char *section = iterator_.Section();
+    if (section == NULL)
+        return nil;
 
-        case 1:
-            [self cancel];
-        break;
-    }
-}
+    NSString *name = [[NSString stringWithUTF8String:section] stringByReplacingCharacter:' ' withCharacter:'_'];
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [essential_ dismiss];
-    [self cancel];
-}
+  lookup:
+    if (NSDictionary *value = [SectionMap_ objectForKey:name])
+        if (NSString *rename = [value objectForKey:@"Rename"]) {
+            name = rename;
+            goto lookup;
+        }
 
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
-    return 2;
+    return [name stringByReplacingCharacter:'_' withCharacter:' '];
 }
 
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
-    switch (group) {
-        case 0: return @"Statistics";
-        case 1: return @"Modifications";
+- (Address *) maintainer {
+    if (file_.end())
+        return nil;
+    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+    return [Address addressWithString:[NSString stringWithUTF8String:parser->Maintainer().c_str()]];
+}
 
-        default: _assert(false);
-    }
+- (size_t) size {
+    return version_.end() ? 0 : version_->InstalledSize;
 }
 
-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
+- (NSString *) description {
+    if (file_.end())
+        return nil;
+    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+    NSString *description([NSString stringWithUTF8String:parser->LongDesc().c_str()]);
+
+    NSArray *lines = [description componentsSeparatedByString:@"\n"];
+    NSMutableArray *trimmed = [NSMutableArray arrayWithCapacity:([lines count] - 1)];
+    if ([lines count] < 2)
+        return nil;
+
+    NSCharacterSet *whitespace = [NSCharacterSet whitespaceCharacterSet];
+    for (size_t i(1); i != [lines count]; ++i) {
+        NSString *trim = [[lines objectAtIndex:i] stringByTrimmingCharactersInSet:whitespace];
+        [trimmed addObject:trim];
+    }
+
+    return [trimmed componentsJoinedByString:@"\n"];
+}
+
+- (NSString *) index {
+    NSString *index = [[[self name] substringToIndex:1] uppercaseString];
+    return [index length] != 0 && isalpha([index characterAtIndex:0]) ? index : @"123";
+}
+
+- (NSDate *) seen {
+    return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"];
+}
+
+- (NSString *) latest {
+    return latest_;
+}
+
+- (NSString *) installed {
+    return installed_;
+}
+
+- (BOOL) valid {
+    return !version_.end();
+}
+
+- (BOOL) upgradableAndEssential:(BOOL)essential {
+    pkgCache::VerIterator current = iterator_.CurrentVer();
+
+    if (current.end())
+        return essential && [self essential];
+    else {
+        pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_);
+        return !candidate.end() && candidate != current;
+    }
+}
+
+- (BOOL) essential {
+    return (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES;
+}
+
+- (BOOL) broken {
+    return [database_ cache][iterator_].InstBroken();
+}
+
+- (BOOL) unfiltered {
+    NSString *section = [self section];
+    return section == nil || isSectionVisible(section);
+}
+
+- (BOOL) visible {
+    return [self hasSupportingRole] && [self unfiltered];
+}
+
+- (BOOL) half {
+    unsigned char current = iterator_->CurrentState;
+    return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled;
+}
+
+- (BOOL) halfConfigured {
+    return iterator_->CurrentState == pkgCache::State::HalfConfigured;
+}
+
+- (BOOL) halfInstalled {
+    return iterator_->CurrentState == pkgCache::State::HalfInstalled;
+}
+
+- (BOOL) hasMode {
+    pkgDepCache::StateCache &state([database_ cache][iterator_]);
+    return state.Mode != pkgDepCache::ModeKeep;
+}
+
+- (NSString *) mode {
+    pkgDepCache::StateCache &state([database_ cache][iterator_]);
+
+    switch (state.Mode) {
+        case pkgDepCache::ModeDelete:
+            if ((state.iFlags & pkgDepCache::Purge) != 0)
+                return @"Purge";
+            else
+                return @"Remove";
+            _assert(false);
+        case pkgDepCache::ModeKeep:
+            if ((state.iFlags & pkgDepCache::AutoKept) != 0)
+                return nil;
+            else
+                return nil;
+            _assert(false);
+        case pkgDepCache::ModeInstall:
+            if ((state.iFlags & pkgDepCache::ReInstall) != 0)
+                return @"Reinstall";
+            else switch (state.Status) {
+                case -1:
+                    return @"Downgrade";
+                case 0:
+                    return @"Install";
+                case 1:
+                    return @"Upgrade";
+                case 2:
+                    return @"New Install";
+                default:
+                    _assert(false);
+            }
+        default:
+            _assert(false);
+    }
+}
+
+- (NSString *) id {
+    return id_;
+}
+
+- (NSString *) name {
+    return name_ == nil ? id_ : name_;
+}
+
+- (NSString *) tagline {
+    return tagline_;
+}
+
+- (NSString *) icon {
+    return icon_;
+}
+
+- (NSString *) homepage {
+    return homepage_;
+}
+
+- (NSString *) depiction {
+    return depiction_;
+}
+
+- (Address *) sponsor {
+    return sponsor_;
+}
+
+- (Address *) author {
+    return author_;
+}
+
+- (NSArray *) relationships {
+    return relationships_;
+}
+
+- (Source *) source {
+    if (!cached_) {
+        source_ = file_.end() ? nil : [[database_ getSource:file_.File()] retain];
+        cached_ = true;
+    }
+
+    return source_;
+}
+
+- (NSString *) role {
+    return role_;
+}
+
+- (BOOL) matches:(NSString *)text {
+    if (text == nil)
+        return NO;
+
+    NSRange range;
+
+    range = [[self id] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;
+
+    range = [[self name] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;
+
+    range = [[self tagline] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;
+
+    return NO;
+}
+
+- (bool) hasSupportingRole {
+    if (role_ == nil)
+        return true;
+    if ([role_ isEqualToString:@"enduser"])
+        return true;
+    if ([Role_ isEqualToString:@"User"])
+        return false;
+    if ([role_ isEqualToString:@"hacker"])
+        return true;
+    if ([Role_ isEqualToString:@"Hacker"])
+        return false;
+    if ([role_ isEqualToString:@"developer"])
+        return true;
+    if ([Role_ isEqualToString:@"Developer"])
+        return false;
+    _assert(false);
+}
+
+- (BOOL) hasTag:(NSString *)tag {
+    return tags_ == nil ? NO : [tags_ containsObject:tag];
+}
+
+- (NSComparisonResult) compareByName:(Package *)package {
+    NSString *lhs = [self name];
+    NSString *rhs = [package name];
+
+    if ([lhs length] != 0 && [rhs length] != 0) {
+        unichar lhc = [lhs characterAtIndex:0];
+        unichar rhc = [rhs characterAtIndex:0];
+
+        if (isalpha(lhc) && !isalpha(rhc))
+            return NSOrderedAscending;
+        else if (!isalpha(lhc) && isalpha(rhc))
+            return NSOrderedDescending;
+    }
+
+    return [lhs compare:rhs options:CompareOptions_];
+}
+
+- (NSComparisonResult) compareBySection:(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 options:CompareOptions_];
+        if (result != NSOrderedSame)
+            return result;
+    }
+
+    return NSOrderedSame;
+}
+
+- (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;
+    }
+
+    return [self compareByName:package];
+}
+
+- (NSComparisonResult) compareForChanges:(Package *)package {
+    BOOL lhs = [self upgradableAndEssential:YES];
+    BOOL rhs = [package upgradableAndEssential:YES];
+
+    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);
+        }
+    }
+
+    return [self compareByName:package];
+}
+
+- (void) install {
+    pkgProblemResolver *resolver = [database_ resolver];
+    resolver->Clear(iterator_);
+    resolver->Protect(iterator_);
+    pkgCacheFile &cache([database_ cache]);
+    cache->MarkInstall(iterator_, false);
+    pkgDepCache::StateCache &state((*cache)[iterator_]);
+    if (!state.Install())
+        cache->SetReInstall(iterator_, true);
+}
+
+- (void) remove {
+    pkgProblemResolver *resolver = [database_ resolver];
+    resolver->Clear(iterator_);
+    resolver->Protect(iterator_);
+    resolver->Remove(iterator_);
+    [database_ cache]->MarkDelete(iterator_, true);
+}
+
+- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search {
+    return [NSNumber numberWithBool:(
+        [self unfiltered] && [self matches:search]
+    )];
+}
+
+- (NSNumber *) isInstalledAndVisible:(NSNumber *)number {
+    return [NSNumber numberWithBool:(
+        (![number boolValue] || [self visible]) && [self installed] != nil
+    )];
+}
+
+- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)name {
+    NSString *section = [self section];
+
+    return [NSNumber numberWithBool:(
+        [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])];
+}
+
+@end
+/* }}} */
+/* Section Class {{{ */
+@interface Section : NSObject {
+    NSString *name_;
+    size_t row_;
+    size_t count_;
+}
+
+- (NSComparisonResult) compareByName:(Section *)section;
+- (Section *) initWithName:(NSString *)name;
+- (Section *) initWithName:(NSString *)name row:(size_t)row;
+- (NSString *) name;
+- (size_t) row;
+- (size_t) count;
+- (void) addToCount;
+
+@end
+
+@implementation Section
+
+- (void) dealloc {
+    [name_ release];
+    [super dealloc];
+}
+
+- (NSComparisonResult) compareByName:(Section *)section {
+    NSString *lhs = [self name];
+    NSString *rhs = [section name];
+
+    if ([lhs length] != 0 && [rhs length] != 0) {
+        unichar lhc = [lhs characterAtIndex:0];
+        unichar rhc = [rhs characterAtIndex:0];
+
+        if (isalpha(lhc) && !isalpha(rhc))
+            return NSOrderedAscending;
+        else if (!isalpha(lhc) && isalpha(rhc))
+            return NSOrderedDescending;
+    }
+
+    return [lhs compare:rhs options:CompareOptions_];
+}
+
+- (Section *) initWithName:(NSString *)name {
+    return [self initWithName:name row:0];
+}
+
+- (Section *) initWithName:(NSString *)name row:(size_t)row {
+    if ((self = [super init]) != nil) {
+        name_ = [name retain];
+        row_ = row;
+    } return self;
+}
+
+- (NSString *) name {
+    return name_;
+}
+
+- (size_t) row {
+    return row_;
+}
+
+- (size_t) count {
+    return count_;
+}
+
+- (void) addToCount {
+    ++count_;
+}
+
+@end
+/* }}} */
+
+int Finish_;
+NSArray *Finishes_;
+
+/* Database Implementation {{{ */
+@implementation Database
+
+- (void) dealloc {
+    _assert(false);
+    [super dealloc];
+}
+
+- (void) _readCydia:(NSNumber *)fd {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+    std::istream is(&ib);
+    std::string line;
+
+    static Pcre finish_r("^finish:([^:]*)$");
+
+    while (std::getline(is, line)) {
+        const char *data(line.c_str());
+        size_t size = line.size();
+        fprintf(stderr, "C:%s\n", data);
+
+        if (finish_r(data, size)) {
+            NSString *finish = finish_r[1];
+            int index = [Finishes_ indexOfObject:finish];
+            if (index != INT_MAX && index > Finish_)
+                Finish_ = index;
+        }
+    }
+
+    [pool release];
+    _assert(false);
+}
+
+- (void) _readStatus:(NSNumber *)fd {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+    std::istream is(&ib);
+    std::string line;
+
+    static Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$");
+    static Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$");
+
+    while (std::getline(is, line)) {
+        const char *data(line.c_str());
+        size_t size = line.size();
+        fprintf(stderr, "S:%s\n", data);
+
+        if (conffile_r(data, size)) {
+            [delegate_ setConfigurationData:conffile_r[1]];
+        } else if (strncmp(data, "status: ", 8) == 0) {
+            NSString *string = [NSString stringWithUTF8String:(data + 8)];
+            [delegate_ setProgressTitle:string];
+        } else if (pmstatus_r(data, size)) {
+            std::string type([pmstatus_r[1] UTF8String]);
+            NSString *id = pmstatus_r[2];
+
+            float percent([pmstatus_r[3] floatValue]);
+            [delegate_ setProgressPercent:(percent / 100)];
+
+            NSString *string = pmstatus_r[4];
+
+            if (type == "pmerror")
+                [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+                    withObject:[NSArray arrayWithObjects:string, id, nil]
+                    waitUntilDone:YES
+                ];
+            else if (type == "pmstatus")
+                [delegate_ setProgressTitle:string];
+            else if (type == "pmconffile")
+                [delegate_ setConfigurationData:string];
+            else _assert(false);
+        } else _assert(false);
+    }
+
+    [pool release];
+    _assert(false);
+}
+
+- (void) _readOutput:(NSNumber *)fd {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+    std::istream is(&ib);
+    std::string line;
+
+    while (std::getline(is, line)) {
+        fprintf(stderr, "O:%s\n", line.c_str());
+        [delegate_ addProgressOutput:[NSString stringWithUTF8String:line.c_str()]];
+    }
+
+    [pool release];
+    _assert(false);
+}
+
+- (FILE *) input {
+    return input_;
+}
+
+- (Package *) packageWithName:(NSString *)name {
+    if (static_cast<pkgDepCache *>(cache_) == NULL)
+        return nil;
+    pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String]));
+    return iterator.end() ? nil : [Package packageWithIterator:iterator database:self];
+}
+
+- (Database *) init {
+    if ((self = [super init]) != nil) {
+        policy_ = NULL;
+        records_ = NULL;
+        resolver_ = NULL;
+        fetcher_ = NULL;
+        lock_ = NULL;
+
+        sources_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
+        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+
+        int fds[2];
+
+        _assert(pipe(fds) != -1);
+        cydiafd_ = fds[1];
+
+        _config->Set("APT::Keep-Fds::", cydiafd_);
+        setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 1"] UTF8String], _not(int));
+
+        [NSThread
+            detachNewThreadSelector:@selector(_readCydia:)
+            toTarget:self
+            withObject:[[NSNumber numberWithInt:fds[0]] retain]
+        ];
+
+        _assert(pipe(fds) != -1);
+        statusfd_ = fds[1];
+
+        [NSThread
+            detachNewThreadSelector:@selector(_readStatus:)
+            toTarget:self
+            withObject:[[NSNumber numberWithInt:fds[0]] retain]
+        ];
+
+        _assert(pipe(fds) != -1);
+        _assert(dup2(fds[0], 0) != -1);
+        _assert(close(fds[0]) != -1);
+
+        input_ = fdopen(fds[1], "a");
+
+        _assert(pipe(fds) != -1);
+        _assert(dup2(fds[1], 1) != -1);
+        _assert(close(fds[1]) != -1);
+
+        [NSThread
+            detachNewThreadSelector:@selector(_readOutput:)
+            toTarget:self
+            withObject:[[NSNumber numberWithInt:fds[0]] retain]
+        ];
+    } return self;
+}
+
+- (pkgCacheFile &) cache {
+    return cache_;
+}
+
+- (pkgDepCache::Policy *) policy {
+    return policy_;
+}
+
+- (pkgRecords *) records {
+    return records_;
+}
+
+- (pkgProblemResolver *) resolver {
+    return resolver_;
+}
+
+- (pkgAcquire &) fetcher {
+    return *fetcher_;
+}
+
+- (NSArray *) packages {
+    return packages_;
+}
+
+- (NSArray *) sources {
+    return [sources_ allValues];
+}
+
+- (void) reloadData {
+    _error->Discard();
+
+    delete list_;
+    list_ = NULL;
+    manager_ = NULL;
+    delete lock_;
+    lock_ = NULL;
+    delete fetcher_;
+    fetcher_ = NULL;
+    delete resolver_;
+    resolver_ = NULL;
+    delete records_;
+    records_ = NULL;
+    delete policy_;
+    policy_ = NULL;
+
+    cache_.Close();
+
+    if (!cache_.Open(progress_, true)) {
+        std::string error;
+        if (!_error->PopMessage(error))
+            _assert(false);
+        _error->Discard();
+        fprintf(stderr, "cache_.Open():[%s]\n", error.c_str());
+
+        if (error == "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct the problem. ")
+            [delegate_ repairWithSelector:@selector(configure)];
+        else if (error == "The package lists or status file could not be parsed or opened.")
+            [delegate_ repairWithSelector:@selector(update)];
+        // else if (error == "Could not open lock file /var/lib/dpkg/lock - open (13 Permission denied)")
+        // else if (error == "Could not get lock /var/lib/dpkg/lock - open (35 Resource temporarily unavailable)")
+        // else if (error == "The list of sources could not be read.")
+        else _assert(false);
+
+        return;
+    }
+
+    now_ = [[NSDate date] retain];
+
+    policy_ = new pkgDepCache::Policy();
+    records_ = new pkgRecords(cache_);
+    resolver_ = new pkgProblemResolver(cache_);
+    fetcher_ = new pkgAcquire(&status_);
+    lock_ = NULL;
+
+    list_ = new pkgSourceList();
+    _assert(list_->ReadMainList());
+
+    _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
+    _assert(pkgApplyStatus(cache_));
+
+    if (cache_->BrokenCount() != 0) {
+        _assert(pkgFixBroken(cache_));
+        _assert(cache_->BrokenCount() == 0);
+        _assert(pkgMinimizeUpgrade(cache_));
+    }
+
+    [sources_ removeAllObjects];
+    for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) {
+        std::vector<pkgIndexFile *> *indices = (*source)->GetIndexFiles();
+        for (std::vector<pkgIndexFile *>::const_iterator index = indices->begin(); index != indices->end(); ++index)
+            [sources_
+                setObject:[[[Source alloc] initWithMetaIndex:*source] autorelease]
+                forKey:[NSNumber numberWithLong:reinterpret_cast<uintptr_t>(*index)]
+            ];
+    }
+
+    [packages_ removeAllObjects];
+    for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
+        if (Package *package = [Package packageWithIterator:iterator database:self])
+            [packages_ addObject:package];
+
+    [packages_ sortUsingSelector:@selector(compareByName:)];
+}
+
+- (void) configure {
+    NSString *dpkg = [NSString stringWithFormat:@"dpkg --configure -a --status-fd %u", statusfd_];
+    system([dpkg UTF8String]);
+}
+
+- (void) clean {
+    if (lock_ != NULL)
+        return;
+
+    FileFd Lock;
+    Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
+    _assert(!_error->PendingError());
+
+    pkgAcquire fetcher;
+    fetcher.Clean(_config->FindDir("Dir::Cache::Archives"));
+
+    class LogCleaner :
+        public pkgArchiveCleaner
+    {
+      protected:
+        virtual void Erase(const char *File, std::string Pkg, std::string Ver, struct stat &St) {
+            unlink(File);
+        }
+    } cleaner;
+
+    if (!cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)) {
+        std::string error;
+        while (_error->PopMessage(error))
+            fprintf(stderr, "ArchiveCleaner: %s\n", error.c_str());
+    }
+}
+
+- (void) prepare {
+    pkgRecords records(cache_);
+
+    lock_ = new FileFd();
+    lock_->Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
+    _assert(!_error->PendingError());
+
+    pkgSourceList list;
+    // XXX: explain this with an error message
+    _assert(list.ReadMainList());
+
+    manager_ = (_system->CreatePM(cache_));
+    _assert(manager_->GetArchives(fetcher_, &list, &records));
+    _assert(!_error->PendingError());
+}
+
+- (void) perform {
+    NSMutableArray *before = [NSMutableArray arrayWithCapacity:16]; {
+        pkgSourceList list;
+        _assert(list.ReadMainList());
+        for (pkgSourceList::const_iterator source = list.begin(); source != list.end(); ++source)
+            [before addObject:[NSString stringWithUTF8String:(*source)->GetURI().c_str()]];
+    }
+
+    if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue) {
+        _trace();
+        return;
+    }
+
+    bool failed = false;
+    for (pkgAcquire::ItemIterator item = fetcher_->ItemsBegin(); item != fetcher_->ItemsEnd(); item++) {
+        if ((*item)->Status == pkgAcquire::Item::StatDone && (*item)->Complete)
+            continue;
+
+        std::string uri = (*item)->DescURI();
+        std::string error = (*item)->ErrorText;
+
+        fprintf(stderr, "pAf:%s:%s\n", uri.c_str(), error.c_str());
+        failed = true;
+
+        [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+            withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:error.c_str()], nil]
+            waitUntilDone:YES
+        ];
+    }
+
+    if (failed) {
+        _trace();
+        return;
+    }
+
+    _system->UnLock();
+    pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_);
+
+    if (_error->PendingError()) {
+        _trace();
+        return;
+    }
+
+    if (result == pkgPackageManager::Failed) {
+        _trace();
+        return;
+    }
+
+    if (result != pkgPackageManager::Completed) {
+        _trace();
+        return;
+    }
+
+    NSMutableArray *after = [NSMutableArray arrayWithCapacity:16]; {
+        pkgSourceList list;
+        _assert(list.ReadMainList());
+        for (pkgSourceList::const_iterator source = list.begin(); source != list.end(); ++source)
+            [after addObject:[NSString stringWithUTF8String:(*source)->GetURI().c_str()]];
+    }
+
+    if (![before isEqualToArray:after])
+        [self update];
+}
+
+- (void) upgrade {
+    _assert(pkgDistUpgrade(cache_));
+}
+
+- (void) update {
+    [self updateWithStatus:status_];
+}
+
+- (void) updateWithStatus:(Status &)status {
+    pkgSourceList list;
+    _assert(list.ReadMainList());
+
+    FileFd lock;
+    lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
+    _assert(!_error->PendingError());
+
+    pkgAcquire fetcher(&status);
+    _assert(list.GetIndexes(&fetcher));
+
+    if (fetcher.Run(PulseInterval_) != pkgAcquire::Failed) {
+        bool failed = false;
+        for (pkgAcquire::ItemIterator item = fetcher.ItemsBegin(); item != fetcher.ItemsEnd(); item++)
+            if ((*item)->Status != pkgAcquire::Item::StatDone) {
+                (*item)->Finished();
+                failed = true;
+            }
+
+        if (!failed && _config->FindB("APT::Get::List-Cleanup", true) == true) {
+            _assert(fetcher.Clean(_config->FindDir("Dir::State::lists")));
+            _assert(fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/"));
+        }
+
+        [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
+        Changed_ = true;
+    }
+}
+
+- (void) setDelegate:(id)delegate {
+    delegate_ = delegate;
+    status_.setDelegate(delegate);
+    progress_.setDelegate(delegate);
+}
+
+- (Source *) getSource:(const pkgCache::PkgFileIterator &)file {
+    pkgIndexFile *index(NULL);
+    list_->FindIndex(file, index);
+    return [sources_ objectForKey:[NSNumber numberWithLong:reinterpret_cast<uintptr_t>(index)]];
+}
+
+@end
+/* }}} */
+
+/* Confirmation View {{{ */
+void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString *key) {
+    if ([packages count] == 0)
+        return;
+
+    UITextView *text = GetTextView([packages count] == 0 ? @"n/a" : [packages componentsJoinedByString:@", "], 120, false);
+    [fields setObject:text forKey:key];
+
+    CGColor blue(space_, 0, 0, 0.4, 1);
+    [text setTextColor:[UIColor colorWithCGColor:blue]];
+}
+
+bool DepSubstrate(const pkgCache::VerIterator &iterator) {
+    if (!iterator.end())
+        for (pkgCache::DepIterator dep(iterator.DependsList()); !dep.end(); ++dep) {
+            if (dep->Type != pkgCache::Dep::Depends && dep->Type != pkgCache::Dep::PreDepends)
+                continue;
+            pkgCache::PkgIterator package(dep.TargetPkg());
+            if (package.end())
+                continue;
+            if (strcmp(package.Name(), "mobilesubstrate") == 0)
+                return true;
+        }
+
+    return false;
+}
+
+@protocol ConfirmationViewDelegate
+- (void) cancel;
+- (void) confirm;
+@end
+
+@interface ConfirmationView : UIView {
+    Database *database_;
+    id delegate_;
+    UITransitionView *transition_;
+    UIView *overlay_;
+    UINavigationBar *navbar_;
+    UIPreferencesTable *table_;
+    NSMutableDictionary *fields_;
+    UIActionSheet *essential_;
+    BOOL substrate_;
+}
+
+- (void) cancel;
+
+- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate;
+
+@end
+
+@implementation ConfirmationView
+
+- (void) dealloc {
+    [navbar_ setDelegate:nil];
+    [transition_ setDelegate:nil];
+    [table_ setDataSource:nil];
+
+    [transition_ release];
+    [overlay_ release];
+    [navbar_ release];
+    [table_ release];
+    [fields_ release];
+    if (essential_ != nil)
+        [essential_ release];
+    [super dealloc];
+}
+
+- (void) cancel {
+    [transition_ transition:7 toView:nil];
+    [delegate_ cancel];
+}
+
+- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
+    if (from != nil && to == nil)
+        [self removeFromSuperview];
+}
+
+- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
+    switch (button) {
+        case 0:
+            if (essential_ != nil)
+                [essential_ popupAlertAnimated:YES];
+            else {
+                if (substrate_)
+                    Finish_ = 2;
+                [delegate_ confirm];
+            }
+        break;
+
+        case 1:
+            [self cancel];
+        break;
+    }
+}
+
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context = [sheet context];
+
+    if ([context isEqualToString:@"remove"])
+        switch (button) {
+            case 1:
+                [self cancel];
+                break;
+            case 2:
+                if (substrate_)
+                    Finish_ = 2;
+                [delegate_ confirm];
+                break;
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"unable"])
+        [self cancel];
+
+    [sheet dismiss];
+}
+
+- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
+    return 2;
+}
+
+- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
+    switch (group) {
+        case 0: return @"Statistics";
+        case 1: return @"Modifications";
+
+        default: _assert(false);
+    }
+}
+
+- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
     switch (group) {
         case 0: return 3;
         case 1: return [fields_ count];
 
-        default: _assert(false);
+        default: _assert(false);
+    }
+}
+
+- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
+    if (group != 1 || row == -1)
+        return proposed;
+    else {
+        _assert(size_t(row) < [fields_ count]);
+        return [[[fields_ allValues] objectAtIndex:row] visibleTextRect].size.height + TextViewOffset_;
+    }
+}
+
+- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
+    UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
+    [cell setShowSelection:NO];
+
+    switch (group) {
+        case 0: switch (row) {
+            case 0: {
+                [cell setTitle:@"Downloading"];
+                [cell setValue:SizeString([database_ fetcher].FetchNeeded())];
+            } break;
+
+            case 1: {
+                [cell setTitle:@"Resuming At"];
+                [cell setValue:SizeString([database_ fetcher].PartialPresent())];
+            } break;
+
+            case 2: {
+                double size([database_ cache]->UsrSize());
+
+                if (size < 0) {
+                    [cell setTitle:@"Disk Freeing"];
+                    [cell setValue:SizeString(-size)];
+                } else {
+                    [cell setTitle:@"Disk Using"];
+                    [cell setValue:SizeString(size)];
+                }
+            } break;
+
+            default: _assert(false);
+        } break;
+
+        case 1:
+            _assert(size_t(row) < [fields_ count]);
+            [cell setTitle:[[fields_ allKeys] objectAtIndex:row]];
+            [cell addSubview:[[fields_ allValues] objectAtIndex:row]];
+        break;
+
+        default: _assert(false);
+    }
+
+    return cell;
+}
+
+- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate {
+    if ((self = [super initWithFrame:[view bounds]]) != nil) {
+        database_ = database;
+        delegate_ = delegate;
+
+        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
+        [self addSubview:transition_];
+
+        overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+
+        CGSize navsize = [UINavigationBar defaultSize];
+        CGRect navrect = {{0, 0}, navsize};
+        CGRect bounds = [overlay_ bounds];
+
+        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
+        [navbar_ setDelegate:self];
+
+        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease];
+        [navbar_ pushNavigationItem:navitem];
+        [navbar_ showButtonsWithLeftTitle:@"Cancel" rightTitle:@"Confirm"];
+
+        fields_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
+
+        NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16];
+        NSMutableArray *reinstalling = [NSMutableArray arrayWithCapacity:16];
+        NSMutableArray *upgrading = [NSMutableArray arrayWithCapacity:16];
+        NSMutableArray *downgrading = [NSMutableArray arrayWithCapacity:16];
+        NSMutableArray *removing = [NSMutableArray arrayWithCapacity:16];
+
+        bool remove(false);
+
+        pkgDepCache::Policy *policy([database_ policy]);
+
+        pkgCacheFile &cache([database_ cache]);
+        NSArray *packages = [database_ packages];
+        for (size_t i(0), e = [packages count]; i != e; ++i) {
+            Package *package = [packages objectAtIndex:i];
+            pkgCache::PkgIterator iterator = [package iterator];
+            pkgDepCache::StateCache &state(cache[iterator]);
+
+            NSString *name([package name]);
+
+            if (state.NewInstall())
+                [installing addObject:name];
+            else if (!state.Delete() && (state.iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall)
+                [reinstalling addObject:name];
+            else if (state.Upgrade())
+                [upgrading addObject:name];
+            else if (state.Downgrade())
+                [downgrading addObject:name];
+            else if (state.Delete()) {
+                if ([package essential])
+                    remove = true;
+                [removing addObject:name];
+            } else continue;
+
+            substrate_ |= DepSubstrate(policy->GetCandidateVer(iterator));
+            substrate_ |= DepSubstrate(iterator.CurrentVer());
+        }
+
+        if (!remove)
+            essential_ = nil;
+        else if (Advanced_ || true) {
+            essential_ = [[UIActionSheet alloc]
+                initWithTitle:@"Removing Essentials"
+                buttons:[NSArray arrayWithObjects:
+                    @"Cancel Operation (Safe)",
+                    @"Force Removal (Unsafe)",
+                nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"remove"
+            ];
+
+#ifndef __OBJC2__
+            [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]];
+#endif
+            [essential_ setBodyText:@"This operation involves the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. If you continue, you may not be able to use Cydia to repair any damage."];
+        } else {
+            essential_ = [[UIActionSheet alloc]
+                initWithTitle:@"Unable to Comply"
+                buttons:[NSArray arrayWithObjects:@"Okay", nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"unable"
+            ];
+
+            [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."];
+        }
+
+        AddTextView(fields_, installing, @"Installing");
+        AddTextView(fields_, reinstalling, @"Reinstalling");
+        AddTextView(fields_, upgrading, @"Upgrading");
+        AddTextView(fields_, downgrading, @"Downgrading");
+        AddTextView(fields_, removing, @"Removing");
+
+        table_ = [[UIPreferencesTable alloc] initWithFrame:CGRectMake(
+            0, navsize.height, bounds.size.width, bounds.size.height - navsize.height
+        )];
+
+        [table_ setDataSource:self];
+        [table_ reloadData];
+
+        [overlay_ addSubview:navbar_];
+        [overlay_ addSubview:table_];
+
+        [view addSubview:self];
+
+        [transition_ setDelegate:self];
+
+        UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease];
+        [transition_ transition:0 toView:blank];
+        [transition_ transition:3 toView:overlay_];
+    } return self;
+}
+
+@end
+/* }}} */
+
+/* Progress Data {{{ */
+@interface ProgressData : NSObject {
+    SEL selector_;
+    id target_;
+    id object_;
+}
+
+- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object;
+
+- (SEL) selector;
+- (id) target;
+- (id) object;
+@end
+
+@implementation ProgressData
+
+- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object {
+    if ((self = [super init]) != nil) {
+        selector_ = selector;
+        target_ = target;
+        object_ = object;
+    } return self;
+}
+
+- (SEL) selector {
+    return selector_;
+}
+
+- (id) target {
+    return target_;
+}
+
+- (id) object {
+    return object_;
+}
+
+@end
+/* }}} */
+/* Progress View {{{ */
+@interface ProgressView : UIView <
+    ConfigurationDelegate,
+    ProgressDelegate
+> {
+    _transient Database *database_;
+    UIView *view_;
+    UIView *background_;
+    UITransitionView *transition_;
+    UIView *overlay_;
+    UINavigationBar *navbar_;
+    UIProgressBar *progress_;
+    UITextView *output_;
+    UITextLabel *status_;
+    UIPushButton *close_;
+    id delegate_;
+    BOOL running_;
+    SHA1SumValue springlist_;
+    size_t received_;
+    NSTimeInterval last_;
+}
+
+- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
+
+- (id) initWithFrame:(struct CGRect)frame database:(Database *)database delegate:(id)delegate;
+- (void) setContentView:(UIView *)view;
+- (void) resetView;
+
+- (void) _retachThread;
+- (void) _detachNewThreadData:(ProgressData *)data;
+- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title;
+
+- (BOOL) isRunning;
+
+@end
+
+@protocol ProgressViewDelegate
+- (void) progressViewIsComplete:(ProgressView *)sender;
+@end
+
+@implementation ProgressView
+
+- (void) dealloc {
+    [transition_ setDelegate:nil];
+    [navbar_ setDelegate:nil];
+
+    [view_ release];
+    if (background_ != nil)
+        [background_ release];
+    [transition_ release];
+    [overlay_ release];
+    [navbar_ release];
+    [progress_ release];
+    [output_ release];
+    [status_ release];
+    [close_ release];
+    [super dealloc];
+}
+
+- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
+    if (bootstrap_ && from == overlay_ && to == view_)
+        exit(0);
+}
+
+- (id) initWithFrame:(struct CGRect)frame database:(Database *)database delegate:(id)delegate {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        database_ = database;
+        delegate_ = delegate;
+
+        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
+        [transition_ setDelegate:self];
+
+        overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+
+        if (bootstrap_)
+            [overlay_ setBackgroundColor:[UIColor blackColor]];
+        else {
+            background_ = [[UIView alloc] initWithFrame:[self bounds]];
+            [background_ setBackgroundColor:[UIColor blackColor]];
+            [self addSubview:background_];
+        }
+
+        [self addSubview:transition_];
+
+        CGSize navsize = [UINavigationBar defaultSize];
+        CGRect navrect = {{0, 0}, navsize};
+
+        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
+        [overlay_ addSubview:navbar_];
+
+        [navbar_ setBarStyle:1];
+        [navbar_ setDelegate:self];
+
+        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:nil] autorelease];
+        [navbar_ pushNavigationItem:navitem];
+
+        CGRect bounds = [overlay_ bounds];
+        CGSize prgsize = [UIProgressBar defaultSize];
+
+        CGRect prgrect = {{
+            (bounds.size.width - prgsize.width) / 2,
+            bounds.size.height - prgsize.height - 20
+        }, prgsize};
+
+        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
+        [progress_ setStyle:0];
+
+        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(
+            10,
+            bounds.size.height - prgsize.height - 50,
+            bounds.size.width - 20,
+            24
+        )];
+
+        [status_ setColor:[UIColor whiteColor]];
+        [status_ setBackgroundColor:[UIColor clearColor]];
+
+        [status_ setCentersHorizontally:YES];
+        //[status_ setFont:font];
+
+        output_ = [[UITextView alloc] initWithFrame:CGRectMake(
+            10,
+            navrect.size.height + 20,
+            bounds.size.width - 20,
+            bounds.size.height - navsize.height - 62 - navrect.size.height
+        )];
+
+        //[output_ setTextFont:@"Courier New"];
+        [output_ setTextSize:12];
+
+        [output_ setTextColor:[UIColor whiteColor]];
+        [output_ setBackgroundColor:[UIColor clearColor]];
+
+        [output_ setMarginTop:0];
+        [output_ setAllowsRubberBanding:YES];
+        [output_ setEditable:NO];
+
+        [overlay_ addSubview:output_];
+
+        close_ = [[UIPushButton alloc] initWithFrame:CGRectMake(
+            10,
+            bounds.size.height - prgsize.height - 50,
+            bounds.size.width - 20,
+            32 + prgsize.height
+        )];
+
+        [close_ setAutosizesToFit:NO];
+        [close_ setDrawsShadow:YES];
+        [close_ setStretchBackground:YES];
+        [close_ setEnabled:YES];
+
+        UIFont *bold = [UIFont boldSystemFontOfSize:22];
+        [close_ setTitleFont:bold];
+
+        [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside];
+        [close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0];
+        [close_ setBackground:[UIImage applicationImageNamed:@"green-dn.png"] forState:1];
+    } return self;
+}
+
+- (void) setContentView:(UIView *)view {
+    view_ = [view retain];
+}
+
+- (void) resetView {
+    [transition_ transition:6 toView:view_];
+}
+
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context = [sheet context];
+    if ([context isEqualToString:@"conffile"]) {
+        FILE *input = [database_ input];
+
+        switch (button) {
+            case 1:
+                fprintf(input, "N\n");
+                fflush(input);
+                break;
+            case 2:
+                fprintf(input, "Y\n");
+                fflush(input);
+                break;
+            default:
+                _assert(false);
+        }
     }
+
+    [sheet dismiss];
 }
 
-- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
-    if (group != 1 || row == -1)
-        return proposed;
-    else {
-        _assert(size_t(row) < [fields_ count]);
-        return [[[fields_ allValues] objectAtIndex:row] visibleTextRect].size.height + TextViewOffset_;
+- (void) closeButtonPushed {
+    switch (Finish_) {
+        case 0:
+            [delegate_ progressViewIsComplete:self];
+            [self resetView];
+        break;
+
+        case 1:
+            [delegate_ suspendWithAnimation:YES];
+        break;
+
+        case 2:
+            system("launchctl stop com.apple.SpringBoard");
+        break;
+
+        case 3:
+            system("launchctl unload /System/Library/LaunchDaemons/com.apple.SpringBoard.plist; launchctl load /System/Library/LaunchDaemons/com.apple.SpringBoard.plist");
+        break;
+
+        case 4:
+            system("reboot");
+        break;
     }
 }
 
-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
-    UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
-    [cell setShowSelection:NO];
+- (void) _retachThread {
+    UINavigationItem *item = [navbar_ topItem];
+    [item setTitle:@"Complete"];
 
-    switch (group) {
-        case 0: switch (row) {
-            case 0: {
-                [cell setTitle:@"Downloading"];
-                [cell setValue:SizeString([database_ fetcher].FetchNeeded())];
-            } break;
+    [overlay_ addSubview:close_];
+    [progress_ removeFromSuperview];
+    [status_ removeFromSuperview];
 
-            case 1: {
-                [cell setTitle:@"Resuming At"];
-                [cell setValue:SizeString([database_ fetcher].PartialPresent())];
-            } break;
+    {
+        FileFd file("/System/Library/LaunchDaemons/com.apple.SpringBoard.plist", FileFd::ReadOnly);
+        MMap mmap(file, MMap::ReadOnly);
+        SHA1Summation sha1;
+        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+        if (!(springlist_ == sha1.Result()))
+            Finish_ = 3;
+    }
 
-            case 2: {
-                double size([database_ cache]->UsrSize());
+    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;
+    }
 
-                if (size < 0) {
-                    [cell setTitle:@"Disk Freeing"];
-                    [cell setValue:SizeString(-size)];
-                } else {
-                    [cell setTitle:@"Disk Using"];
-                    [cell setValue:SizeString(size)];
+#define Cache_ "/User/Library/Caches/com.apple.mobile.installation.plist"
+
+    if (NSMutableDictionary *cache = [[NSDictionary alloc] initWithContentsOfFile:@ Cache_]) {
+        [cache autorelease];
+
+        NSFileManager *manager = [NSFileManager defaultManager];
+        id error = nil;
+
+        NSMutableDictionary *system = [cache objectForKey:@"System"];
+        if (system == nil)
+            goto error;
+
+        struct stat info;
+        if (stat(Cache_, &info) == -1)
+            goto error;
+
+        [system removeAllObjects];
+
+        if (NSArray *apps = [manager contentsOfDirectoryAtPath:@"/Applications" error:&error])
+            for (NSString *app in apps)
+                if ([app hasSuffix:@".app"]) {
+                    NSString *path = [@"/Applications" stringByAppendingPathComponent:app];
+                    NSString *plist = [path stringByAppendingPathComponent:@"Info.plist"];
+                    if (NSMutableDictionary *info = [[NSMutableDictionary alloc] initWithContentsOfFile:plist]) {
+                        [info autorelease];
+                        [info setObject:path forKey:@"Path"];
+                        [info setObject:@"System" forKey:@"ApplicationType"];
+                        NSString *bundle = [info objectForKey:@"CFBundleIdentifier"];
+                        [system setObject:info forKey:bundle];
+                    }
                 }
-            } break;
+        else goto error;
 
-            default: _assert(false);
-        } break;
+        [cache writeToFile:@Cache_ atomically:YES];
 
-        case 1:
-            _assert(size_t(row) < [fields_ count]);
-            [cell setTitle:[[fields_ allKeys] objectAtIndex:row]];
-            [cell addSubview:[[fields_ allValues] objectAtIndex:row]];
-        break;
+        if (chown(Cache_, info.st_uid, info.st_gid) == -1)
+            goto error;
+        if (chmod(Cache_, info.st_mode) == -1)
+            goto error;
 
-        default: _assert(false);
+        if (false) error:
+            fprintf(stderr, "%s\n", error == nil ? strerror(errno) : [[error localizedDescription] UTF8String]);
     }
 
-    return cell;
+    notify_post("com.apple.mobile.application_installed");
+
+    [delegate_ setStatusBarShowsProgress:NO];
+
+    running_ = NO;
 }
 
-- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate {
-    if ((self = [super initWithFrame:[view bounds]]) != nil) {
-        database_ = database;
-        delegate_ = delegate;
+- (void) _detachNewThreadData:(ProgressData *)data {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
-        [self addSubview:transition_];
+    [[data target] performSelector:[data selector] withObject:[data object]];
+    [data release];
 
-        overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+    [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES];
 
-        CGSize navsize = [UINavigationBar defaultSize];
-        CGRect navrect = {{0, 0}, navsize};
-        CGRect bounds = [overlay_ bounds];
+    [pool release];
+}
 
-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
+- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title {
+    UINavigationItem *item = [navbar_ topItem];
+    [item setTitle:title];
 
-        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease];
-        [navbar_ pushNavigationItem:navitem];
-        [navbar_ showButtonsWithLeftTitle:@"Cancel" rightTitle:@"Confirm"];
+    [status_ setText:nil];
+    [output_ setText:@""];
+    [progress_ setProgress:0];
 
-        fields_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
+    received_ = 0;
+    last_ = 0;//[NSDate timeIntervalSinceReferenceDate];
 
-        NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16];
-        NSMutableArray *upgrading = [NSMutableArray arrayWithCapacity:16];
-        NSMutableArray *removing = [NSMutableArray arrayWithCapacity:16];
+    [close_ removeFromSuperview];
+    [overlay_ addSubview:progress_];
+    [overlay_ addSubview:status_];
 
-        bool essential(false);
+    [delegate_ setStatusBarShowsProgress:YES];
+    running_ = YES;
 
-        pkgCacheFile &cache([database_ cache]);
-        for (pkgCache::PkgIterator iterator = cache->PkgBegin(); !iterator.end(); ++iterator) {
-            NSString *name([NSString stringWithCString:iterator.Name()]);
-            if (cache[iterator].NewInstall())
-                [installing addObject:name];
-            else if (cache[iterator].Upgrade())
-                [upgrading addObject:name];
-            else if (cache[iterator].Delete()) {
-                [removing addObject:name];
-                if ((iterator->Flags & pkgCache::Flag::Essential) != 0)
-                    essential = true;
-            }
-        }
+    {
+        FileFd file("/System/Library/LaunchDaemons/com.apple.SpringBoard.plist", FileFd::ReadOnly);
+        MMap mmap(file, MMap::ReadOnly);
+        SHA1Summation sha1;
+        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+        springlist_ = sha1.Result();
+    }
 
-        if (!essential)
-            essential_ = nil;
-        else {
-            essential_ = [[UIAlertSheet alloc]
-                initWithTitle:@"Unable to Comply"
-                buttons:[NSArray arrayWithObjects:@"Okay", nil]
-                defaultButtonIndex:0
-                delegate:self
-                context:self
-            ];
+    [transition_ transition:6 toView:overlay_];
 
-            [essential_ setBodyText:@"One or more of the packages you are about to remove are marked 'Essential' and cannot be removed by Cydia. Please use apt-get."];
-        }
+    [NSThread
+        detachNewThreadSelector:@selector(_detachNewThreadData:)
+        toTarget:self
+        withObject:[[ProgressData alloc]
+            initWithSelector:selector
+            target:target
+            object:object
+        ]
+    ];
+}
 
-        AddTextView(fields_, installing, @"Installing");
-        AddTextView(fields_, upgrading, @"Upgrading");
-        AddTextView(fields_, removing, @"Removing");
+- (void) repairWithSelector:(SEL)selector {
+    [self
+        detachNewThreadSelector:selector
+        toTarget:database_
+        withObject:nil
+        title:@"Repairing"
+    ];
+}
 
-        table_ = [[UIPreferencesTable alloc] initWithFrame:CGRectMake(
-            0, navsize.height, bounds.size.width, bounds.size.height - navsize.height
-        )];
+- (void) setConfigurationData:(NSString *)data {
+    [self
+        performSelectorOnMainThread:@selector(_setConfigurationData:)
+        withObject:data
+        waitUntilDone:YES
+    ];
+}
 
-        [table_ setReusesTableCells:YES];
-        [table_ setDataSource:self];
-        [table_ reloadData];
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    Package *package = id == nil ? nil : [database_ packageWithName:id];
 
-        [overlay_ addSubview:navbar_];
-        [overlay_ addSubview:table_];
+    UIActionSheet *sheet = [[[UIActionSheet alloc]
+        initWithTitle:(package == nil ? @"Source Error" : [package name])
+        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"error"
+    ] autorelease];
 
-        [view addSubview:self];
+    [sheet setBodyText:error];
+    [sheet popupAlertAnimated:YES];
+}
 
-        [transition_ setDelegate:self];
+- (void) setProgressTitle:(NSString *)title {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressTitle:)
+        withObject:title
+        waitUntilDone:YES
+    ];
+}
 
-        UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease];
-        [transition_ transition:0 toView:blank];
-        [transition_ transition:3 toView:overlay_];
-    } return self;
+- (void) setProgressPercent:(float)percent {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressPercent:)
+        withObject:[NSNumber numberWithFloat:percent]
+        waitUntilDone:YES
+    ];
+}
+
+- (void) startProgress {
+    last_ = [NSDate timeIntervalSinceReferenceDate];
+}
+
+- (void) addProgressOutput:(NSString *)output {
+    [self
+        performSelectorOnMainThread:@selector(_addProgressOutput:)
+        withObject:output
+        waitUntilDone:YES
+    ];
+}
+
+- (bool) isCancelling:(size_t)received {
+    if (last_ != 0) {
+        NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
+        if (received_ != received) {
+            received_ = received;
+            last_ = now;
+        } else if (now - last_ > 30)
+            return true;
+    }
+
+    return false;
+}
+
+- (void) _setConfigurationData:(NSString *)data {
+    static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
+
+    _assert(conffile_r(data));
+
+    NSString *ofile = conffile_r[1];
+    //NSString *nfile = conffile_r[2];
+
+    UIActionSheet *sheet = [[[UIActionSheet alloc]
+        initWithTitle:@"Configuration Upgrade"
+        buttons:[NSArray arrayWithObjects:
+            @"Keep My Old Copy",
+            @"Accept The New Copy",
+            // XXX: @"See What Changed",
+        nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"conffile"
+    ] autorelease];
+
+    [sheet setBodyText:[NSString stringWithFormat:
+        @"The following file has been changed by both the package maintainer and by you (or for you by a script).\n\n%@"
+    , ofile]];
+
+    [sheet popupAlertAnimated:YES];
+}
+
+- (void) _setProgressTitle:(NSString *)title {
+    [status_ setText:title];
+}
+
+- (void) _setProgressPercent:(NSNumber *)percent {
+    [progress_ setProgress:[percent floatValue]];
+}
+
+- (void) _addProgressOutput:(NSString *)output {
+    [output_ setText:[NSString stringWithFormat:@"%@\n%@", [output_ text], output]];
+    CGSize size = [output_ contentSize];
+    CGRect rect = {{0, size.height}, {size.width, 0}};
+    [output_ scrollRectToVisible:rect animated:YES];
+}
+
+- (BOOL) isRunning {
+    return running_;
 }
 
 @end
 /* }}} */
 
-/* Package Class {{{ */
-NSString *Scour(const char *field, const char *begin, const char *end) {
-    size_t i(0), l(strlen(field));
+/* Package Cell {{{ */
+@interface PackageCell : UISimpleTableCell {
+    UIImage *icon_;
+    NSString *name_;
+    NSString *description_;
+    NSString *source_;
+    //UIImageView *trusted_;
+#ifdef USE_BADGES
+    UIImageView *badge_;
+    UITextLabel *status_;
+#endif
+}
 
-    for (;;) {
-        const char *name = begin + i;
-        const char *colon = name + l;
-        const char *value = colon + 1;
+- (PackageCell *) init;
+- (void) setPackage:(Package *)package;
+
++ (int) heightForPackage:(Package *)package;
+
+@end
+
+@implementation PackageCell
+
+- (void) clearPackage {
+    if (icon_ != nil) {
+        [icon_ release];
+        icon_ = nil;
+    }
+
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
+    }
+
+    if (description_ != nil) {
+        [description_ release];
+        description_ = nil;
+    }
 
-        if (
-            value < end &&
-            *colon == ':' &&
-            memcmp(name, field, l) == 0
-        ) {
-            while (value != end && value[0] == ' ')
-                ++value;
-            const char *line = std::find(value, end, '\n');
-            while (line != value && line[-1] == ' ')
-                --line;
-            return [NSString stringWithCString:value length:(line - value)];
-        } else {
-            begin = std::find(begin, end, '\n');
-            if (begin == end)
-                return nil;
-            ++begin;
-        }
+    if (source_ != nil) {
+        [source_ release];
+        source_ = nil;
     }
 }
 
-@interface Package : NSObject {
-    pkgCache::PkgIterator iterator_;
-    Database *database_;
-    pkgCache::VerIterator version_;
-    pkgCache::VerFileIterator file_;
+- (void) dealloc {
+    [self clearPackage];
+#ifdef USE_BADGES
+    [badge_ release];
+    [status_ release];
+#endif
+    //[trusted_ release];
+    [super dealloc];
+}
 
-    NSString *latest_;
-    NSString *installed_;
+- (PackageCell *) init {
+    if ((self = [super init]) != nil) {
+#ifdef USE_BADGES
+        badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
 
-    NSString *id_;
-    NSString *name_;
-    NSString *tagline_;
-    NSString *icon_;
-    NSString *bundle_;
-    NSString *website_;
+        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];
+        [status_ setBackgroundColor:[UIColor clearColor]];
+        [status_ setFont:small];
+#endif
+    } return self;
 }
 
-- (void) dealloc;
+- (void) setPackage:(Package *)package {
+    [self clearPackage];
 
-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file;
-+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
+    Source *source = [package source];
 
-- (NSString *) section;
-- (Address *) maintainer;
-- (size_t) size;
-- (NSString *) description;
-- (NSString *) index;
+    icon_ = nil;
+    if (NSString *icon = [package icon])
+        icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];
+    if (icon_ == nil) if (NSString *section = [package section])
+        icon_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, Simplify(section)]];
+    /*if (icon_ == nil) if (NSString *icon = [source defaultIcon])
+        icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];*/
+    if (icon_ == nil)
+        icon_ = [UIImage applicationImageNamed:@"unknown.png"];
 
-- (NSDate *) seen;
+    icon_ = [icon_ retain];
 
-- (NSString *) latest;
-- (NSString *) installed;
-- (BOOL) upgradable;
+    name_ = [[package name] retain];
+    description_ = [[package tagline] retain];
 
-- (NSString *) id;
-- (NSString *) name;
-- (NSString *) tagline;
-- (NSString *) icon;
-- (NSString *) bundle;
-- (NSString *) website;
+    NSString *label = nil;
+    bool trusted = false;
 
-- (BOOL) matches:(NSString *)text;
+    if (source != nil) {
+        label = [source label];
+        trusted = [source trusted];
+    } else if ([[package id] isEqualToString:@"firmware"])
+        label = @"Apple";
+    else
+        label = @"Unknown/Local";
 
-- (NSComparisonResult) compareByName:(Package *)package;
-- (NSComparisonResult) compareBySectionAndName:(Package *)package;
-- (NSComparisonResult) compareForChanges:(Package *)package;
+    NSString *from = [NSString stringWithFormat:@"from %@", label];
 
-- (void) install;
-- (void) remove;
-@end
+    NSString *section = Simplify([package section]);
+    if (section != nil && ![section isEqualToString:label])
+        from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]];
 
-@implementation Package
+    source_ = [from retain];
 
-- (void) dealloc {
-    [latest_ release];
-    if (installed_ != nil)
-        [installed_ release];
+#ifdef USE_BADGES
+    [badge_ removeFromSuperview];
+    [status_ removeFromSuperview];
 
-    [id_ release];
-    if (name_ != nil)
-        [name_ release];
-    [tagline_ release];
-    if (icon_ != nil)
-        [icon_ release];
-    if (bundle_ != nil)
-        [bundle_ release];
-    [super dealloc];
+    if (NSString *mode = [package mode]) {
+        [badge_ setImage:[UIImage applicationImageNamed:
+            [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png"
+        ]];
+
+        [status_ setText:[NSString stringWithFormat:@"Queued for %@", mode]];
+        [status_ setColor:Blueish_];
+    } else if ([package half]) {
+        [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
+        [status_ setText:@"Package Damaged"];
+        [status_ setColor:[UIColor redColor]];
+    } else {
+        [badge_ setImage:nil];
+        [status_ setText:nil];
+        goto done;
+    }
+
+    [self addSubview:badge_];
+    [self addSubview:status_];
+  done:;
+#endif
 }
 
-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file {
-    if ((self = [super init]) != nil) {
-        iterator_ = iterator;
-        database_ = database;
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+    if (icon_ != nil) {
+        CGRect rect;
+        rect.size = [icon_ size];
 
-        version_ = version;
-        file_ = file;
+        rect.size.width /= 2;
+        rect.size.height /= 2;
 
-        pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+        rect.origin.x = 25 - rect.size.width / 2;
+        rect.origin.y = 25 - rect.size.height / 2;
 
-        const char *begin, *end;
-        parser->GetRec(begin, end);
+        [icon_ drawInRect:rect];
+    }
 
-        latest_ = [[NSString stringWithCString:version_.VerStr()] retain];
-        installed_ = iterator_.CurrentVer().end() ? nil : [[NSString stringWithCString:iterator_.CurrentVer().VerStr()] retain];
+    if (selected)
+        UISetColor(White_);
 
-        id_ = [[[NSString stringWithCString:iterator_.Name()] lowercaseString] retain];
-        name_ = Scour("Name", begin, end);
-        if (name_ != nil)
-            name_ = [name_ retain];
-        tagline_ = [[NSString stringWithCString:parser->ShortDesc().c_str()] retain];
-        icon_ = Scour("Icon", begin, end);
-        if (icon_ != nil)
-            icon_ = [icon_ retain];
-        bundle_ = Scour("Bundle", begin, end);
-        if (bundle_ != nil)
-            bundle_ = [bundle_ retain];
-        website_ = Scour("Website", begin, end);
-        if (website_ != nil)
-            website_ = [website_ retain];
+    if (!selected)
+        UISetColor(Black_);
+    [name_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2];
+    [source_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2];
 
-        NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
-        if (metadata == nil) {
-            metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                now_, @"FirstSeen",
-            nil];
+    if (!selected)
+        UISetColor(Gray_);
+    [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
 
-            [Packages_ setObject:metadata forKey:id_];
-        }
-    } return self;
+    [super drawContentInRect:rect selected:selected];
 }
 
-+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
-    for (pkgCache::VerIterator version = iterator.VersionList(); !version.end(); ++version)
-        for (pkgCache::VerFileIterator file = version.FileList(); !file.end(); ++file)
-            return [[[Package alloc]
-                initWithIterator:iterator 
-                database:database
-                version:version
-                file:file]
-            autorelease];
-    return nil;
++ (int) heightForPackage:(Package *)package {
+    NSString *tagline([package tagline]);
+    int height = tagline == nil || [tagline length] == 0 ? -17 : 0;
+#ifdef USE_BADGES
+    if ([package hasMode] || [package half])
+        return height + 96;
+    else
+#endif
+        return height + 73;
 }
 
-- (NSString *) section {
-    return [[NSString stringWithCString:iterator_.Section()] stringByReplacingCharacter:'_' withCharacter:' '];
+@end
+/* }}} */
+/* Section Cell {{{ */
+@interface SectionCell : UISimpleTableCell {
+    NSString *section_;
+    NSString *name_;
+    NSString *count_;
+    UIImage *icon_;
+    _UISwitchSlider *switch_;
+    BOOL editing_;
 }
 
-- (Address *) maintainer {
-    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
-    return [Address addressWithString:[NSString stringWithCString:parser->Maintainer().c_str()]];
-}
+- (id) init;
+- (void) setSection:(Section *)section editing:(BOOL)editing;
 
-- (size_t) size {
-    return version_->InstalledSize;
-}
+@end
 
-- (NSString *) description {
-    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
-    NSString *description([NSString stringWithCString:parser->LongDesc().c_str()]);
+@implementation SectionCell
 
-    NSArray *lines = [description componentsSeparatedByString:@"\n"];
-    NSMutableArray *trimmed = [NSMutableArray arrayWithCapacity:([lines count] - 1)];
-    if ([lines count] < 2)
-        return nil;
+- (void) clearSection {
+    if (section_ != nil) {
+        [section_ release];
+        section_ = nil;
+    }
 
-    NSCharacterSet *whitespace = [NSCharacterSet whitespaceCharacterSet];
-    for (size_t i(1); i != [lines count]; ++i) {
-        NSString *trim = [[lines objectAtIndex:i] stringByTrimmingCharactersInSet:whitespace];
-        [trimmed addObject:trim];
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
     }
 
-    return [trimmed componentsJoinedByString:@"\n"];
+    if (count_ != nil) {
+        [count_ release];
+        count_ = nil;
+    }
 }
 
-- (NSString *) index {
-    return [[[self name] substringToIndex:1] uppercaseString];
+- (void) dealloc {
+    [self clearSection];
+    [icon_ release];
+    [switch_ release];
+    [super dealloc];
 }
 
-- (NSDate *) seen {
-    return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"];
-}
+- (id) init {
+    if ((self = [super init]) != nil) {
+        icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain];
 
-- (NSString *) latest {
-    return latest_;
+        switch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(218, 9, 60, 25)];
+        [switch_ addTarget:self action:@selector(onSwitch:) forEvents:kUIControlEventMouseUpInside];
+    } return self;
 }
 
-- (NSString *) installed {
-    return installed_;
-}
+- (void) onSwitch:(id)sender {
+    NSMutableDictionary *metadata = [Sections_ objectForKey:section_];
+    if (metadata == nil) {
+        metadata = [NSMutableDictionary dictionaryWithCapacity:2];
+        [Sections_ setObject:metadata forKey:section_];
+    }
 
-- (BOOL) upgradable {
-    NSString *installed = [self installed];
-    return installed != nil && [[self latest] compare:installed] != NSOrderedSame ? YES : NO;
+    Changed_ = true;
+    [metadata setObject:[NSNumber numberWithBool:([switch_ value] == 0)] forKey:@"Hidden"];
 }
 
-- (NSString *) id {
-    return id_;
-}
+- (void) setSection:(Section *)section editing:(BOOL)editing {
+    if (editing != editing_) {
+        if (editing_)
+            [switch_ removeFromSuperview];
+        else
+            [self addSubview:switch_];
+        editing_ = editing;
+    }
 
-- (NSString *) name {
-    return name_ == nil ? id_ : name_;
-}
+    [self clearSection];
 
-- (NSString *) tagline {
-    return tagline_;
+    if (section == nil) {
+        name_ = [@"All Packages" retain];
+        count_ = nil;
+    } else {
+        section_ = [section name];
+        if (section_ != nil)
+            section_ = [section_ retain];
+        name_  = [(section_ == nil ? @"(No Section)" : section_) retain];
+        count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
+
+        if (editing_)
+            [switch_ setValue:isSectionVisible(section_) animated:NO];
+    }
 }
 
-- (NSString *) icon {
-    return icon_;
-}
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+    [icon_ drawInRect:CGRectMake(8, 7, 32, 32)];
 
-- (NSString *) bundle {
-    return bundle_;
-}
+    if (selected)
+        UISetColor(White_);
 
-- (NSString *) website {
-    return website_;
-}
+    if (!selected)
+        UISetColor(Black_);
+    [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(editing_ ? 164 : 250) withFont:Font22Bold_ ellipsis:2];
 
-- (BOOL) matches:(NSString *)text {
-    if (text == nil)
-        return NO;
+    CGSize size = [count_ sizeWithFont:Font14_];
 
-    NSRange range;
+    UISetColor(White_);
+    if (count_ != nil)
+        [count_ drawAtPoint:CGPointMake(12 + (29 - size.width) / 2, 15) withFont:Font12Bold_];
 
-    range = [[self name] rangeOfString:text options:NSCaseInsensitiveSearch];
-    if (range.location != NSNotFound)
-        return YES;
+    [super drawContentInRect:rect selected:selected];
+}
 
-    range = [[self tagline] rangeOfString:text options:NSCaseInsensitiveSearch];
-    if (range.location != NSNotFound)
-        return YES;
+@end
+/* }}} */
 
-    return NO;
+/* File Table {{{ */
+@interface FileTable : RVPage {
+    _transient Database *database_;
+    Package *package_;
+    NSString *name_;
+    NSMutableArray *files_;
+    UITable *list_;
 }
 
-- (NSComparisonResult) compareByName:(Package *)package {
-    return [[self name] caseInsensitiveCompare:[package name]];
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) setPackage:(Package *)package;
+
+@end
+
+@implementation FileTable
+
+- (void) dealloc {
+    if (package_ != nil)
+        [package_ release];
+    if (name_ != nil)
+        [name_ release];
+    [files_ release];
+    [list_ release];
+    [super dealloc];
 }
 
-- (NSComparisonResult) compareBySectionAndName:(Package *)package {
-    NSComparisonResult result = [[self section] compare:[package section]];
-    if (result != NSOrderedSame)
-        return result;
-    return [self compareByName:package];
+- (int) numberOfRowsInTable:(UITable *)table {
+    return files_ == nil ? 0 : [files_ count];
 }
 
-- (NSComparisonResult) compareForChanges:(Package *)package {
-    BOOL lhs = [self upgradable];
-    BOOL rhs = [package upgradable];
+- (float) table:(UITable *)table heightForRow:(int)row {
+    return 24;
+}
 
-    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);
-        }
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
+    if (reusing == nil) {
+        reusing = [[[UIImageAndTextTableCell alloc] init] autorelease];
+        UIFont *font = [UIFont systemFontOfSize:16];
+        [[(UIImageAndTextTableCell *)reusing titleTextLabel] setFont:font];
     }
-
-    return [self compareByName:package];
+    [(UIImageAndTextTableCell *)reusing setTitle:[files_ objectAtIndex:row]];
+    return reusing;
 }
 
-- (void) install {
-    pkgProblemResolver *resolver = [database_ resolver];
-    resolver->Clear(iterator_);
-    resolver->Protect(iterator_);
-    [database_ cache]->MarkInstall(iterator_, false);
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
+    return NO;
 }
 
-- (void) remove {
-    pkgProblemResolver *resolver = [database_ resolver];
-    resolver->Clear(iterator_);
-    resolver->Protect(iterator_);
-    resolver->Remove(iterator_);
-    [database_ cache]->MarkDelete(iterator_, true);
-}
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
 
-@end
-/* }}} */
-/* Section Class {{{ */
-@interface Section : NSObject {
-    NSString *name_;
-    size_t row_;
-    NSMutableArray *packages_;
+        files_ = [[NSMutableArray arrayWithCapacity:32] retain];
+
+        list_ = [[UITable alloc] initWithFrame:[self bounds]];
+        [self addSubview:list_];
+
+        UITableColumn *column = [[[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:[self frame].size.width
+        ] autorelease];
+
+        [list_ setDataSource:self];
+        [list_ setSeparatorStyle:1];
+        [list_ addTableColumn:column];
+        [list_ setDelegate:self];
+        [list_ setReusesTableCells:YES];
+    } return self;
 }
 
-- (void) dealloc;
+- (void) setPackage:(Package *)package {
+    if (package_ != nil) {
+        [package_ autorelease];
+        package_ = nil;
+    }
 
-- (Section *) initWithName:(NSString *)name row:(size_t)row;
-- (NSString *) name;
-- (size_t) row;
-- (NSArray *) packages;
-- (size_t) count;
-- (void) addPackage:(Package *)package;
-@end
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
+    }
+
+    [files_ removeAllObjects];
+
+    if (package != nil) {
+        package_ = [package retain];
+        name_ = [[package id] retain];
 
-@implementation Section
+        NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_];
 
-- (void) dealloc {
-    [name_ release];
-    [packages_ release];
-    [super dealloc];
-}
+        {
+            std::ifstream fin([path UTF8String]);
+            std::string line;
+            while (std::getline(fin, line))
+                [files_ addObject:[NSString stringWithUTF8String:line.c_str()]];
+        }
 
-- (Section *) initWithName:(NSString *)name row:(size_t)row {
-    if ((self = [super init]) != nil) {
-        name_ = [name retain];
-        row_ = row;
-        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
-    } return self;
-}
+        if ([files_ count] != 0) {
+            if ([[files_ objectAtIndex:0] isEqualToString:@"/."])
+                [files_ removeObjectAtIndex:0];
+            [files_ sortUsingSelector:@selector(compareByPath:)];
+
+            NSMutableArray *stack = [NSMutableArray arrayWithCapacity:8];
+            [stack addObject:@"/"];
+
+            for (int i(0), e([files_ count]); i != e; ++i) {
+                NSString *file = [files_ objectAtIndex:i];
+                while (![file hasPrefix:[stack lastObject]])
+                    [stack removeLastObject];
+                NSString *directory = [stack lastObject];
+                [stack addObject:[file stringByAppendingString:@"/"]];
+                [files_ replaceObjectAtIndex:i withObject:[NSString stringWithFormat:@"%*s%@",
+                    ([stack count] - 2) * 3, "",
+                    [file substringFromIndex:[directory length]]
+                ]];
+            }
+        }
+    }
 
-- (NSString *) name {
-    return name_;
+    [list_ reloadData];
 }
 
-- (size_t) row {
-    return row_;
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
 }
 
-- (NSArray *) packages {
-    return packages_;
+- (void) reloadData {
+    [self setPackage:[database_ packageWithName:name_]];
+    [self reloadButtons];
 }
 
-- (size_t) count {
-    return [packages_ count];
+- (NSString *) title {
+    return @"Installed Files";
 }
 
-- (void) addPackage:(Package *)package {
-    [packages_ addObject:package];
+- (NSString *) backButtonTitle {
+    return @"Files";
 }
 
 @end
 /* }}} */
-
 /* Package View {{{ */
-@protocol PackageViewDelegate
-- (void) performPackage:(Package *)package;
-@end
-
-@interface PackageView : UIView {
-    UIPreferencesTable *table_;
+@interface PackageView : BrowserView {
     Package *package_;
-    UITextView *description_;
-    id delegate_;
+    NSString *name_;
+    NSMutableArray *buttons_;
 }
 
-- (void) dealloc;
-
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table;
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group;
-- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed;
-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group;
-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group;
-
-- (BOOL) canSelectRow:(int)row;
-- (void) tableRowSelected:(NSNotification *)notification;
-
-- (Package *) package;
-
-- (id) initWithFrame:(struct CGRect)frame;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
 - (void) setPackage:(Package *)package;
-- (void) setDelegate:(id)delegate;
+
 @end
 
 @implementation PackageView
@@ -1286,134 +3335,81 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (void) dealloc {
     if (package_ != nil)
         [package_ release];
-    if (description_ != nil)
-        [description_ release];
-    [table_ release];
+    if (name_ != nil)
+        [name_ release];
+    [buttons_ release];
     [super dealloc];
 }
 
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
-    return 2;
+- (void) _clickButtonWithName:(NSString *)name {
+    if ([name isEqualToString:@"Install"])
+        [delegate_ installPackage:package_];
+    else if ([name isEqualToString:@"Reinstall"])
+        [delegate_ installPackage:package_];
+    else if ([name isEqualToString:@"Remove"])
+        [delegate_ removePackage:package_];
+    else if ([name isEqualToString:@"Upgrade"])
+        [delegate_ installPackage:package_];
+    else _assert(false);
 }
 
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
-    switch (group) {
-        case 0: return nil;
-        case 1: return @"Details";
-        case 2: return @"Source";
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    int count = [buttons_ count];
+    _assert(count != 0);
+    _assert(button <= count + 1);
 
-        default: _assert(false);
-    }
-}
+    if (count != button - 1)
+        [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];
 
-- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
-    if (group != 0 || row != 1)
-        return proposed;
-    else
-        return [description_ visibleTextRect].size.height + TextViewOffset_;
+    [sheet dismiss];
 }
 
-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
-    switch (group) {
-        case 0: return [package_ website] == nil ? 2 : 3;
-        case 1: return 5;
-        case 2: return 0;
-
-        default: _assert(false);
-    }
+- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
+    [[frame windowObject] evaluateWebScript:@"document.base.target = '_top'"];
+    return [super webView:sender didFinishLoadForFrame:frame];
 }
 
-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
-    UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
-    [cell setShowSelection:NO];
-
-    switch (group) {
-        case 0: switch (row) {
-            case 0:
-                [cell setTitle:[package_ name]];
-                [cell setValue:[package_ latest]];
-            break;
-
-            case 1:
-                [cell addSubview:description_];
-            break;
-
-            case 2:
-                [cell setTitle:@"More Information"];
-                [cell setShowDisclosure:YES];
-                [cell setShowSelection:YES];
-            break;
-
-            default: _assert(false);
-        } break;
-
-        case 1: switch (row) {
-            case 0:
-                [cell setTitle:@"Identifier"];
-                [cell setValue:[package_ id]];
-            break;
-
-            case 1: {
-                [cell setTitle:@"Installed Version"];
-                NSString *installed([package_ installed]);
-                [cell setValue:(installed == nil ? @"n/a" : installed)];
-            } break;
-
-            case 2:
-                [cell setTitle:@"Section"];
-                [cell setValue:[package_ section]];
-            break;
-
-            case 3:
-                [cell setTitle:@"Expanded Size"];
-                [cell setValue:SizeString([package_ size])];
-            break;
-
-            case 4:
-                [cell setTitle:@"Maintainer"];
-                [cell setValue:[[package_ maintainer] name]];
-                [cell setShowDisclosure:YES];
-                [cell setShowSelection:YES];
-            break;
+- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+    [window setValue:package_ forKey:@"package"];
+}
 
-            default: _assert(false);
-        } break;
+- (void) _rightButtonClicked {
+    /*[super _rightButtonClicked];
+    return;*/
 
-        case 2: switch (row) {
-        } break;
+    int count = [buttons_ count];
+    _assert(count != 0);
 
-        default: _assert(false);
+    if (count == 1)
+        [self _clickButtonWithName:[buttons_ objectAtIndex:0]];
+    else {
+        NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)];
+        [buttons addObjectsFromArray:buttons_];
+        [buttons addObject:@"Cancel"];
+
+        [delegate_ slideUp:[[[UIActionSheet alloc]
+            initWithTitle:nil
+            buttons:buttons
+            defaultButtonIndex:2
+            delegate:self
+            context:@"manage"
+        ] autorelease]];
     }
-
-    return cell;
 }
 
-- (BOOL) canSelectRow:(int)row {
-    return YES;
-}
-
-- (void) tableRowSelected:(NSNotification *)notification {
-    switch ([table_ selectedRow]) {
-        case 8:
-            [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
-                [[package_ maintainer] email],
-                [[NSString stringWithFormat:@"regarding apt package \"%@\"", [package_ name]] stringByAddingPercentEscapes]
-            ]]];
-        break;
-    }
+- (NSString *) _rightButtonTitle {
+    int count = [buttons_ count];
+    return count == 0 ? nil : count != 1 ? @"Modify" : [buttons_ objectAtIndex:0];
 }
 
-- (Package *) package {
-    return package_;
+- (NSString *) title {
+    return @"Details";
 }
 
-- (id) initWithFrame:(struct CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]];
-        [self addSubview:table_];
-
-        [table_ setDataSource:self];
-        [table_ setDelegate:self];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book database:database]) != nil) {
+        database_ = database;
+        buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
     } return self;
 }
 
@@ -1423,971 +3419,1330 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         package_ = nil;
     }
 
-    if (description_ != nil) {
-        [description_ release];
-        description_ = nil;
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
     }
 
+    [buttons_ removeAllObjects];
+
     if (package != nil) {
         package_ = [package retain];
+        name_ = [[package id] retain];
 
-        NSString *description([package description]);
-        if (description == nil)
-            description = [package tagline];
-        description_ = [GetTextView(description, 12, true) retain];
-
-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-        CGColor black(space, 0, 0, 0, 1);
-        [description_ setTextColor:black];
-        CGColorSpaceRelease(space);
+        [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]];
 
-        [table_ reloadData];
+        if ([package_ source] == nil);
+        else if ([package_ upgradableAndEssential:NO])
+            [buttons_ addObject:@"Upgrade"];
+        else if ([package_ installed] == nil)
+            [buttons_ addObject:@"Install"];
+        else
+            [buttons_ addObject:@"Reinstall"];
+        if ([package_ installed] != nil)
+            [buttons_ addObject:@"Remove"];
     }
 }
 
-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
+- (void) reloadData {
+    [self setPackage:[database_ packageWithName:name_]];
+    [self reloadButtons];
 }
 
 @end
 /* }}} */
-/* Package Cell {{{ */
-@interface PackageCell : UITableCell {
-    UITextLabel *name_;
-    UITextLabel *version_;
-    UITextLabel *description_;
-    SEL versioner_;
+/* Package Table {{{ */
+@interface PackageTable : RVPage {
+    _transient Database *database_;
+    NSString *title_;
+    SEL filter_;
+    id object_;
+    NSMutableArray *packages_;
+    NSMutableArray *sections_;
+    UISectionList *list_;
 }
 
-- (void) dealloc;
+- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object;
 
-- (PackageCell *) initWithVersioner:(SEL)versioner;
-- (void) setPackage:(Package *)package;
+- (void) setDelegate:(id)delegate;
+- (void) setObject:(id)object;
+
+- (void) reloadData;
+- (void) resetCursor;
 
-- (void) _setSelected:(float)fraction;
-- (void) setSelected:(BOOL)selected;
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
-- (void) _setSelectionFadeFraction:(float)fraction;
+- (UISectionList *) list;
+
+- (void) setShouldHideHeaderInShortLists:(BOOL)hide;
 
 @end
 
-@implementation PackageCell
+@implementation PackageTable
 
 - (void) dealloc {
-    [name_ release];
-    [version_ release];
-    [description_ release];
+    [list_ setDataSource:nil];
+
+    [title_ release];
+    if (object_ != nil)
+        [object_ release];
+    [packages_ release];
+    [sections_ release];
+    [list_ release];
     [super dealloc];
 }
 
-- (PackageCell *) initWithVersioner:(SEL)versioner {
-    if ((self = [super init]) != nil) {
-        versioner_ = versioner;
+- (int) numberOfSectionsInSectionList:(UISectionList *)list {
+    return [sections_ count];
+}
+
+- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
+    return [[sections_ objectAtIndex:section] name];
+}
+
+- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
+    return [[sections_ objectAtIndex:section] row];
+}
+
+- (int) numberOfRowsInTable:(UITable *)table {
+    return [packages_ count];
+}
+
+- (float) table:(UITable *)table heightForRow:(int)row {
+    return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];
+}
 
-        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
-        GSFontRef large = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
-        GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14);
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
+    if (reusing == nil)
+        reusing = [[[PackageCell alloc] init] autorelease];
+    [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]];
+    return reusing;
+}
+
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
+    return NO;
+}
+
+- (void) tableRowSelected:(NSNotification *)notification {
+    int row = [[notification object] selectedRow];
+    if (row == INT_MAX)
+        return;
 
-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+    Package *package = [packages_ objectAtIndex:row];
+    PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+    [view setDelegate:delegate_];
+    [view setPackage:package];
+    [book_ pushPage:view];
+}
 
-        CGColor clear(space, 0, 0, 0, 0);
+- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+        title_ = [title retain];
+        filter_ = filter;
+        object_ = object == nil ? nil : [object retain];
 
-        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 7, 250, 25)];
-        [name_ setBackgroundColor:clear];
-        [name_ setFont:bold];
+        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
-        version_ = [[UIRightTextLabel alloc] initWithFrame:CGRectMake(286, 7, 70, 25)];
-        [version_ setBackgroundColor:clear];
-        [version_ setFont:large];
+        list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:YES];
+        [list_ setDataSource:self];
 
-        description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(13, 35, 315, 20)];
-        [description_ setBackgroundColor:clear];
-        [description_ setFont:small];
+        UITableColumn *column = [[[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:[self frame].size.width
+        ] autorelease];
 
-        [self addSubview:name_];
-        [self addSubview:version_];
-        [self addSubview:description_];
+        UITable *table = [list_ table];
+        [table setSeparatorStyle:1];
+        [table addTableColumn:column];
+        [table setDelegate:self];
+        [table setReusesTableCells:YES];
 
-        CGColorSpaceRelease(space);
+        [self addSubview:list_];
+        [self reloadData];
 
-        CFRelease(small);
-        CFRelease(large);
-        CFRelease(bold);
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
     } return self;
 }
 
-- (void) setPackage:(Package *)package {
-    [name_ setText:[package name]];
-    [version_ setText:[package latest]];
-    [description_ setText:[package tagline]];
+- (void) setDelegate:(id)delegate {
+    delegate_ = delegate;
 }
 
-- (void) _setSelected:(float)fraction {
-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+- (void) setObject:(id)object {
+    if (object_ != nil)
+        [object_ release];
+    if (object == nil)
+        object_ = nil;
+    else
+        object_ = [object retain];
+}
+
+- (void) reloadData {
+    NSArray *packages = [database_ packages];
+
+    [packages_ removeAllObjects];
+    [sections_ removeAllObjects];
+
+    for (size_t i(0); i != [packages count]; ++i) {
+        Package *package([packages objectAtIndex:i]);
+        if ([package valid] && [[package performSelector:filter_ withObject:object_] boolValue])
+            [packages_ addObject:package];
+    }
+
+    Section *section = nil;
+
+    for (size_t offset(0); offset != [packages_ count]; ++offset) {
+        Package *package = [packages_ objectAtIndex:offset];
+        NSString *name = [package index];
 
-    CGColor black(space,
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-    1.0);
+        if (section == nil || ![[section name] isEqualToString:name]) {
+            section = [[[Section alloc] initWithName:name row:offset] autorelease];
+            [sections_ addObject:section];
+        }
 
-    CGColor blue(space,
-        interpolate(0.2, 1.0, fraction),
-        interpolate(0.2, 1.0, fraction),
-        interpolate(1.0, 1.0, fraction),
-    1.0);
+        [section addToCount];
+    }
 
-    CGColor gray(space,
-        interpolate(0.4, 1.0, fraction),
-        interpolate(0.4, 1.0, fraction),
-        interpolate(0.4, 1.0, fraction),
-    1.0);
+    [list_ reloadData];
+}
 
-    [name_ setColor:black];
-    [version_ setColor:blue];
-    [description_ setColor:gray];
+- (NSString *) title {
+    return title_;
+}
 
-    CGColorSpaceRelease(space);
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
 }
 
-- (void) setSelected:(BOOL)selected {
-    [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected];
+- (void) resetCursor {
+    [[list_ table] scrollPointVisibleAtTopLeft:CGPointMake(0, 0) animated:NO];
 }
 
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
-    if (!fade)
-        [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected withFade:fade];
+- (UISectionList *) list {
+    return list_;
 }
 
-- (void) _setSelectionFadeFraction:(float)fraction {
-    [self _setSelected:fraction];
-    [super _setSelectionFadeFraction:fraction];
+- (void) setShouldHideHeaderInShortLists:(BOOL)hide {
+    [list_ setShouldHideHeaderInShortLists:hide];
 }
 
 @end
 /* }}} */
 
-/* Database Implementation {{{ */
-@implementation Database
+/* Add Source View {{{ */
+@interface AddSourceView : RVPage {
+    _transient Database *database_;
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+
+@end
+
+@implementation AddSourceView
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+    } return self;
+}
+
+@end
+/* }}} */
+/* Source Cell {{{ */
+@interface SourceCell : UITableCell {
+    UIImage *icon_;
+    NSString *origin_;
+    NSString *description_;
+    NSString *label_;
+}
+
+- (void) dealloc;
+
+- (SourceCell *) initWithSource:(Source *)source;
+
+@end
+
+@implementation SourceCell
 
 - (void) dealloc {
-    _assert(false);
+    [icon_ release];
+    [origin_ release];
+    [description_ release];
+    [label_ release];
     [super dealloc];
 }
 
-- (void) _readStatus:(NSNumber *)fd {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (SourceCell *) initWithSource:(Source *)source {
+    if ((self = [super init]) != nil) {
+        if (icon_ == nil)
+            icon_ = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sources/%@.png", [source host]]];
+        if (icon_ == nil)
+            icon_ = [UIImage applicationImageNamed:@"unknown.png"];
+        icon_ = [icon_ retain];
+
+        origin_ = [[source name] retain];
+        label_ = [[source uri] retain];
+        description_ = [[source description] retain];
+    } return self;
+}
 
-    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
-    std::istream is(&ib);
-    std::string line;
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+    if (icon_ != nil)
+        [icon_ drawInRect:CGRectMake(10, 10, 30, 30)];
 
-    const char *error;
-    int offset;
-    pcre *code = pcre_compile("^([^:]*):([^:]*):([^:]*):(.*)$", 0, &error, &offset, NULL);
+    if (selected)
+        UISetColor(White_);
 
-    pcre_extra *study = NULL;
-    int capture;
-    pcre_fullinfo(code, study, PCRE_INFO_CAPTURECOUNT, &capture);
-    int matches[(capture + 1) * 3];
+    if (!selected)
+        UISetColor(Black_);
+    [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2];
 
-    while (std::getline(is, line)) {
-        const char *data(line.c_str());
+    if (!selected)
+        UISetColor(Blue_);
+    [label_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2];
 
-        _assert(pcre_exec(code, study, data, line.size(), 0, 0, matches, sizeof(matches) / sizeof(matches[0])) >= 0);
+    if (!selected)
+        UISetColor(Gray_);
+    [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
 
-        std::istringstream buffer(line.substr(matches[6], matches[7] - matches[6]));
-        float percent;
-        buffer >> percent;
-        [delegate_ setPercent:(percent / 100)];
+    [super drawContentInRect:rect selected:selected];
+}
+
+@end
+/* }}} */
+/* Source Table {{{ */
+@interface SourceTable : RVPage {
+    _transient Database *database_;
+    UISectionList *list_;
+    NSMutableArray *sources_;
+    UIActionSheet *alert_;
+    int offset_;
 
-        NSString *string = [NSString stringWithCString:(data + matches[8]) length:(matches[9] - matches[8])];
-        std::string type(line.substr(matches[2], matches[3] - matches[2]));
+    NSString *href_;
+    UIProgressHUD *hud_;
+    NSError *error_;
 
-        if (type == "pmerror")
-            [delegate_ setError:string];
-        else if (type == "pmstatus")
-            [delegate_ setTitle:string];
-        else if (type == "pmconffile")
-            ;
-        else _assert(false);
-    }
+    //NSURLConnection *installer_;
+    NSURLConnection *trivial_bz2_;
+    NSURLConnection *trivial_gz_;
+    //NSURLConnection *automatic_;
 
-    [pool release];
-    _assert(false);
+    BOOL trivial_;
 }
 
-- (void) _readOutput:(NSNumber *)fd {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
 
-    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
-    std::istream is(&ib);
-    std::string line;
+@end
 
-    while (std::getline(is, line))
-        [delegate_ addOutput:[NSString stringWithCString:line.c_str()]];
+@implementation SourceTable
 
-    [pool release];
-    _assert(false);
+- (void) _deallocConnection:(NSURLConnection *)connection {
+    if (connection != nil) {
+        [connection cancel];
+        //[connection setDelegate:nil];
+        [connection release];
+    }
 }
 
-- (Package *) packageWithName:(NSString *)name {
-    pkgCache::PkgIterator iterator(cache_->FindPkg([name cString]));
-    return iterator.end() ? nil : [Package packageWithIterator:iterator database:self];
+- (void) dealloc {
+    [[list_ table] setDelegate:nil];
+    [list_ setDataSource:nil];
+
+    if (href_ != nil)
+        [href_ release];
+    if (hud_ != nil)
+        [hud_ release];
+    if (error_ != nil)
+        [error_ release];
+
+    //[self _deallocConnection:installer_];
+    [self _deallocConnection:trivial_gz_];
+    [self _deallocConnection:trivial_bz2_];
+    //[self _deallocConnection:automatic_];
+
+    [sources_ release];
+    [list_ release];
+    [super dealloc];
 }
 
-- (Database *) init {
-    if ((self = [super init]) != nil) {
-        records_ = NULL;
-        resolver_ = NULL;
-        fetcher_ = NULL;
-        lock_ = NULL;
-
-        int fds[2];
+- (int) numberOfSectionsInSectionList:(UISectionList *)list {
+    return offset_ == 0 ? 1 : 2;
+}
 
-        _assert(pipe(fds) != -1);
-        statusfd_ = fds[1];
+- (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";
 
-        [NSThread
-            detachNewThreadSelector:@selector(_readStatus:)
-            toTarget:self
-            withObject:[[NSNumber numberWithInt:fds[0]] retain]
-        ];
+        default:
+            _assert(false);
+            return nil;
+    }
+}
 
-        _assert(pipe(fds) != -1);
-        _assert(dup2(fds[1], 1) != -1);
-        _assert(close(fds[1]) != -1);
+- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
+    switch (section + (offset_ == 0 ? 1 : 0)) {
+        case 0: return 0;
+        case 1: return offset_;
 
-        [NSThread
-            detachNewThreadSelector:@selector(_readOutput:)
-            toTarget:self
-            withObject:[[NSNumber numberWithInt:fds[0]] retain]
-        ];
-    } return self;
+        default:
+            _assert(false);
+            return -1;
+    }
 }
 
-- (pkgCacheFile &) cache {
-    return cache_;
+- (int) numberOfRowsInTable:(UITable *)table {
+    return [sources_ count];
 }
 
-- (pkgRecords *) records {
-    return records_;
+- (float) table:(UITable *)table heightForRow:(int)row {
+    Source *source = [sources_ objectAtIndex:row];
+    return [source description] == nil ? 56 : 73;
 }
 
-- (pkgProblemResolver *) resolver {
-    return resolver_;
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col {
+    Source *source = [sources_ objectAtIndex:row];
+    // XXX: weird warning, stupid selectors ;P
+    return [[[SourceCell alloc] initWithSource:(id)source] autorelease];
 }
 
-- (pkgAcquire &) fetcher {
-    return *fetcher_;
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
+    return YES;
 }
 
-- (void) reloadData {
-    _error->Discard();
-    manager_ = NULL;
-    delete lock_;
-    delete fetcher_;
-    delete resolver_;
-    delete records_;
-    cache_.Close();
-    _assert(cache_.Open(progress_, true));
-    records_ = new pkgRecords(cache_);
-    resolver_ = new pkgProblemResolver(cache_);
-    fetcher_ = new pkgAcquire(&status_);
-    lock_ = NULL;
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
+    return YES;
 }
 
-- (void) prepare {
-    pkgRecords records(cache_);
+- (void) tableRowSelected:(NSNotification*)notification {
+    UITable *table([list_ table]);
+    int row([table selectedRow]);
+    if (row == INT_MAX)
+        return;
 
-    lock_ = new FileFd();
-    lock_->Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
-    _assert(!_error->PendingError());
+    Source *source = [sources_ objectAtIndex:row];
 
-    pkgSourceList list;
-    _assert(list.ReadMainList());
+    PackageTable *packages = [[[PackageTable alloc]
+        initWithBook:book_
+        database:database_
+        title:[source label]
+        filter:@selector(isVisibleInSource:)
+        with:source
+    ] autorelease];
 
-    manager_ = (_system->CreatePM(cache_));
-    _assert(manager_->GetArchives(fetcher_, &list, &records));
-    _assert(!_error->PendingError());
+    [packages setDelegate:delegate_];
+
+    [book_ pushPage:packages];
 }
 
-- (void) perform {
-    if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue)
-        return;
+- (BOOL) table:(UITable *)table canDeleteRow:(int)row {
+    Source *source = [sources_ objectAtIndex:row];
+    return [source record] != nil;
+}
 
-    _system->UnLock();
-    pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_);
+- (void) table:(UITable *)table willSwipeToDeleteRow:(int)row {
+    [[list_ table] setDeleteConfirmationRow:row];
+}
 
-    if (result == pkgPackageManager::Failed)
-        return;
-    if (_error->PendingError())
-        return;
-    if (result != pkgPackageManager::Completed)
-        return;
+- (void) table:(UITable *)table deleteRow:(int)row {
+    Source *source = [sources_ objectAtIndex:row];
+    [Sources_ removeObjectForKey:[source key]];
+    [delegate_ syncData];
 }
 
-- (void) update {
-    pkgSourceList list;
-    _assert(list.ReadMainList());
+- (void) _endConnection:(NSURLConnection *)connection {
+    NSURLConnection **field = NULL;
+    if (connection == trivial_bz2_)
+        field = &trivial_bz2_;
+    else if (connection == trivial_gz_)
+        field = &trivial_gz_;
+    _assert(field != NULL);
+    [connection release];
+    *field = nil;
 
-    FileFd lock;
-    lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
-    _assert(!_error->PendingError());
+    if (
+        trivial_bz2_ == nil &&
+        trivial_gz_ == nil
+    ) {
+        [delegate_ setStatusBarShowsProgress:NO];
 
-    pkgAcquire fetcher(&status_);
-    _assert(list.GetIndexes(&fetcher));
-    _assert(fetcher.Run(PulseInterval_) != pkgAcquire::Failed);
+        [hud_ show:NO];
+        [hud_ removeFromSuperview];
+        [hud_ autorelease];
+        hud_ = nil;
 
-    bool failed = false;
-    for (pkgAcquire::ItemIterator item = fetcher.ItemsBegin(); item != fetcher.ItemsEnd(); item++)
-        if ((*item)->Status != pkgAcquire::Item::StatDone) {
-            (*item)->Finished();
-            failed = true;
-        }
+        if (trivial_) {
+            [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys:
+                @"deb", @"Type",
+                href_, @"URI",
+                @"./", @"Distribution",
+            nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]];
 
-    if (!failed && _config->FindB("APT::Get::List-Cleanup", true) == true) {
-        _assert(fetcher.Clean(_config->FindDir("Dir::State::lists")));
-        _assert(fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/"));
-    }
+            [delegate_ syncData];
+        } else if (error_ != nil) {
+            UIActionSheet *sheet = [[[UIActionSheet alloc]
+                initWithTitle:@"Verification Error"
+                buttons:[NSArray arrayWithObjects:@"OK", nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"urlerror"
+            ] autorelease];
 
-    [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
-}
+            [sheet setBodyText:[error_ localizedDescription]];
+            [sheet popupAlertAnimated:YES];
+        } else {
+            UIActionSheet *sheet = [[[UIActionSheet alloc]
+                initWithTitle:@"Did not Find Repository"
+                buttons:[NSArray arrayWithObjects:@"OK", nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"trivial"
+            ] autorelease];
 
-- (void) upgrade {
-    _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
-    _assert(pkgApplyStatus(cache_));
+            [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 popupAlertAnimated:YES];
+        }
 
-    if (cache_->BrokenCount() != 0) {
-        _assert(pkgFixBroken(cache_));
-        _assert(cache_->BrokenCount() == 0);
-        _assert(pkgMinimizeUpgrade(cache_));
-    }
+        [href_ release];
+        href_ = nil;
 
-    _assert(pkgDistUpgrade(cache_));
+        if (error_ != nil) {
+            [error_ release];
+            error_ = nil;
+        }
+    }
 }
 
-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
-    status_.setDelegate(delegate);
-    progress_.setDelegate(delegate);
+- (void) connection:(NSURLConnection *)connection didReceiveResponse:(NSHTTPURLResponse *)response {
+    switch ([response statusCode]) {
+        case 200:
+            trivial_ = YES;
+    }
 }
 
-@end
-/* }}} */
-
-/* Progress Data {{{ */
-@interface ProgressData : NSObject {
-    SEL selector_;
-    id target_;
-    id object_;
+- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
+    fprintf(stderr, "connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]);
+    if (error_ != nil)
+        error_ = [error retain];
+    [self _endConnection:connection];
 }
 
-- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object;
+- (void) connectionDidFinishLoading:(NSURLConnection *)connection {
+    [self _endConnection:connection];
+}
 
-- (SEL) selector;
-- (id) target;
-- (id) object;
-@end
+- (NSURLConnection *) _requestHRef:(NSString *)href method:(NSString *)method {
+    NSMutableURLRequest *request = [NSMutableURLRequest
+        requestWithURL:[NSURL URLWithString:href]
+        cachePolicy:NSURLRequestUseProtocolCachePolicy
+        timeoutInterval:20.0
+    ];
 
-@implementation ProgressData
+    [request setHTTPMethod:method];
 
-- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object {
-    if ((self = [super init]) != nil) {
-        selector_ = selector;
-        target_ = target;
-        object_ = object;
-    } return self;
+    return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
 }
 
-- (SEL) selector {
-    return selector_;
-}
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context = [sheet context];
+    if ([context isEqualToString:@"source"])
+        switch (button) {
+            case 1: {
+                NSString *href = [[sheet textField] text];
 
-- (id) target {
-    return target_;
-}
+                //installer_ = [[self _requestHRef:href method:@"GET"] retain];
 
-- (id) object {
-    return object_;
-}
+                if (![href hasSuffix:@"/"])
+                    href_ = [href stringByAppendingString:@"/"];
+                else
+                    href_ = href;
+                href_ = [href_ retain];
 
-@end
-/* }}} */
-/* Progress View {{{ */
-@interface ProgressView : UIView <
-    ProgressDelegate
-> {
-    UIView *view_;
-    UIView *background_;
-    UITransitionView *transition_;
-    UIView *overlay_;
-    UINavigationBar *navbar_;
-    UIProgressBar *progress_;
-    UITextView *output_;
-    UITextLabel *status_;
-    id delegate_;
-}
+                trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.bz2"] method:@"HEAD"] retain];
+                trivial_gz_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.gz"] method:@"HEAD"] retain];
+                //trivial_bz2_ = [[self _requestHRef:[href stringByAppendingString:@"dists/Release"] method:@"HEAD"] retain];
 
-- (void) dealloc;
+                trivial_ = false;
 
-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
+                hud_ = [delegate_ addProgressHUD];
+                [hud_ setText:@"Verifying URL"];
+            } break;
 
-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate;
-- (void) setContentView:(UIView *)view;
-- (void) resetView;
+            case 2:
+            break;
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
+            default:
+                _assert(false);
+        }
 
-- (void) _retachThread;
-- (void) _detachNewThreadData:(ProgressData *)data;
-- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title;
+    [sheet dismiss];
+}
 
-- (void) setError:(NSString *)error;
-- (void) _setError:(NSString *)error;
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+        sources_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
-- (void) setTitle:(NSString *)title;
-- (void) _setTitle:(NSString *)title;
+        //list_ = [[UITable alloc] initWithFrame:[self bounds]];
+        list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:NO];
+        [list_ setShouldHideHeaderInShortLists:NO];
 
-- (void) setPercent:(float)percent;
-- (void) _setPercent:(NSNumber *)percent;
+        [self addSubview:list_];
+        [list_ setDataSource:self];
 
-- (void) addOutput:(NSString *)output;
-- (void) _addOutput:(NSString *)output;
-@end
+        UITableColumn *column = [[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:[self frame].size.width
+        ];
 
-@protocol ProgressViewDelegate
-- (void) progressViewIsComplete:(ProgressView *)sender;
-@end
+        UITable *table = [list_ table];
+        [table setSeparatorStyle:1];
+        [table addTableColumn:column];
+        [table setDelegate:self];
 
-@implementation ProgressView
+        [self reloadData];
 
-- (void) dealloc {
-    [view_ release];
-    if (background_ != nil)
-        [background_ release];
-    [transition_ release];
-    [overlay_ release];
-    [navbar_ release];
-    [progress_ release];
-    [output_ release];
-    [status_ release];
-    [super dealloc];
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+    } return self;
 }
 
-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
-    if (bootstrap_ && from == overlay_ && to == view_)
-        exit(0);
-}
+- (void) reloadData {
+    pkgSourceList list;
+    _assert(list.ReadMainList());
 
-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        delegate_ = delegate;
+    [sources_ removeAllObjects];
+    [sources_ addObjectsFromArray:[database_ sources]];
+    [sources_ sortUsingSelector:@selector(compareByNameAndType:)];
+
+    int count = [sources_ count];
+    for (offset_ = 0; offset_ != count; ++offset_) {
+        Source *source = [sources_ objectAtIndex:offset_];
+        if ([source record] == nil)
+            break;
+    }
 
-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+    [list_ reloadData];
+}
 
-        CGColor black(space, 0.0, 0.0, 0.0, 1.0);
-        CGColor white(space, 1.0, 1.0, 1.0, 1.0);
-        CGColor clear(space, 0.0, 0.0, 0.0, 0.0);
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
+}
 
-        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
-        [transition_ setDelegate:self];
+- (void) _leftButtonClicked {
+    /*[book_ pushPage:[[[AddSourceView alloc]
+        initWithBook:book_
+        database:database_
+    ] autorelease]];*/
 
-        overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+    UIActionSheet *sheet = [[[UIActionSheet alloc]
+        initWithTitle:@"Enter Cydia/APT URL"
+        buttons:[NSArray arrayWithObjects:@"Add Source", @"Cancel", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"source"
+    ] autorelease];
 
-        if (bootstrap_)
-            [overlay_ setBackgroundColor:black];
-        else {
-            background_ = [[UIView alloc] initWithFrame:[self bounds]];
-            [background_ setBackgroundColor:black];
-            [self addSubview:background_];
-        }
+    [sheet addTextFieldWithValue:@"http://" label:@""];
 
-        [self addSubview:transition_];
+    UITextInputTraits *traits = [[sheet textField] textInputTraits];
+    [traits setAutocapitalizationType:0];
+    [traits setKeyboardType:3];
+    [traits setAutocorrectionType:1];
 
-        CGSize navsize = [UINavigationBar defaultSize];
-        CGRect navrect = {{0, 0}, navsize};
+    [sheet popupAlertAnimated:YES];
+}
 
-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [overlay_ addSubview:navbar_];
+- (void) _rightButtonClicked {
+    UITable *table = [list_ table];
+    BOOL editing = [table isRowDeletionEnabled];
+    [table enableRowDeletion:!editing animated:YES];
+    [book_ reloadButtonsForPage:self];
+}
 
-        [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
+- (NSString *) title {
+    return @"Sources";
+}
 
-        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:nil] autorelease];
-        [navbar_ pushNavigationItem:navitem];
+- (NSString *) backButtonTitle {
+    return @"Sources";
+}
 
-        CGRect bounds = [overlay_ bounds];
-        CGSize prgsize = [UIProgressBar defaultSize];
+- (NSString *) leftButtonTitle {
+    return [[list_ table] isRowDeletionEnabled] ? @"Add" : nil;
+}
 
-        CGRect prgrect = {{
-            (bounds.size.width - prgsize.width) / 2,
-            bounds.size.height - prgsize.height - 20
-        }, prgsize};
+- (NSString *) rightButtonTitle {
+    return [[list_ table] isRowDeletionEnabled] ? @"Done" : @"Edit";
+}
 
-        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
-        [overlay_ addSubview:progress_];
+- (UINavigationButtonStyle) rightButtonStyle {
+    return [[list_ table] isRowDeletionEnabled] ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
+}
 
-        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(
-            10,
-            bounds.size.height - prgsize.height - 50,
-            bounds.size.width - 20,
-            24
-        )];
+@end
+/* }}} */
 
-        [status_ setColor:white];
-        [status_ setBackgroundColor:clear];
+/* Installed View {{{ */
+@interface InstalledView : RVPage {
+    _transient Database *database_;
+    PackageTable *packages_;
+    BOOL expert_;
+}
 
-        [status_ setCentersHorizontally:YES];
-        //[status_ setFont:font];
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
 
-        output_ = [[UITextView alloc] initWithFrame:CGRectMake(
-            10,
-            navrect.size.height + 20,
-            bounds.size.width - 20,
-            bounds.size.height - navsize.height - 62 - navrect.size.height
-        )];
+@end
 
-        //[output_ setTextFont:@"Courier New"];
-        [output_ setTextSize:12];
+@implementation InstalledView
 
-        [output_ setTextColor:white];
-        [output_ setBackgroundColor:clear];
+- (void) dealloc {
+    [packages_ release];
+    [super dealloc];
+}
 
-        [output_ setMarginTop:0];
-        [output_ setAllowsRubberBanding:YES];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
 
-        [overlay_ addSubview:output_];
-        [overlay_ addSubview:status_];
+        packages_ = [[PackageTable alloc]
+            initWithBook:book
+            database:database
+            title:nil
+            filter:@selector(isInstalledAndVisible:)
+            with:[NSNumber numberWithBool:YES]
+        ];
 
-        [progress_ setStyle:0];
+        [self addSubview:packages_];
 
-        CGColorSpaceRelease(space);
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
     } return self;
 }
 
-- (void) setContentView:(UIView *)view {
-    view_ = [view retain];
+- (void) resetViewAnimated:(BOOL)animated {
+    [packages_ resetViewAnimated:animated];
 }
 
-- (void) resetView {
-    [transition_ transition:6 toView:view_];
+- (void) reloadData {
+    [packages_ reloadData];
 }
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [sheet dismiss];
+- (void) _rightButtonClicked {
+    [packages_ setObject:[NSNumber numberWithBool:expert_]];
+    [packages_ reloadData];
+    expert_ = !expert_;
+    [book_ reloadButtonsForPage:self];
 }
 
-- (void) _retachThread {
-    [delegate_ progressViewIsComplete:self];
-    [self resetView];
+- (NSString *) title {
+    return @"Installed";
 }
 
-- (void) _detachNewThreadData:(ProgressData *)data {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (NSString *) backButtonTitle {
+    return @"Packages";
+}
 
-    [[data target] performSelector:[data selector] withObject:[data object]];
-    [data release];
+- (NSString *) rightButtonTitle {
+    return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? @"Expert" : @"Simple";
+}
 
-    [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES];
+- (UINavigationButtonStyle) rightButtonStyle {
+    return expert_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
+}
 
-    [pool release];
+- (void) setDelegate:(id)delegate {
+    [super setDelegate:delegate];
+    [packages_ setDelegate:delegate];
 }
 
-- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title {
-    [navbar_ popNavigationItem];
-    UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:title] autorelease];
-    [navbar_ pushNavigationItem:navitem];
+@end
+/* }}} */
 
-    [status_ setText:nil];
-    [output_ setText:@""];
-    [progress_ setProgress:0];
+/* Home View {{{ */
+@interface HomeView : BrowserView {
+}
 
-    [transition_ transition:6 toView:overlay_];
+@end
 
-    [NSThread
-        detachNewThreadSelector:@selector(_detachNewThreadData:)
-        toTarget:self
-        withObject:[[ProgressData alloc]
-            initWithSelector:selector
-            target:target
-            object:object
-        ]
-    ];
-}
+@implementation HomeView
 
-- (void) setError:(NSString *)error {
-    [self
-        performSelectorOnMainThread:@selector(_setError:)
-        withObject:error
-        waitUntilDone:YES
-    ];
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    [sheet dismiss];
 }
 
-- (void) _setError:(NSString *)error {
-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-        initWithTitle:@"Package Error"
-        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+- (void) _leftButtonClicked {
+    UIActionSheet *sheet = [[[UIActionSheet alloc]
+        initWithTitle:@"About Cydia Installer"
+        buttons:[NSArray arrayWithObjects:@"Close", nil]
         defaultButtonIndex:0
         delegate:self
-        context:self
+        context:@"about"
     ] autorelease];
 
-    [sheet setBodyText:error];
+    [sheet setBodyText:
+        @"Copyright (C) 2008\n"
+        "Jay Freeman (saurik)\n"
+        "saurik@saurik.com\n"
+        "http://www.saurik.com/\n"
+        "\n"
+        "The Okori Group\n"
+        "http://www.theokorigroup.com/\n"
+        "\n"
+        "College of Creative Studies,\n"
+        "University of California,\n"
+        "Santa Barbara\n"
+        "http://www.ccs.ucsb.edu/"
+    ];
+
     [sheet popupAlertAnimated:YES];
 }
 
-- (void) setTitle:(NSString *)title {
-    [self
-        performSelectorOnMainThread:@selector(_setTitle:)
-        withObject:title
-        waitUntilDone:YES
-    ];
+- (NSString *) leftButtonTitle {
+    return @"About";
 }
 
-- (void) _setTitle:(NSString *)title {
-    [status_ setText:[title stringByAppendingString:@"..."]];
+@end
+/* }}} */
+/* Manage View {{{ */
+@interface ManageView : BrowserView {
 }
 
-- (void) setPercent:(float)percent {
-    [self
-        performSelectorOnMainThread:@selector(_setPercent:)
-        withObject:[NSNumber numberWithFloat:percent]
-        waitUntilDone:YES
-    ];
+@end
+
+@implementation ManageView
+
+- (NSString *) title {
+    return @"Manage";
 }
 
-- (void) _setPercent:(NSNumber *)percent {
-    [progress_ setProgress:[percent floatValue]];
+- (void) _leftButtonClicked {
+    [delegate_ askForSettings];
 }
 
-- (void) addOutput:(NSString *)output {
-    [self
-        performSelectorOnMainThread:@selector(_addOutput:)
-        withObject:output
-        waitUntilDone:YES
-    ];
+- (NSString *) leftButtonTitle {
+    return @"Settings";
 }
 
-- (void) _addOutput:(NSString *)output {
-    [output_ setText:[NSString stringWithFormat:@"%@\n%@", [output_ text], output]];
-    CGSize size = [output_ contentSize];
-    CGRect rect = {{0, size.height}, {size.width, 0}};
-    [output_ scrollRectToVisible:rect animated:YES];
+- (NSString *) _rightButtonTitle {
+    return nil;
 }
 
 @end
 /* }}} */
 
-/* Package Table {{{ */
-@protocol PackageTableDelegate
-- (void) packageTable:(id)table packageSelected:(Package *)package;
+/* Indirect Delegate {{{ */
+@interface IndirectDelegate : NSProxy {
+    _transient id delegate_;
+}
+
+- (void) setDelegate:(id)delegate;
+- (id) initWithDelegate:(id)delegate;
 @end
 
-@interface PackageTable : UIView {
-    SEL versioner_;
-    UISectionList *list_;
+@implementation IndirectDelegate
 
-    id delegate_;
-    NSArray *packages_;
-    NSMutableArray *sections_;
+- (void) setDelegate:(id)delegate {
+    delegate_ = delegate;
 }
 
-- (void) dealloc;
-
-- (int) numberOfSectionsInSectionList:(UISectionList *)list;
-- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section;
-- (int) sectionList:(UISectionList *)list rowForSection:(int)section;
+- (id) initWithDelegate:(id)delegate {
+    delegate_ = delegate;
+    return self;
+}
 
-- (int) numberOfRowsInTable:(UITable *)table;
-- (float) table:(UITable *)table heightForRow:(int)row;
-- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing;
-- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row;
-- (void) tableRowSelected:(NSNotification *)notification;
+- (void) doesNotRecognizeSelector:(SEL)sel {
+    fprintf(stderr, "doesNotRecognizeSelector:@selector(%s)", sel_getName(sel));
+}
 
-- (id) initWithFrame:(CGRect)frame versioner:(SEL)versioner;
+- (NSMethodSignature*) methodSignatureForSelector:(SEL)sel {
+    if (delegate_ != nil)
+        if (NSMethodSignature *sig = [delegate_ methodSignatureForSelector:sel])
+            return sig;
+    return nil;
+}
 
-- (void) setDelegate:(id)delegate;
-- (void) setPackages:(NSArray *)packages;
+- (void) forwardInvocation:(NSInvocation*)inv {
+    SEL sel = [inv selector];
+    if (delegate_ != nil && [delegate_ respondsToSelector:sel])
+        [inv invokeWithTarget:delegate_];
+}
 
-- (void) resetViewAnimated:(BOOL)animated;
-- (UITable *) table;
 @end
-
-@implementation PackageTable
+/* }}} */
+/* Browser Implementation {{{ */
+@implementation BrowserView
 
 - (void) dealloc {
-    [list_ release];
-    [sections_ release];
-    if (packages_ != nil)
-        [packages_ release];
+    WebView *webview = [webview_ webView];
+    [webview setFrameLoadDelegate:nil];
+    [webview setResourceLoadDelegate:nil];
+    [webview setUIDelegate:nil];
+
+    [webview_ setDelegate:nil];
+    [webview_ setGestureDelegate:nil];
+
+    /*WebFrame *frame = [webview mainFrame];
+    [frame loadHTMLString:@"" baseURL:[NSURL URLWithString:@"http://cydia.saurik.com/"]];*/
+
+    //[webview_ removeFromSuperview];
+    //[Documents_ addObject:[webview_ autorelease]];
+    [webview_ release];
+
+    [indirect_ setDelegate:nil];
+    [indirect_ release];
+
+    [scroller_ setDelegate:nil];
+
+    [scroller_ release];
+    [urls_ release];
+    [indicator_ release];
+    if (title_ != nil)
+        [title_ release];
     [super dealloc];
 }
 
-- (int) numberOfSectionsInSectionList:(UISectionList *)list {
-    return [sections_ count];
+- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
+    [self loadRequest:[NSURLRequest
+        requestWithURL:url
+        cachePolicy:policy
+        timeoutInterval:30.0
+    ]];
 }
 
-- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
-    return [[sections_ objectAtIndex:section] name];
+- (void) loadURL:(NSURL *)url {
+    [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy];
 }
 
-- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
-    return [[sections_ objectAtIndex:section] row];
-}
+- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request {
+    NSMutableURLRequest *copy = [request mutableCopy];
 
-- (int) numberOfRowsInTable:(UITable *)table {
-    return [packages_ count];
+    [copy addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"];
+    [copy addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
+    [copy addValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"];
+
+    if (Role_ != nil)
+        [copy addValue:Role_ forHTTPHeaderField:@"X-Role"];
+
+    return copy;
 }
 
-- (float) table:(UITable *)table heightForRow:(int)row {
-    return 64;
+- (void) loadRequest:(NSURLRequest *)request {
+    pushed_ = true;
+    [webview_ loadRequest:request];
 }
 
-- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
-    if (reusing == nil)
-        reusing = [[[PackageCell alloc] initWithVersioner:versioner_] autorelease];
-    [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]];
-    return reusing;
+- (void) reloadURL {
+    if ([urls_ count] == 0)
+        return;
+    NSURL *url = [[[urls_ lastObject] retain] autorelease];
+    [urls_ removeLastObject];
+    [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData];
 }
 
-- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
-    return NO;
+- (WebView *) webView {
+    return [webview_ webView];
 }
 
-- (void) tableRowSelected:(NSNotification *)notification {
-    int row = [[notification object] selectedRow];
-    [delegate_ packageTable:self packageSelected:(row == INT_MAX ? nil : [packages_ objectAtIndex:row])];
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame {
+    [scroller_ setContentSize:frame.size];
 }
 
-- (id) initWithFrame:(CGRect)frame versioner:(SEL)versioner {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        versioner_ = versioner;
-        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
+    [self view:sender didSetFrame:frame];
+}
 
-        list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:YES];
-        [list_ setDataSource:self];
+- (void) pushPage:(RVPage *)page {
+    [self setBackButtonTitle:title_];
+    [page setDelegate:delegate_];
+    [book_ pushPage:page];
+}
 
-        UITableColumn *column = [[[UITableColumn alloc]
-            initWithTitle:@"Name"
-            identifier:@"name"
-            width:frame.size.width
+- (RVPage *) _pageForPackage:(NSString *)name {
+    if (Package *package = [database_ packageWithName:name]) {
+        PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+        [view setPackage:package];
+        return view;
+    } else {
+        UIActionSheet *sheet = [[[UIActionSheet alloc]
+            initWithTitle:@"Cannot Locate Package"
+            buttons:[NSArray arrayWithObjects:@"Close", nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"missing"
         ] autorelease];
 
-        UITable *table = [list_ table];
-        [table setSeparatorStyle:1];
-        [table addTableColumn:column];
-        [table setDelegate:self];
-        [table setReusesTableCells:YES];
+        [sheet setBodyText:[NSString stringWithFormat:
+            @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
+        , name]];
 
-        [self addSubview:list_];
-    } return self;
+        [sheet popupAlertAnimated:YES];
+        return nil;
+    }
 }
 
-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
+- (BOOL) getSpecial:(NSString *)href {
+    RVPage *page = nil;
+
+    if (
+        [href hasPrefix:@"http://ax.phobos.apple.com/"] ||
+        [href hasPrefix:@"http://phobos.apple.com/"] ||
+        [href hasPrefix:@"http://www.youtube.com/watch?"] ||
+        [href hasPrefix:@"tel:"]
+    )
+        [delegate_ openURL:[NSURL URLWithString:href]];
+    else if ([href hasPrefix:@"mailto:"]) {
+        [delegate_ openURL:[NSURL URLWithString:href]];
+    } else if ([href isEqualToString:@"cydia://add-source"])
+        page = [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease];
+    else if ([href isEqualToString:@"cydia://sources"])
+        page = [[[SourceTable alloc] initWithBook:book_ database:database_] autorelease];
+    else if ([href isEqualToString:@"cydia://packages"])
+        page = [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease];
+    else if ([href hasPrefix:@"cydia://files/"]) {
+        NSString *name = [href substringFromIndex:14];
+
+        if (Package *package = [database_ packageWithName:name]) {
+            FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
+            [files setPackage:package];
+            page = files;
+        }
+    } else if ([href hasPrefix:@"apptapp://package/"])
+        page = [self _pageForPackage:[href substringFromIndex:18]];
+    else if ([href hasPrefix:@"cydia://package/"])
+        page = [self _pageForPackage:[href substringFromIndex:16]];
+    else if (![href hasPrefix:@"apptapp:"] && ![href hasPrefix:@"cydia:"])
+        return false;
+
+    if (page != nil)
+        [self pushPage:page];
+    return true;
+}
+
+- (void) webView:(WebView *)sender willClickElement:(id)element {
+    if ([[element localName] isEqualToString:@"img"])
+        do if ((element = [element parentNode]) == nil)
+            return;
+        while (![[element localName] isEqualToString:@"a"]);
+    if (![element respondsToSelector:@selector(href)])
+        return;
+    NSString *href = [element href];
+    if (href == nil)
+        return;
+    [self getSpecial:href];
 }
 
-- (void) setPackages:(NSArray *)packages {
-    if (packages_ != nil)
-        [packages_ autorelease];
-    _assert(packages != nil);
-    packages_ = [packages retain];
+- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
+    NSURL *url = [request URL];
+    if ([self getSpecial:[url absoluteString]])
+        return nil;
 
-    [sections_ removeAllObjects];
+    if (!pushed_) {
+        pushed_ = true;
+        [book_ pushPage:self];
+    }
 
-    Section *section = nil;
+    return [self _addHeadersToRequest:request];
+}
 
-    for (size_t offset(0); offset != [packages_ count]; ++offset) {
-        Package *package = [packages_ objectAtIndex:offset];
-        NSString *name = [package index];
+- (BOOL) isSpecialScheme:(NSString *)scheme {
+    return
+        [scheme isEqualToString:@"apptapp"] ||
+        [scheme isEqualToString:@"cydia"] ||
+        [scheme isEqualToString:@"mailto"] ||
+        [scheme isEqualToString:@"tel"];
+}
 
-        if (section == nil || ![[section name] isEqual:name]) {
-            section = [[[Section alloc] initWithName:name row:offset] autorelease];
-            [sections_ addObject:section];
-        }
+- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
+    if (request != nil) {
+        NSURL *url = [request URL];
+        NSString *scheme = [url scheme];
+        NSString *absolute = [url absoluteString];
+        if (
+            [self isSpecialScheme:scheme] ||
+            [absolute hasPrefix:@"http://ax.phobos.apple.com/"] ||
+            [absolute hasPrefix:@"http://phobos.apple.com/"] ||
+            [absolute hasPrefix:@"http://www.yahoo.com/watch?"]
+        )
+            return nil;
+    }
 
-        [section addPackage:package];
+    [self setBackButtonTitle:title_];
+
+    BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+    [browser setDelegate:delegate_];
+
+    if (request != nil) {
+        [browser loadRequest:[self _addHeadersToRequest:request]];
+        [book_ pushPage:browser];
+    }
+
+    return [browser webView];
+}
+
+- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
+    if ([frame parentFrame] != nil)
+        return;
+
+    title_ = [title retain];
+    [self setTitle:title];
+}
+
+- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
+    if ([frame parentFrame] != nil)
+        return;
+
+    reloading_ = false;
+    loading_ = true;
+    [indicator_ startAnimation];
+    [self reloadButtons];
+
+    if (title_ != nil) {
+        [title_ release];
+        title_ = nil;
     }
 
-    [list_ reloadData];
+    [self setTitle:@"Loading"];
+
+    WebView *webview = [webview_ webView];
+    NSString *href = [webview mainFrameURL];
+    [urls_ addObject:[NSURL URLWithString:href]];
+
+    CGRect webrect = [scroller_ bounds];
+    webrect.size.height = 0;
+    [webview_ setFrame:webrect];
+
+    [scroller_ scrollPointVisibleAtTopLeft:CGPointZero];
+}
+
+- (void) _finishLoading {
+    if (!reloading_) {
+        loading_ = false;
+        [indicator_ stopAnimation];
+        [self reloadButtons];
+    }
+}
+
+- (BOOL) webView:(WebView *)sender shouldScrollToPoint:(struct CGPoint)point forFrame:(WebFrame *)frame {
+    _trace();
+    return [webview_ webView:sender shouldScrollToPoint:point forFrame:frame];
+}
+
+- (void) webView:(WebView *)sender didReceiveViewportArguments:(id)arguments forFrame:(WebFrame *)frame {
+    return [webview_ webView:sender didReceiveViewportArguments:arguments forFrame:frame];
+}
+
+- (void) webView:(WebView *)sender needsScrollNotifications:(id)notifications forFrame:(WebFrame *)frame {
+    return [webview_ webView:sender needsScrollNotifications:notifications forFrame:frame];
+}
+
+- (void) webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame {
+    return [webview_ webView:sender didCommitLoadForFrame:frame];
 }
 
-- (void) resetViewAnimated:(BOOL)animated {
-    [[list_ table] selectRow:-1 byExtendingSelection:NO withFade:animated];
+- (void) webView:(WebView *)sender didReceiveDocTypeForFrame:(WebFrame *)frame {
+    return [webview_ webView:sender didReceiveDocTypeForFrame:frame];
 }
 
-- (UITable *) table {
-    return [list_ table];
+- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
+    if ([frame parentFrame] == nil)
+        [self _finishLoading];
+    return [webview_ webView:sender didFinishLoadForFrame:frame];
 }
 
-@end
-/* }}} */
+- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
+    if ([frame parentFrame] != nil)
+        return;
+    [self _finishLoading];
 
-/* Section Cell {{{ */
-@interface SectionCell : UITableCell {
-    UITextLabel *name_;
-    UITextLabel *count_;
+    [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",
+        [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString],
+        [[error localizedDescription] stringByAddingPercentEscapes]
+    ]]];
 }
 
-- (void) dealloc;
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+        loading_ = false;
 
-- (id) init;
-- (void) setSection:(Section *)section;
+        struct CGRect bounds = [self bounds];
 
-- (void) _setSelected:(float)fraction;
-- (void) setSelected:(BOOL)selected;
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
-- (void) _setSelectionFadeFraction:(float)fraction;
+        UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:bounds] autorelease];
+        [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
+        [self addSubview:pinstripe];
 
-@end
+        scroller_ = [[UIScroller alloc] initWithFrame:bounds];
+        [self addSubview:scroller_];
 
-@implementation SectionCell
+        [scroller_ setScrollingEnabled:YES];
+        [scroller_ setAdjustForContentSizeChange:YES];
+        [scroller_ setClipsSubviews:YES];
+        [scroller_ setAllowsRubberBanding:YES];
+        [scroller_ setScrollDecelerationFactor:0.99];
+        [scroller_ setDelegate:self];
 
-- (void) dealloc {
-    [name_ release];
-    [count_ release];
-    [super dealloc];
-}
+        CGRect webrect = [scroller_ bounds];
+        webrect.size.height = 0;
 
-- (id) init {
-    if ((self = [super init]) != nil) {
-        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
-        GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 12);
+        webview_ = [Documents_ lastObject];
+        if (webview_ != nil) {
+            webview_ = [webview_ retain];
+            [Documents_ removeLastObject];
+            [webview_ setFrame:webrect];
+        } else {
+            webview_ = [[UIWebDocumentView alloc] initWithFrame:webrect];
+
+            [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
+
+            [webview_ setTilingEnabled:YES];
+            [webview_ setTileMinificationFilter:kCAFilterNearest];
+            [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];
 
-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-        CGColor clear(space, 0, 0, 0, 0);
-        CGColor white(space, 1, 1, 1, 1);
+            [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_ setDelegate:self];
+        [webview_ setGestureDelegate:self];
+        [scroller_ addSubview:webview_];
 
-        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(47, 9, 250, 25)];
-        [name_ setBackgroundColor:clear];
-        [name_ setFont:bold];
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite];
+        indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 12, indsize.width, indsize.height)];
+        [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite];
 
-        count_ = [[UITextLabel alloc] initWithFrame:CGRectMake(11, 7, 29, 32)];
-        [count_ setCentersHorizontally:YES];
-        [count_ setBackgroundColor:clear];
-        [count_ setFont:small];
-        [count_ setColor:white];
+        Package *package([database_ packageWithName:@"cydia"]);
+        NSString *application = package == nil ? @"Cydia" : [NSString
+            stringWithFormat:@"Cydia/%@",
+            [package installed]
+        ];
 
-        UIImageView *folder = [[[UIImageView alloc] initWithFrame:CGRectMake(8, 7, 32, 32)] autorelease];
-        [folder setImage:[UIImage applicationImageNamed:@"folder.png"]];
+        indirect_ = [[IndirectDelegate alloc] initWithDelegate:self];
 
-        [self addSubview:folder];
-        [self addSubview:name_];
-        [self addSubview:count_];
+        WebView *webview = [webview_ webView];
+        [webview setApplicationNameForUserAgent:application];
+        [webview setFrameLoadDelegate:self];
+        [webview setResourceLoadDelegate:indirect_];
+        [webview setUIDelegate:self];
 
-        [self _setSelected:0];
+        //[webview _setLayoutInterval:0.5];
 
-        CGColorSpaceRelease(space);
+        urls_ = [[NSMutableArray alloc] initWithCapacity:16];
 
-        CFRelease(small);
-        CFRelease(bold);
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [scroller_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [pinstripe setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
     } return self;
 }
 
-- (void) setSection:(Section *)section {
-    if (section == nil) {
-        [name_ setText:@"All Packages"];
-        [count_ setText:nil];
-    } else {
-        [name_ setText:[section name]];
-        [count_ setText:[NSString stringWithFormat:@"%d", [section count]]];
-    }
+- (void) didFinishGesturesInView:(UIView *)view forEvent:(id)event {
+    [webview_ redrawScaledDocument];
+}
+
+- (void) _rightButtonClicked {
+    reloading_ = true;
+    [self reloadURL];
 }
 
-- (void) _setSelected:(float)fraction {
-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+- (NSString *) _rightButtonTitle {
+    return @"Reload";
+}
 
-    CGColor black(space,
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-    1.0);
+- (NSString *) rightButtonTitle {
+    return loading_ ? @"" : [self _rightButtonTitle];
+}
 
-    [name_ setColor:black];
+- (NSString *) title {
+    return nil;
+}
 
-    CGColorSpaceRelease(space);
+- (NSString *) backButtonTitle {
+    return @"Browser";
 }
 
-- (void) setSelected:(BOOL)selected {
-    [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected];
+- (void) setPageActive:(BOOL)active {
+    if (!active)
+        [indicator_ removeFromSuperview];
+    else
+        [[book_ navigationBar] addSubview:indicator_];
 }
 
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
-    if (!fade)
-        [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected withFade:fade];
+- (void) resetViewAnimated:(BOOL)animated {
 }
 
-- (void) _setSelectionFadeFraction:(float)fraction {
-    [self _setSelected:fraction];
-    [super _setSelectionFadeFraction:fraction];
+- (void) setPushed:(bool)pushed {
+    pushed_ = pushed;
 }
 
 @end
 /* }}} */
-/* Install View {{{ */
-@interface InstallView : ResetView <
-    PackageTableDelegate
+
+@interface CYBook : RVBook <
+    ProgressDelegate
 > {
-    NSArray *sections_;
-    UITable *list_;
-    PackageTable *table_;
-    PackageView *view_;
-    NSString *section_;
-    NSString *package_;
-    NSMutableArray *packages_;
+    _transient Database *database_;
+    UINavigationBar *overlay_;
+    UIProgressIndicator *indicator_;
+    UITextLabel *prompt_;
+    UIProgressBar *progress_;
+    UINavigationButton *cancel_;
+    bool updating_;
+    size_t received_;
+    NSTimeInterval last_;
 }
 
-- (void) dealloc;
+- (id) initWithFrame:(CGRect)frame database:(Database *)database;
+- (void) update;
+- (BOOL) updating;
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
+@end
 
-- (int) numberOfRowsInTable:(UITable *)table;
-- (float) table:(UITable *)table heightForRow:(int)row;
-- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing;
-- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row;
-- (void) tableRowSelected:(NSNotification *)notification;
+/* Install View {{{ */
+@interface InstallView : RVPage {
+    _transient Database *database_;
+    NSMutableArray *sections_;
+    NSMutableArray *filtered_;
+    UITransitionView *transition_;
+    UITable *list_;
+    UIView *accessory_;
+    BOOL editing_;
+}
 
-- (void) packageTable:(id)table packageSelected:(Package *)package;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) reloadData;
+- (void) resetView;
 
-- (id) initWithFrame:(CGRect)frame;
-- (void) setPackages:(NSArray *)packages;
-- (void) setDelegate:(id)delegate;
 @end
 
 @implementation InstallView
 
 - (void) dealloc {
-    [packages_ release];
-    if (sections_ != nil)
-        [sections_ release];
-    if (list_ != nil)
-        [list_ release];
-    if (table_ != nil)
-        [table_ release];
-    if (view_ != nil)
-        [view_ release];
-    if (section_ != nil)
-        [section_ release];
-    if (package_ != nil)
-        [package_ release];
-    [super dealloc];
-}
+    [list_ setDataSource:nil];
+    [list_ setDelegate:nil];
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    if (button == 0) {
-        [[view_ package] install];
-        [delegate_ resolve];
-        [delegate_ perform];
-    }
+    [sections_ release];
+    [filtered_ release];
+    [transition_ release];
+    [list_ release];
+    [accessory_ release];
+    [super dealloc];
 }
 
 - (int) numberOfRowsInTable:(UITable *)table {
-    return [sections_ count] + 1;
+    return editing_ ? [sections_ count] : [filtered_ count] + 1;
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
@@ -2397,84 +4752,76 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
     if (reusing == nil)
         reusing = [[[SectionCell alloc] init] autorelease];
-    if (row == 0)
-        [(SectionCell *)reusing setSection:nil];
-    else
-        [(SectionCell *)reusing setSection:[sections_ objectAtIndex:(row - 1)]];
+    [(SectionCell *)reusing setSection:(editing_ ?
+        [sections_ objectAtIndex:row] :
+        (row == 0 ? nil : [filtered_ objectAtIndex:(row - 1)])
+    ) editing:editing_];
     return reusing;
 }
 
 - (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
-    return YES;
+    return !editing_;
+}
+
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
+    return !editing_;
 }
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [[notification object] selectedRow];
+    if (row == INT_MAX)
+        return;
 
-    if (row == INT_MAX) {
-        [section_ release];
-        section_ = nil;
+    Section *section;
+    NSString *name;
+    NSString *title;
 
-        [table_ release];
-        table_ = nil;
+    if (row == 0) {
+        section = nil;
+        name = nil;
+        title = @"All Packages";
     } else {
-        _assert(section_ == nil);
-        _assert(table_ == nil);
-
-        Section *section;
-        NSString *name;
+        section = [filtered_ objectAtIndex:(row - 1)];
+        name = [section name];
 
-        if (row == 0) {
-            section = nil;
-            section_ = nil;
-            name = @"All Packages";
-        } else {
-            section = [sections_ objectAtIndex:(row - 1)];
-            name = [section name];
-            section_ = [name retain];
+        if (name != nil)
+            title = name;
+        else {
+            name = @"";
+            title = @"(No Section)";
         }
-
-        table_ = [[PackageTable alloc] initWithFrame:[transition_ bounds] versioner:@selector(latest)];
-        [table_ setDelegate:self];
-        [table_ setPackages:(section == nil ? packages_ : [section packages])];
-
-        [self pushView:table_ withTitle:name backButtonTitle:@"Packages" rightButton:nil];
     }
-}
-
-- (void) packageTable:(id)table packageSelected:(Package *)package {
-    if (package == nil) {
-        [package_ release];
-        package_ = nil;
 
-        [view_ release];
-        view_ = nil;
-    } else {
-        _assert(package_ == nil);
-        _assert(view_ == nil);
+    PackageTable *table = [[[PackageTable alloc]
+        initWithBook:book_
+        database:database_
+        title:title
+        filter:@selector(isVisiblyUninstalledInSection:)
+        with:name
+    ] autorelease];
 
-        package_ = [[package name] retain];
+    [table setDelegate:delegate_];
 
-        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
-        [view_ setDelegate:delegate_];
+    [book_ pushPage:table];
+}
 
-        [view_ setPackage:package];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
 
-        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:@"Install"];
-    }
-}
+        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
+        filtered_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
+        [self addSubview:transition_];
 
         list_ = [[UITable alloc] initWithFrame:[transition_ bounds]];
-        [self pushView:list_ withTitle:@"Install" backButtonTitle:@"Sections" rightButton:nil];
+        [transition_ transition:0 toView:list_];
 
         UITableColumn *column = [[[UITableColumn alloc]
             initWithTitle:@"Name"
             identifier:@"name"
-            width:frame.size.width
+            width:[self frame].size.width
         ] autorelease];
 
         [list_ setDataSource:self];
@@ -2483,119 +4830,126 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [list_ setDelegate:self];
         [list_ setReusesTableCells:YES];
 
-        [transition_ transition:0 toView:list_];
+        [self reloadData];
+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
     } return self;
 }
 
-- (void) setPackages:(NSArray *)packages {
-    [packages_ removeAllObjects];
+- (void) reloadData {
+    NSArray *packages = [database_ packages];
+
+    [sections_ removeAllObjects];
+    [filtered_ removeAllObjects];
+
+    NSMutableArray *filtered = [NSMutableArray arrayWithCapacity:[packages count]];
+    NSMutableDictionary *sections = [NSMutableDictionary dictionaryWithCapacity:32];
 
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
-        if ([package installed] == nil)
-            [packages_ addObject:package];
+        NSString *name([package section]);
+
+        if (name != nil) {
+            Section *section([sections objectForKey:name]);
+            if (section == nil) {
+                section = [[[Section alloc] initWithName:name] autorelease];
+                [sections setObject:section forKey:name];
+            }
+        }
+
+        if ([package valid] && [package installed] == nil && [package visible])
+            [filtered addObject:package];
     }
 
-    [packages_ sortUsingSelector:@selector(compareBySectionAndName:)];
-    NSMutableArray *sections = [NSMutableArray arrayWithCapacity:16];
+    [sections_ addObjectsFromArray:[sections allValues]];
+    [sections_ sortUsingSelector:@selector(compareByName:)];
 
-    Section *nsection = nil;
-    Package *npackage = nil;
+    [filtered sortUsingSelector:@selector(compareBySection:)];
 
     Section *section = nil;
-    for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
-        Package *package = [packages_ objectAtIndex:offset];
+    for (size_t offset = 0, count = [filtered count]; offset != count; ++offset) {
+        Package *package = [filtered objectAtIndex:offset];
         NSString *name = [package section];
 
-        if (section == nil || ![[section name] isEqual:name]) {
-            section = [[[Section alloc] initWithName:name row:offset] autorelease];
-
-            if ([name isEqualToString:section_])
-                nsection = section;
-            [sections addObject:section];
+        if (section == nil || name != nil && ![[section name] isEqualToString:name]) {
+            section = name == nil ?
+                [[[Section alloc] initWithName:nil] autorelease] :
+                [sections objectForKey:name];
+            [filtered_ addObject:section];
         }
 
-        if ([[package name] isEqualToString:package_])
-            npackage = package;
-        [section addPackage:package];
+        [section addToCount];
     }
 
-    if (sections_ != nil)
-        [sections_ release];
-    sections_ = [sections retain];
+    [list_ reloadData];
+}
 
-    [packages_ sortUsingSelector:@selector(compareByName:)];
+- (void) resetView {
+    if (editing_)
+        [self _rightButtonClicked];
+}
 
-    [list_ reloadData];
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
+}
+
+- (void) _rightButtonClicked {
+    if ((editing_ = !editing_))
+        [list_ reloadData];
+    else {
+        [delegate_ updateData];
+    }
+
+    [book_ setTitle:[self title] forPage:self];
+    [book_ reloadButtonsForPage:self];
+}
 
-    unsigned views(0);
+- (NSString *) title {
+    return editing_ ? @"Section Visibility" : @"Install by Section";
+}
 
-    if (npackage != nil)
-        [view_ setPackage:npackage];
-    else if (package_ != nil)
-        ++views;
+- (NSString *) backButtonTitle {
+    return @"Sections";
+}
 
-    if (nsection != nil)
-        [table_ setPackages:[nsection packages]];
-    else if (section_ != nil)
-        ++views;
+- (NSString *) rightButtonTitle {
+    return [sections_ count] == 0 ? nil : editing_ ? @"Done" : @"Edit";
+}
 
-    [self popViews:views];
-    [self setPrompt];
+- (UINavigationButtonStyle) rightButtonStyle {
+    return editing_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
 }
 
-- (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
-    [super setDelegate:delegate];
+- (UIView *) accessoryView {
+    return accessory_;
 }
 
 @end
 /* }}} */
 /* Changes View {{{ */
-@interface ChangesView : ResetView <
-    PackageTableDelegate
-> {
-    UISectionList *list_;
+@interface ChangesView : RVPage {
+    _transient Database *database_;
     NSMutableArray *packages_;
     NSMutableArray *sections_;
-    PackageView *view_;
-    NSString *package_;
-    size_t count_;
+    UISectionList *list_;
+    unsigned upgrades_;
 }
 
-- (void) dealloc;
-
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-
-- (int) numberOfSectionsInSectionList:(UISectionList *)list;
-- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section;
-- (int) sectionList:(UISectionList *)list rowForSection:(int)section;
-
-- (int) numberOfRowsInTable:(UITable *)table;
-- (float) table:(UITable *)table heightForRow:(int)row;
-- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing;
-- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row;
-- (void) tableRowSelected:(NSNotification *)notification;
-
-- (id) initWithFrame:(CGRect)frame;
-- (void) setPackages:(NSArray *)packages;
-- (void) _resetView;
-- (size_t) count;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) reloadData;
 
-- (void) setDelegate:(id)delegate;
 @end
 
 @implementation ChangesView
 
 - (void) dealloc {
-    [list_ release];
+    [[list_ table] setDelegate:nil];
+    [list_ setDataSource:nil];
+
     [packages_ release];
     [sections_ release];
-    if (view_ != nil)
-        [view_ release];
-    if (package_ != nil)
-        [package_ release];
+    [list_ release];
     [super dealloc];
 }
 
@@ -2616,12 +4970,12 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
-    return 64;
+    return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];
 }
 
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
     if (reusing == nil)
-        reusing = [[[PackageCell alloc] initWithVersioner:NULL] autorelease];
+        reusing = [[[PackageCell alloc] init] autorelease];
     [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]];
     return reusing;
 }
@@ -2632,53 +4986,34 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [[notification object] selectedRow];
-    [self packageTable:self packageSelected:(row == INT_MAX ? nil : [packages_ objectAtIndex:row])];
+    if (row == INT_MAX)
+        return;
+    Package *package = [packages_ objectAtIndex:row];
+    PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+    [view setDelegate:delegate_];
+    [view setPackage:package];
+    [book_ pushPage:view];
 }
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    switch (button) {
-        case 0:
-            [[view_ package] install];
-            [delegate_ resolve];
-            [delegate_ perform];
-        break;
-
-        case 1:
-            [delegate_ upgrade];
-        break;
-    }
+- (void) _leftButtonClicked {
+    [(CYBook *)book_ update];
+    [self reloadButtons];
 }
 
-- (void) packageTable:(id)table packageSelected:(Package *)package {
-    if (package == nil) {
-        [package_ release];
-        package_ = nil;
-
-        [view_ release];
-        view_ = nil;
-    } else {
-        _assert(package_ == nil);
-        _assert(view_ == nil);
-
-        package_ = [[package name] retain];
-
-        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
-        [view_ setDelegate:delegate_];
-
-        [view_ setPackage:package];
-
-        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:(
-            [package upgradable] ? @"Upgrade" : @"Install"
-        )];
-    }
+- (void) _rightButtonClicked {
+    [delegate_ distUpgrade];
 }
 
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+
         packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
         sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
-        list_ = [[UISectionList alloc] initWithFrame:[transition_ bounds] showSectionIndex:NO];
+        list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:NO];
+        [self addSubview:list_];
+
         [list_ setShouldHideHeaderInShortLists:NO];
         [list_ setDataSource:self];
         //[list_ setSectionListStyle:1];
@@ -2686,7 +5021,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         UITableColumn *column = [[[UITableColumn alloc]
             initWithTitle:@"Name"
             identifier:@"name"
-            width:frame.size.width
+            width:[self frame].size.width
         ] autorelease];
 
         UITable *table = [list_ table];
@@ -2695,521 +5030,769 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [table setDelegate:self];
         [table setReusesTableCells:YES];
 
-        [self pushView:list_ withTitle:@"Changes" backButtonTitle:nil rightButton:nil];
+        [self reloadData];
+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
     } return self;
 }
 
-- (void) setPackages:(NSArray *)packages {
+- (void) reloadData {
+    NSArray *packages = [database_ packages];
+
     [packages_ removeAllObjects];
+    [sections_ removeAllObjects];
+
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
-        if ([package installed] == nil || [package upgradable])
+
+        if (
+            [package installed] == nil && [package valid] && [package visible] ||
+            [package upgradableAndEssential:NO]
+        )
             [packages_ addObject:package];
     }
 
     [packages_ sortUsingSelector:@selector(compareForChanges:)];
 
-    [sections_ removeAllObjects];
-
-    Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades" row:0] autorelease];
+    Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades"] autorelease];
     Section *section = nil;
 
-    count_ = 0;
-    Package *npackage = nil;
+    upgrades_ = 0;
+    bool unseens = false;
+
+    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+
     for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
         Package *package = [packages_ objectAtIndex:offset];
-        if ([[package name] isEqualToString:package_])
-            npackage = package;
 
-        if ([package upgradable])
-            [upgradable addPackage:package];
-        else {
+        if ([package upgradableAndEssential:YES]) {
+            ++upgrades_;
+            [upgradable addToCount];
+        } else {
+            unseens = true;
             NSDate *seen = [package seen];
 
-            CFLocaleRef locale = CFLocaleCopyCurrent();
-            CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
-            CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
+            NSString *name;
+
+            if (seen == nil)
+                name = [@"n/a ?" retain];
+            else {
+                name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
+            }
+
+            if (section == nil || ![[section name] isEqualToString:name]) {
+                section = [[[Section alloc] initWithName:name row:offset] autorelease];
+                [sections_ addObject:section];
+            }
+
+            [name release];
+            [section addToCount];
+        }
+    }
+
+    CFRelease(formatter);
+
+    if (unseens) {
+        Section *last = [sections_ lastObject];
+        size_t count = [last count];
+        [packages_ removeObjectsInRange:NSMakeRange([packages_ count] - count, count)];
+        [sections_ removeLastObject];
+    }
+
+    if (upgrades_ != 0)
+        [sections_ insertObject:upgradable atIndex:0];
+
+    [list_ reloadData];
+    [self reloadButtons];
+}
+
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
+}
+
+- (NSString *) leftButtonTitle {
+    return [(CYBook *)book_ updating] ? nil : @"Refresh";
+}
+
+- (NSString *) rightButtonTitle {
+    return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade (%u)", upgrades_];
+}
+
+- (NSString *) title {
+    return @"Changes";
+}
+
+@end
+/* }}} */
+/* Search View {{{ */
+@protocol SearchViewDelegate
+- (void) showKeyboard:(BOOL)show;
+@end
+
+@interface SearchView : RVPage {
+    UIView *accessory_;
+    UISearchField *field_;
+    UITransitionView *transition_;
+    PackageTable *table_;
+    UIPreferencesTable *advanced_;
+    UIView *dimmed_;
+    bool flipped_;
+    bool reload_;
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) reloadData;
+
+@end
+
+@implementation SearchView
+
+- (void) dealloc {
+    [field_ setDelegate:nil];
+
+    [accessory_ release];
+    [field_ release];
+    [transition_ release];
+    [table_ release];
+    [advanced_ release];
+    [dimmed_ release];
+    [super dealloc];
+}
+
+- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
+    return 1;
+}
+
+- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
+    switch (group) {
+        case 0: return @"Advanced Search (Coming Soon!)";
+
+        default: _assert(false);
+    }
+}
+
+- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
+    switch (group) {
+        case 0: return 0;
+
+        default: _assert(false);
+    }
+}
 
-            NSString *name = (NSString *) formatted;
+- (void) _showKeyboard:(BOOL)show {
+    CGSize keysize = [UIKeyboard defaultSize];
+    CGRect keydown = [book_ pageBounds];
+    CGRect keyup = keydown;
+    keyup.size.height -= keysize.height - ButtonBarHeight_;
 
-            if (section == nil || ![[section name] isEqual:name]) {
-                section = [[[Section alloc] initWithName:name row:offset] autorelease];
-                [sections_ addObject:section];
-            }
+    float delay = KeyboardTime_ * ButtonBarHeight_ / keysize.height;
 
-            [section addPackage:package];
+    UIFrameAnimation *animation = [[[UIFrameAnimation alloc] initWithTarget:[table_ list]] autorelease];
+    [animation setSignificantRectFields:8];
 
-            CFRelease(formatter);
-            CFRelease(formatted);
-            CFRelease(locale);
-        }
+    if (show) {
+        [animation setStartFrame:keydown];
+        [animation setEndFrame:keyup];
+    } else {
+        [animation setStartFrame:keyup];
+        [animation setEndFrame:keydown];
     }
 
-    count_ = [[upgradable packages] count];
-    if (count_ != 0)
-        [sections_ insertObject:upgradable atIndex:0];
+    UIAnimator *animator = [UIAnimator sharedAnimator];
 
-    [list_ reloadData];
+    [animator
+        addAnimations:[NSArray arrayWithObjects:animation, nil]
+        withDuration:(KeyboardTime_ - delay)
+        start:!show
+    ];
+
+    if (show)
+        [animator performSelector:@selector(startAnimation:) withObject:animation afterDelay:delay];
 
-    if (npackage != nil)
-        [view_ setPackage:npackage];
-    else if (package_ != nil)
-        [self popViews:1];
+    [delegate_ showKeyboard:show];
+}
 
-    [self _resetView];
-    [self setPrompt];
+- (void) textFieldDidBecomeFirstResponder:(UITextField *)field {
+    [self _showKeyboard:YES];
 }
 
-- (void) _resetView {
-    if ([views_ count] == 1)
-        [navbar_ showButtonsWithLeftTitle:(count_ == 0 ? nil : @"Upgrade All") rightTitle:nil];
+- (void) textFieldDidResignFirstResponder:(UITextField *)field {
+    [self _showKeyboard:NO];
 }
 
-- (size_t) count {
-    return count_;
+- (void) keyboardInputChanged:(UIFieldEditor *)editor {
+    if (reload_) {
+        NSString *text([field_ text]);
+        [field_ setClearButtonStyle:(text == nil || [text length] == 0 ? 0 : 2)];
+        [self reloadData];
+        reload_ = false;
+    }
 }
 
-- (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
-    [super setDelegate:delegate];
+- (void) textFieldClearButtonPressed:(UITextField *)field {
+    reload_ = true;
 }
 
-@end
-/* }}} */
-/* Manage View {{{ */
-@interface ManageView : ResetView <
-    PackageTableDelegate
-> {
-    PackageTable *table_;
-    PackageView *view_;
-    NSString *package_;
+- (void) keyboardInputShouldDelete:(id)input {
+    reload_ = true;
 }
 
-- (void) dealloc;
+- (BOOL) keyboardInput:(id)input shouldInsertText:(NSString *)text isMarkedText:(int)marked {
+    if ([text length] != 1 || [text characterAtIndex:0] != '\n') {
+        reload_ = true;
+        return YES;
+    } else {
+        [field_ resignFirstResponder];
+        return NO;
+    }
+}
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        CGRect pageBounds = [book_ pageBounds];
 
-- (void) packageTable:(id)table packageSelected:(Package *)package;
+        /*UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:pageBounds] autorelease];
+        [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
+        [self addSubview:pinstripe];*/
 
-- (id) initWithFrame:(CGRect)frame;
-- (void) setPackages:(NSArray *)packages;
+        transition_ = [[UITransitionView alloc] initWithFrame:pageBounds];
+        [self addSubview:transition_];
 
-- (void) setDelegate:(id)delegate;
-@end
+        advanced_ = [[UIPreferencesTable alloc] initWithFrame:pageBounds];
 
-@implementation ManageView
+        [advanced_ setReusesTableCells:YES];
+        [advanced_ setDataSource:self];
+        [advanced_ reloadData];
 
-- (void) dealloc {
-    [table_ release];
-    if (view_ != nil)
-        [view_ release];
-    if (package_ != nil)
-        [package_ release];
-    [super dealloc];
-}
+        dimmed_ = [[UIView alloc] initWithFrame:pageBounds];
+        CGColor dimmed(space_, 0, 0, 0, 0.5);
+        [dimmed_ setBackgroundColor:[UIColor colorWithCGColor:dimmed]];
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    if (button == 0) {
-        [[view_ package] remove];
-        [delegate_ resolve];
-        [delegate_ perform];
-    }
-}
+        table_ = [[PackageTable alloc]
+            initWithBook:book
+            database:database
+            title:nil
+            filter:@selector(isUnfilteredAndSearchedForBy:)
+            with:nil
+        ];
 
-- (void) packageTable:(id)table packageSelected:(Package *)package {
-    if (package == nil) {
-        [package_ release];
-        package_ = nil;
+        [table_ setShouldHideHeaderInShortLists:NO];
+        [transition_ transition:0 toView:table_];
 
-        [view_ release];
-        view_ = nil;
-    } else {
-        _assert(package_ == nil);
-        _assert(view_ == nil);
+        CGRect cnfrect = {{
+#ifdef __OBJC2__
+        6 +
+#endif
+        1, 38}, {17, 18}};
 
-        package_ = [[package name] retain];
+        CGRect area;
+        area.origin.x = /*cnfrect.origin.x + cnfrect.size.width + 4 +*/ 10;
+        area.origin.y = 1;
 
-        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
-        [view_ setDelegate:delegate_];
+        area.size.width =
+#ifdef __OBJC2__
+            8 +
+#endif
+            [self bounds].size.width - area.origin.x - 18;
 
-        [view_ setPackage:package];
+        area.size.height = [UISearchField defaultHeight];
 
-        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:@"Uninstall"];
-    }
-}
+        field_ = [[UISearchField alloc] initWithFrame:area];
 
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        table_ = [[PackageTable alloc] initWithFrame:[transition_ bounds] versioner:@selector(latest)];
-        [table_ setDelegate:self];
+        UIFont *font = [UIFont systemFontOfSize:16];
+        [field_ setFont:font];
+
+        [field_ setPlaceholder:@"Package Names & Descriptions"];
+        [field_ setDelegate:self];
+
+        [field_ setPaddingTop:5];
+
+        UITextInputTraits *traits = [field_ textInputTraits];
+        [traits setAutocapitalizationType:0];
+        [traits setAutocorrectionType:1];
+        [traits setReturnKeyType:6];
+
+        CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height}};
 
-        [self pushView:table_ withTitle:@"Uninstall" backButtonTitle:@"Packages" rightButton:nil];
+        accessory_ = [[UIView alloc] initWithFrame:accrect];
+        [accessory_ addSubview:field_];
+
+        /*UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease];
+        [configure setShowPressFeedback:YES];
+        [configure setImage:[UIImage applicationImageNamed:@"advanced.png"]];
+        [configure addTarget:self action:@selector(configurePushed) forEvents:1];
+        [accessory_ addSubview:configure];*/
+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [table_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
     } return self;
 }
 
-- (void) setPackages:(NSArray *)packages {
-    NSMutableArray *local = [NSMutableArray arrayWithCapacity:16];
-    for (size_t i(0); i != [packages count]; ++i) {
-        Package *package([packages objectAtIndex:i]);
-        if ([package installed] != nil)
-            [local addObject:package];
-    }
+- (void) flipPage {
+#ifndef __OBJC2__
+    LKAnimation *animation = [LKTransition animation];
+    [animation setType:@"oglFlip"];
+    [animation setTimingFunction:[LKTimingFunction functionWithName:@"easeInEaseOut"]];
+    [animation setFillMode:@"extended"];
+    [animation setTransitionFlags:3];
+    [animation setDuration:10];
+    [animation setSpeed:0.35];
+    [animation setSubtype:(flipped_ ? @"fromLeft" : @"fromRight")];
+    [[transition_ _layer] addAnimation:animation forKey:0];
+    [transition_ transition:0 toView:(flipped_ ? (UIView *) table_ : (UIView *) advanced_)];
+    flipped_ = !flipped_;
+#endif
+}
 
-    [local sortUsingSelector:@selector(compareByName:)];
+- (void) configurePushed {
+    [field_ resignFirstResponder];
+    [self flipPage];
+}
 
-    Package *npackage = nil;
-    for (size_t offset = 0, count = [local count]; offset != count; ++offset) {
-        Package *package = [local objectAtIndex:offset];
-        if ([[package name] isEqualToString:package_])
-            npackage = package;
-    }
+- (void) resetViewAnimated:(BOOL)animated {
+    if (flipped_)
+        [self flipPage];
+    [table_ resetViewAnimated:animated];
+}
+
+- (void) reloadData {
+    if (flipped_)
+        [self flipPage];
+    [table_ setObject:[field_ text]];
+    [table_ reloadData];
+    [table_ resetCursor];
+}
 
-    [table_ setPackages:local];
+- (UIView *) accessoryView {
+    return accessory_;
+}
 
-    if (npackage != nil)
-        [view_ setPackage:npackage];
-    else if (package_ != nil)
-        [self popViews:1];
+- (NSString *) title {
+    return nil;
+}
 
-    [self setPrompt];
+- (NSString *) backButtonTitle {
+    return @"Search";
 }
 
 - (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
+    [table_ setDelegate:delegate];
     [super setDelegate:delegate];
 }
 
 @end
 /* }}} */
-/* Search View {{{ */
-@protocol SearchViewDelegate
-- (void) showKeyboard:(BOOL)show;
-@end
 
-@interface SearchView : ResetView <
-    PackageTableDelegate
-> {
-    NSMutableArray *packages_;
-    UIView *accessory_;
-    UISearchField *field_;
-    PackageTable *table_;
-    PackageView *view_;
-    NSString *package_;
+@implementation CYBook
+
+- (void) dealloc {
+    [overlay_ release];
+    [indicator_ release];
+    [prompt_ release];
+    [progress_ release];
+    [cancel_ release];
+    [super dealloc];
 }
 
-- (void) dealloc;
+- (NSString *) getTitleForPage:(RVPage *)page {
+    return Simplify([super getTitleForPage:page]);
+}
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-- (void) packageTable:(id)table packageSelected:(Package *)package;
+- (BOOL) updating {
+    return updating_;
+}
 
-- (void) textFieldDidBecomeFirstResponder:(UITextField *)field;
-- (void) textFieldDidResignFirstResponder:(UITextField *)field;
+- (void) update {
+    [UIView beginAnimations:nil context:NULL];
 
-- (void) keyboardInputChanged:(UIFieldEditor *)editor;
-- (BOOL) keyboardInput:(id)input shouldInsertText:(NSString *)text isMarkedText:(int)marked;
+    CGRect ovrframe = [overlay_ frame];
+    ovrframe.origin.y = 0;
+    [overlay_ setFrame:ovrframe];
 
-- (id) initWithFrame:(CGRect)frame;
-- (void) setPackages:(NSArray *)packages;
+    CGRect barframe = [navbar_ frame];
+    barframe.origin.y += ovrframe.size.height;
+    [navbar_ setFrame:barframe];
 
-- (void) setDelegate:(id)delegate;
-- (void) resetPackage:(Package *)package;
-- (void) searchPackages;
+    CGRect trnframe = [transition_ frame];
+    trnframe.origin.y += ovrframe.size.height;
+    trnframe.size.height -= ovrframe.size.height;
+    [transition_ setFrame:trnframe];
 
-@end
+    [UIView endAnimations];
 
-@implementation SearchView
+    [indicator_ startAnimation];
+    [prompt_ setText:@"Updating Database"];
+    [progress_ setProgress:0];
 
-- (void) dealloc {
-    [packages_ release];
-    [accessory_ release];
-    [field_ release];
-    [table_ release];
-    if (view_ != nil)
-        [view_ release];
-    if (package_ != nil)
-        [package_ release];
-    [super dealloc];
-}
+    received_ = 0;
+    last_ = [NSDate timeIntervalSinceReferenceDate];
+    updating_ = true;
+    [overlay_ addSubview:cancel_];
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    if (button == 0) {
-        Package *package = [view_ package];
-        if ([package installed] == nil)
-            [package install];
-        else
-            [package remove];
-        [delegate_ resolve];
-        [delegate_ perform];
-    }
+    [NSThread
+        detachNewThreadSelector:@selector(_update)
+        toTarget:self
+        withObject:nil
+    ];
 }
 
-- (void) packageTable:(id)table packageSelected:(Package *)package {
-    if (package == nil) {
-        [navbar_ setAccessoryView:accessory_ animate:(resetting_ ? NO : YES) goingBack:YES];
+- (void) _update_ {
+    updating_ = false;
 
-        [package_ release];
-        package_ = nil;
+    [indicator_ stopAnimation];
 
-        [view_ release];
-        view_ = nil;
-    } else {
-        [navbar_ setAccessoryView:nil animate:YES goingBack:NO];
+    [UIView beginAnimations:nil context:NULL];
 
-        _assert(package_ == nil);
-        _assert(view_ == nil);
+    CGRect ovrframe = [overlay_ frame];
+    ovrframe.origin.y = -ovrframe.size.height;
+    [overlay_ setFrame:ovrframe];
 
-        package_ = [[package name] retain];
+    CGRect barframe = [navbar_ frame];
+    barframe.origin.y -= ovrframe.size.height;
+    [navbar_ setFrame:barframe];
 
-        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
-        [view_ setDelegate:delegate_];
+    CGRect trnframe = [transition_ frame];
+    trnframe.origin.y -= ovrframe.size.height;
+    trnframe.size.height += ovrframe.size.height;
+    [transition_ setFrame:trnframe];
 
-        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:nil];
-        [self resetPackage:package];
-    }
+    [UIView commitAnimations];
+
+    [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0];
 }
 
-- (void) textFieldDidBecomeFirstResponder:(UITextField *)field {
-    [delegate_ showKeyboard:YES];
-    [table_ setEnabled:NO];
+- (id) initWithFrame:(CGRect)frame database:(Database *)database {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        database_ = database;
 
-    /*CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-    CGColor dimmed(alpha, 0, 0, 0, 0.5);
-    [editor_ setBackgroundColor:dimmed];
-    CGColorSpaceRelease(space);*/
-}
+        CGRect ovrrect = [navbar_ bounds];
+        ovrrect.size.height = [UINavigationBar defaultSize].height;
+        ovrrect.origin.y = -ovrrect.size.height;
 
-- (void) textFieldDidResignFirstResponder:(UITextField *)field {
-    [table_ setEnabled:YES];
-    [delegate_ showKeyboard:NO];
-}
+        overlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect];
+        [self addSubview:overlay_];
 
-- (void) keyboardInputChanged:(UIFieldEditor *)editor {
-    NSString *text([field_ text]);
-    [field_ setClearButtonStyle:(text == nil || [text length] == 0 ? 0 : 2)];
-}
+        [overlay_ setBarStyle:1];
+        int barstyle = [overlay_ _barStyle:NO];
+        bool ugly = barstyle == 0;
 
-- (BOOL) keyboardInput:(id)input shouldInsertText:(NSString *)text isMarkedText:(int)marked {
-    if ([text length] != 1 || [text characterAtIndex:0] != '\n')
-        return YES;
+        UIProgressIndicatorStyle style = ugly ?
+            kUIProgressIndicatorStyleMediumBrown :
+            kUIProgressIndicatorStyleMediumWhite;
 
-    [self searchPackages];
-    [field_ resignFirstResponder];
-    return NO;
-}
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
+        unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
+        CGRect indrect = {{indoffset, indoffset}, indsize};
 
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+        indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
+        [indicator_ setStyle:style];
+        [overlay_ addSubview:indicator_];
 
-        table_ = [[PackageTable alloc] initWithFrame:[transition_ bounds] versioner:@selector(latest)];
-        [table_ setDelegate:self];
+        CGSize prmsize = {215, indsize.height + 4};
 
-        CGRect area = [self bounds];
-        area.origin.y = 30;
-        area.origin.x = 0;
-        area.size.width -= 12;
-        area.size.height = [UISearchField defaultHeight];
+        CGRect prmrect = {{
+            indoffset * 2 + indsize.width,
+#ifdef __OBJC2__
+            -1 +
+#endif
+            unsigned(ovrrect.size.height - prmsize.height) / 2
+        }, prmsize};
 
-        field_ = [[UISearchField alloc] initWithFrame:area];
+        UIFont *font = [UIFont systemFontOfSize:15];
 
-        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
-        [field_ setFont:font];
-        CFRelease(font);
+        prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
 
-        [field_ setPlaceholder:@"Package Names & Descriptions"];
-        [field_ setPaddingTop:5];
-        [field_ setDelegate:self];
+        [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
+        [prompt_ setBackgroundColor:[UIColor clearColor]];
+        [prompt_ setFont:font];
 
-        UITextTraits *traits = [field_ textTraits];
-        [traits setEditingDelegate:self];
-        [traits setReturnKeyType:6];
+        [overlay_ addSubview:prompt_];
 
-        accessory_ = [[UIView alloc] initWithFrame:CGRectMake(6, 6, area.size.width, area.size.height + 30)];
-        [accessory_ addSubview:field_];
+        CGSize prgsize = {75, 100};
+
+        CGRect prgrect = {{
+            ovrrect.size.width - prgsize.width - 10,
+            (ovrrect.size.height - prgsize.height) / 2
+        } , prgsize};
+
+        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
+        [progress_ setStyle:0];
+        [overlay_ addSubview:progress_];
+
+        cancel_ = [[UINavigationButton alloc] initWithTitle:@"Cancel" style:UINavigationButtonStyleHighlighted];
+        [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside];
 
-        [navbar_ setAccessoryView:accessory_];
-        [self pushView:table_ withTitle:nil backButtonTitle:@"Search" rightButton:nil];
+        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];
 
-        /* XXX: for the love of god just fix this */
-        [navbar_ removeFromSuperview];
-        [reload_ removeFromSuperview];
-        [configure_ removeFromSuperview];
-        [self addSubview:navbar_];
-        [self addSubview:reload_];
-        [self addSubview:configure_];
+        [cancel_ setBarStyle:barstyle];
     } return self;
 }
 
-- (void) setPackages:(NSArray *)packages {
-    [packages_ removeAllObjects];
-    [packages_ addObjectsFromArray:packages];
-    [packages_ sortUsingSelector:@selector(compareByName:)];
+- (void) _onCancel {
+    updating_ = false;
+    [cancel_ removeFromSuperview];
+}
 
-    Package *npackage = nil;
-    for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
-        Package *package = [packages_ objectAtIndex:offset];
-        if ([[package name] isEqualToString:package_])
-            npackage = package;
-    }
+- (void) _update {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    Status status;
+    status.setDelegate(self);
 
-    [self searchPackages];
+    [database_ updateWithStatus:status];
 
-    if (npackage != nil)
-        [self resetPackage:npackage];
-    else if (package_ != nil)
-        [self popViews:1];
+    [self
+        performSelectorOnMainThread:@selector(_update_)
+        withObject:nil
+        waitUntilDone:NO
+    ];
 
-    [self setPrompt];
+    [pool release];
 }
 
-- (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
-    [super setDelegate:delegate];
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];
 }
 
-- (void) resetPackage:(Package *)package {
-    [view_ setPackage:package];
-    NSString *right = [package installed] == nil ? @"Install" : @"Uninstall";
-    [navbar_ showButtonsWithLeftTitle:nil rightTitle:right];
+- (void) setProgressTitle:(NSString *)title {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressTitle:)
+        withObject:title
+        waitUntilDone:YES
+    ];
 }
 
-- (void) searchPackages {
-    NSString *text([field_ text]);
+- (void) setProgressPercent:(float)percent {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressPercent:)
+        withObject:[NSNumber numberWithFloat:percent]
+        waitUntilDone:YES
+    ];
+}
 
-    NSMutableArray *packages([NSMutableArray arrayWithCapacity:16]);
+- (void) startProgress {
+}
 
-    for (size_t offset(0), count([packages_ count]); offset != count; ++offset) {
-        Package *package = [packages_ objectAtIndex:offset];
-        if ([package matches:text])
-            [packages addObject:package];
-    }
+- (void) addProgressOutput:(NSString *)output {
+    [self
+        performSelectorOnMainThread:@selector(_addProgressOutput:)
+        withObject:output
+        waitUntilDone:YES
+    ];
+}
+
+- (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_;
+}
+
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    [sheet dismiss];
+}
+
+- (void) _setProgressTitle:(NSString *)title {
+    [prompt_ setText:title];
+}
 
-    [table_ setPackages:packages];
-    [[table_ table] scrollPointVisibleAtTopLeft:CGPointMake(0, 0) animated:NO];
+- (void) _setProgressPercent:(NSNumber *)percent {
+    [progress_ setProgress:[percent floatValue]];
+}
+
+- (void) _addProgressOutput:(NSString *)output {
 }
 
 @end
-/* }}} */
 
 @interface Cydia : UIApplication <
     ConfirmationViewDelegate,
     ProgressViewDelegate,
-    SearchViewDelegate
+    SearchViewDelegate,
+    CydiaDelegate
 > {
     UIWindow *window_;
+
     UIView *underlay_;
     UIView *overlay_;
-    UITransitionView *transition_;
-    UIButtonBar *buttonbar_;
+    CYBook *book_;
+    UIToolbar *buttonbar_;
 
     ConfirmationView *confirm_;
 
+    NSMutableArray *essential_;
+    NSMutableArray *broken_;
+
     Database *database_;
     ProgressView *progress_;
 
-    UIView *featured_;
-    UINavigationBar *navbar_;
-    UIScroller *scroller_;
-    UIWebView *webview_;
-    NSURL *url_;
-    UIProgressIndicator *indicator_;
+    unsigned tag_;
+
+    UIKeyboard *keyboard_;
+    UIProgressHUD *hud_;
 
     InstallView *install_;
     ChangesView *changes_;
     ManageView *manage_;
     SearchView *search_;
+}
 
-    bool restart_;
-    unsigned tag_;
+@end
 
-    UIKeyboard *keyboard_;
+@implementation Cydia
+
+- (void) _loaded {
+    if ([broken_ count] != 0) {
+        int count = [broken_ count];
+
+        UIActionSheet *sheet = [[[UIActionSheet alloc]
+            initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
+            buttons:[NSArray arrayWithObjects:
+                @"Forcibly Clear",
+                @"Ignore (Temporary)",
+            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 popupAlertAnimated:YES];
+    } else if (!Ignored_ && [essential_ count] != 0) {
+        int count = [essential_ count];
+
+        UIActionSheet *sheet = [[[UIActionSheet alloc]
+            initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
+            buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
+            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 popupAlertAnimated:YES];
+    }
 }
 
-- (void) loadNews;
-- (void) reloadData:(BOOL)reset;
-- (void) setPrompt;
+- (void) _reloadData {
+    /*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
+    [hud setText:@"Reloading Data"];
+    [overlay_ addSubview:hud];
+    [hud show:YES];*/
 
-- (void) resolve;
-- (void) perform;
-- (void) upgrade;
-- (void) update;
+    [database_ reloadData];
 
-- (void) cancel;
-- (void) confirm;
+    size_t changes(0);
+
+    [essential_ removeAllObjects];
+    [broken_ removeAllObjects];
 
-- (void) progressViewIsComplete:(ProgressView *)progress;
+    NSArray *packages = [database_ packages];
+    for (int i(0), e([packages count]); i != e; ++i) {
+        Package *package = [packages objectAtIndex:i];
+        if ([package half])
+            [broken_ addObject:package];
+        if ([package upgradableAndEssential:NO]) {
+            if ([package essential])
+                [essential_ addObject:package];
+            ++changes;
+        }
+    }
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
-- (void) buttonBarItemTapped:(id)sender;
+    if (changes != 0) {
+        NSString *badge([[NSNumber numberWithInt:changes] stringValue]);
+        [buttonbar_ setBadgeValue:badge forButton:3];
+        if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
+            [buttonbar_ setBadgeAnimated:YES forButton:3];
+        [self setApplicationBadge:badge];
+    } else {
+        [buttonbar_ setBadgeValue:nil forButton:3];
+        if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
+            [buttonbar_ setBadgeAnimated:NO forButton:3];
+        [self removeApplicationBadge];
+    }
 
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old;
+    [self updateData];
 
-- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame;
+    if ([packages count] == 0);
+    else if (Loaded_)
+        [self _loaded];
+    else {
+        Loaded_ = YES;
+        [book_ update];
+    }
 
-- (void) applicationWillSuspend;
-- (void) applicationDidFinishLaunching:(id)unused;
-@end
+    /*[hud show:NO];
+    [hud removeFromSuperview];*/
+}
 
-@implementation Cydia
-#include "internals.h"
+- (void) _saveConfig {
+    if (Changed_) {
+        _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
+        Changed_ = false;
+    }
+}
 
-- (void) loadNews {
-    NSMutableURLRequest *request = [NSMutableURLRequest
-        requestWithURL:url_
-        cachePolicy:NSURLRequestReloadIgnoringCacheData
-        timeoutInterval:30.0
-    ];
+- (void) updateData {
+    [self _saveConfig];
 
-    [request addValue:[NSString stringWithCString:Machine_] forHTTPHeaderField:@"X-Machine"];
-    [request addValue:[NSString stringWithCString:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];
+    /* XXX: this is just stupid */
+    if (tag_ != 2)
+        [install_ reloadData];
+    if (tag_ != 3)
+        [changes_ reloadData];
+    if (tag_ != 5)
+        [search_ reloadData];
 
-    [webview_ loadRequest:request];
+    [book_ reloadData];
 }
 
-- (void) reloadData:(BOOL)reset {
-    [database_ reloadData];
+- (void) update_ {
+    [database_ update];
+}
 
-    size_t count = 16;
+- (void) syncData {
+    FILE *file = fopen("/etc/apt/sources.list.d/cydia.list", "w");
+    _assert(file != NULL);
 
-    if (Packages_ == nil) {
-        Packages_ = [[NSMutableDictionary alloc] initWithCapacity:count];
-        [Metadata_ setObject:Packages_ forKey:@"Packages"];
-    }
+    NSArray *keys = [Sources_ allKeys];
 
-    now_ = [NSDate date];
+    for (int i(0), e([keys count]); i != e; ++i) {
+        NSString *key = [keys objectAtIndex:i];
+        NSDictionary *source = [Sources_ objectForKey:key];
 
-    NSMutableArray *packages = [NSMutableArray arrayWithCapacity:count];
-    for (pkgCache::PkgIterator iterator = [database_ cache]->PkgBegin(); !iterator.end(); ++iterator)
-        if (Package *package = [Package packageWithIterator:iterator database:database_])
-            [packages addObject:package];
+        fprintf(file, "%s %s %s\n",
+            [[source objectForKey:@"Type"] UTF8String],
+            [[source objectForKey:@"URI"] UTF8String],
+            [[source objectForKey:@"Distribution"] UTF8String]
+        );
+    }
 
-    [install_ setPackages:packages];
-    [changes_ setPackages:packages];
-    [manage_ setPackages:packages];
-    [search_ setPackages:packages];
+    fclose(file);
 
-    if (size_t count = [changes_ count]) {
-        NSString *badge([[NSNumber numberWithInt:count] stringValue]);
-        [buttonbar_ setBadgeValue:badge forButton:3];
-        if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
-            [buttonbar_ setBadgeAnimated:YES forButton:3];
-        [self setApplicationBadge:badge];
-    } else {
-        [buttonbar_ setBadgeValue:nil forButton:3];
-        if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
-            [buttonbar_ setBadgeAnimated:NO forButton:3];
-        [self removeApplicationBadge];
-    }
+    [self _saveConfig];
 
-    _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
+    [progress_
+        detachNewThreadSelector:@selector(update_)
+        toTarget:self
+        withObject:nil
+        title:@"Updating Sources"
+    ];
 }
 
-- (void) setPrompt {
-    [navbar_ setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
+- (void) reloadData {
+    @synchronized (self) {
+        if (confirm_ == nil)
+            [self _reloadData];
+    }
 }
 
 - (void) resolve {
@@ -3222,29 +5805,74 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (void) perform {
     [database_ prepare];
-    confirm_ = [[ConfirmationView alloc] initWithView:underlay_ database:database_ delegate:self];
+
+    if ([database_ cache]->BrokenCount() == 0)
+        confirm_ = [[ConfirmationView alloc] initWithView:underlay_ database:database_ delegate:self];
+    else {
+        NSMutableArray *broken = [NSMutableArray arrayWithCapacity:16];
+        NSArray *packages = [database_ packages];
+
+        for (size_t i(0); i != [packages count]; ++i) {
+            Package *package = [packages objectAtIndex:i];
+            if ([package broken])
+                [broken addObject:[package name]];
+        }
+
+        UIActionSheet *sheet = [[[UIActionSheet alloc]
+            initWithTitle:[NSString stringWithFormat:@"%d Broken Packages", [database_ cache]->BrokenCount()]
+            buttons:[NSArray arrayWithObjects:@"Okay", nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"broken"
+        ] autorelease];
+
+        [sheet setBodyText:[NSString stringWithFormat:@"The following packages have unmet dependencies:\n\n%@", [broken componentsJoinedByString:@"\n"]]];
+        [sheet popupAlertAnimated:YES];
+
+        [self _reloadData];
+    }
 }
 
-- (void) upgrade {
-    [database_ upgrade];
-    [self perform];
+- (void) installPackage:(Package *)package {
+    @synchronized (self) {
+        [package install];
+        [self resolve];
+        [self perform];
+    }
+}
+
+- (void) removePackage:(Package *)package {
+    @synchronized (self) {
+        [package remove];
+        [self resolve];
+        [self perform];
+    }
+}
+
+- (void) distUpgrade {
+    @synchronized (self) {
+        [database_ upgrade];
+        [self perform];
+    }
 }
 
 - (void) cancel {
-    [self reloadData:NO];
-    [confirm_ release];
-    confirm_ = nil;
+    @synchronized (self) {
+        [confirm_ release];
+        confirm_ = nil;
+        [self _reloadData];
+    }
 }
 
 - (void) confirm {
     [overlay_ removeFromSuperview];
-    restart_ = true;
+    reload_ = true;
 
     [progress_
         detachNewThreadSelector:@selector(perform)
         toTarget:database_
         withObject:nil
-        title:@"Running..."
+        title:@"Running"
     ];
 }
 
@@ -3260,207 +5888,125 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         detachNewThreadSelector:@selector(bootstrap_)
         toTarget:self
         withObject:nil
-        title:@"Bootstrap Install..."
-    ];
-}
-
-- (void) update {
-    [progress_
-        detachNewThreadSelector:@selector(update)
-        toTarget:database_
-        withObject:nil
-        title:@"Refreshing Sources..."
+        title:@"Bootstrap Install"
     ];
 }
 
 - (void) progressViewIsComplete:(ProgressView *)progress {
-    [self reloadData:YES];
-
-    if (confirm_ != nil) {
-        [underlay_ addSubview:overlay_];
-        [confirm_ removeFromSuperview];
-        [confirm_ release];
-        confirm_ = nil;
+    @synchronized (self) {
+        [self _reloadData];
+
+        if (confirm_ != nil) {
+            [underlay_ addSubview:overlay_];
+            [confirm_ removeFromSuperview];
+            [confirm_ release];
+            confirm_ = nil;
+        }
     }
 }
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    switch (button) {
-        case 0:
-            [self loadNews];
-        break;
-
-        case 1:
-            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-                initWithTitle:@"About Cydia Packager"
-                buttons:[NSArray arrayWithObjects:@"Close", nil]
-                defaultButtonIndex:0
-                delegate:self
-                context:self
-            ] autorelease];
-
-            [sheet setBodyText:
-                @"Copyright (C) 2008\n"
-                "Jay Freeman (saurik)\n"
-                "saurik@saurik.com\n"
-                "http://www.saurik.com/\n"
-                "\n"
-                "The Okori Group\n"
-                "http://www.theokorigroup.com/\n"
-                "\n"
-                "College of Creative Studies,\n"
-                "University of California,\n"
-                "Santa Barbara\n"
-                "http://www.ccs.ucsb.edu/\n"
-                "\n"
-                "Special Thanks:\n"
-                "bad_, BHSPitMonkey, cash, Cobra,\n"
-                "core, Corona, crashx, cromas,\n"
-                "Darken, dtzWill, Erica, francis,\n"
-                "Godores, jerry, Kingstone, lounger,\n"
-                "mbranes, rockabilly, tman, Wbiggs"
-            ];
+- (void) setPage:(RVPage *)page {
+    [page resetViewAnimated:NO];
+    [page setDelegate:self];
+    [book_ setPage:page];
+}
 
-            [sheet presentSheetFromButtonBar:buttonbar_];
-        break;
-    }
+- (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class {
+    BrowserView *browser = [[[_class alloc] initWithBook:book_ database:database_] autorelease];
+    [browser loadURL:url];
+    return browser;
 }
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [sheet dismiss];
+- (void) _setHomePage {
+    [self setPage:[self _pageForURL:[NSURL URLWithString:@"http://cydia.saurik.com/"] withClass:[HomeView class]]];
 }
 
 - (void) buttonBarItemTapped:(id)sender {
-    UIView *view;
     unsigned tag = [sender tag];
+    if (tag == tag_) {
+        [book_ resetViewAnimated:YES];
+        return;
+    } else if (tag_ == 2 && tag != 2)
+        [install_ resetView];
 
     switch (tag) {
-        case 1: view = featured_; break;
-        case 2: view = install_; break;
-        case 3: view = changes_; break;
-        case 4: view = manage_; break;
-        case 5: view = search_; break;
+        case 1: [self _setHomePage]; break;
 
-        default:
-            _assert(false);
+        case 2: [self setPage:install_]; break;
+        case 3: [self setPage:changes_]; break;
+        case 4: [self setPage:manage_]; break;
+        case 5: [self setPage:search_]; break;
+
+        default: _assert(false);
     }
 
-    if ([view respondsToSelector:@selector(resetView:)])
-        [(id) view resetView:(tag == tag_ ? NO : YES)];
     tag_ = tag;
-    [transition_ transition:0 toView:view];
-}
-
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
-    [scroller_ setContentSize:frame.size];
-    [indicator_ stopAnimation];
-}
-
-- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
-    [navbar_ setPrompt:title];
-}
-
-- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
-    [navbar_ setPrompt:@"Loading..."];
-    [indicator_ startAnimation];
 }
 
 - (void) applicationWillSuspend {
-    if (restart_)
-        system("launchctl stop com.apple.SpringBoard");
+    [database_ clean];
     [super applicationWillSuspend];
 }
 
-- (void) applicationDidFinishLaunching:(id)unused {
-    _assert(pkgInitConfig(*_config));
-    _assert(pkgInitSystem(*_config, _system));
+- (void) askForSettings {
+    UIActionSheet *role = [[[UIActionSheet alloc]
+        initWithTitle:@"Who Are You?"
+        buttons:[NSArray arrayWithObjects:
+            @"User (Graphical Only)",
+            @"Hacker (+ Command Line)",
+            @"Developer (No Filters)",
+        nil]
+        defaultButtonIndex:-1
+        delegate:self
+        context:@"role"
+    ] autorelease];
 
-    confirm_ = nil;
-    restart_ = false;
-    tag_ = 1;
+    [role setBodyText:@"Not all of the packages available via Cydia are designed to be used by all users. Please categorize yourself so that Cydia can apply helpful filters.\n\nThis choice can be changed from \"Settings\" under the \"Manage\" tab."];
+    [role popupAlertAnimated:YES];
+}
 
-    CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
-    window_ = [[UIWindow alloc] initWithContentRect:screenrect];
+- (void) finish {
+    if (hud_ != nil) {
+        [self setStatusBarShowsProgress:NO];
 
-    [window_ orderFront: self];
-    [window_ makeKey: self];
-    [window_ _setHidden: NO];
+        [hud_ show:NO];
+        [hud_ removeFromSuperview];
+        [hud_ autorelease];
+        hud_ = nil;
 
-    progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] delegate:self];
-    [window_ setContentView:progress_];
+        pid_t pid = ExecFork();
+        if (pid == 0) {
+            execlp("launchctl", "launchctl", "stop", "com.apple.SpringBoard", NULL);
+            perror("launchctl stop");
+        }
 
-    underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];
-    [progress_ setContentView:underlay_];
+        return;
+    }
 
-    overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];
+    if (Role_ == nil) {
+        [self askForSettings];
+        return;
+    }
 
-    if (!bootstrap_)
-        [underlay_ addSubview:overlay_];
+    overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];
 
-    transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
+    CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
+    book_ = [[CYBook alloc] initWithFrame:CGRectMake(
         0, 0, screenrect.size.width, screenrect.size.height - 48
-    )];
-
-    [overlay_ addSubview:transition_];
+    ) database:database_];
 
-    featured_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+    [book_ setDelegate:self];
 
-    CGSize navsize = [UINavigationBar defaultSizeWithPrompt];
-    CGRect navrect = {{0, 0}, navsize};
-
-    navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-    [featured_ addSubview:navbar_];
-
-    [navbar_ setBarStyle:1];
-    [navbar_ setDelegate:self];
-
-    [navbar_ showButtonsWithLeftTitle:@"About" rightTitle:@"Reload"];
-
-    UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Featured"] autorelease];
-    [navbar_ pushNavigationItem:navitem];
-
-    struct CGRect subbounds = [featured_ bounds];
-    subbounds.origin.y += navsize.height;
-    subbounds.size.height -= navsize.height;
-
-    UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:subbounds] autorelease];
-    [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
-    [featured_ addSubview:pinstripe];
-
-    scroller_ = [[UIScroller alloc] initWithFrame:subbounds];
-    [featured_ 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_ = [[UIWebView alloc] initWithFrame:webrect];
-    [scroller_ addSubview:webview_];
-
-    [webview_ setTilingEnabled:YES];
-    [webview_ setTileSize:CGSizeMake(screenrect.size.width, 500)];
-    [webview_ setAutoresizes:YES];
-    [webview_ setDelegate:self];
-
-    CGSize indsize = [UIProgressIndicator defaultSizeForStyle:2];
-    indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(87, 45, indsize.width, indsize.height)];
-    [indicator_ setStyle:2];
-    [featured_ addSubview:indicator_];
+    [overlay_ addSubview:book_];
 
     NSArray *buttonitems = [NSArray arrayWithObjects:
         [NSDictionary dictionaryWithObjectsAndKeys:
             @"buttonBarItemTapped:", kUIButtonBarButtonAction,
-            @"featured-up.png", kUIButtonBarButtonInfo,
-            @"featured-dn.png", kUIButtonBarButtonSelectedInfo,
+            @"home-up.png", kUIButtonBarButtonInfo,
+            @"home-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:1], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Featured", kUIButtonBarButtonTitle,
+            @"Home", kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
@@ -3470,7 +6016,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             @"install-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:2], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Install", kUIButtonBarButtonTitle,
+            @"Sections", kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
@@ -3490,7 +6036,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             @"manage-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:4], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Uninstall", kUIButtonBarButtonTitle,
+            @"Manage", kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
@@ -3505,11 +6051,11 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         nil],
     nil];
 
-    buttonbar_ = [[UIButtonBar alloc]
+    buttonbar_ = [[UIToolbar alloc]
         initInView:overlay_
         withFrame:CGRectMake(
-            0, screenrect.size.height - 48,
-            screenrect.size.width, 48
+            0, screenrect.size.height - ButtonBarHeight_,
+            screenrect.size.width, ButtonBarHeight_
         )
         withItemList:buttonitems
     ];
@@ -3524,62 +6070,237 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
     for (int i = 0; i != 5; ++i)
         [[buttonbar_ viewWithTag:(i + 1)] setFrame:CGRectMake(
-            i * 64 + 2, 1, 60, 48
+            i * 64 + 2, 1, 60, ButtonBarHeight_
         )];
 
     [buttonbar_ showSelectionForButton:1];
-    [transition_ transition:0 toView:featured_];
-
     [overlay_ addSubview:buttonbar_];
 
     [UIKeyboard initImplementationNow];
-
-    CGRect edtrect = [overlay_ bounds];
-    edtrect.origin.y += navsize.height;
-    edtrect.size.height -= navsize.height;
-
     CGSize keysize = [UIKeyboard defaultSize];
-    CGRect keyrect = {{0, [overlay_ bounds].size.height - keysize.height}, keysize};
+    CGRect keyrect = {{0, [overlay_ bounds].size.height}, keysize};
     keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect];
+    [[UIKeyboardImpl sharedInstance] setSoundsEnabled:(Sounds_Keyboard_ ? YES : NO)];
+    [overlay_ addSubview:keyboard_];
 
-    database_ = [[Database alloc] init];
-    [database_ setDelegate:progress_];
+    install_ = [[InstallView alloc] initWithBook:book_ database:database_];
+    changes_ = [[ChangesView alloc] initWithBook:book_ database:database_];
+    search_ = [[SearchView alloc] initWithBook:book_ database:database_];
 
-    install_ = [[InstallView alloc] initWithFrame:[transition_ bounds]];
-    [install_ setDelegate:self];
+    manage_ = (ManageView *) [[self
+        _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]]
+        withClass:[ManageView class]
+    ] retain];
 
-    changes_ = [[ChangesView alloc] initWithFrame:[transition_ bounds]];
-    [changes_ setDelegate:self];
+    if (!bootstrap_)
+        [underlay_ addSubview:overlay_];
 
-    manage_ = [[ManageView alloc] initWithFrame:[transition_ bounds]];
-    [manage_ setDelegate:self];
+    [self reloadData];
 
-    search_ = [[SearchView alloc] initWithFrame:[transition_ bounds]];
-    [search_ setDelegate:self];
+    if (bootstrap_)
+        [self bootstrap];
+    else
+        [self _setHomePage];
+}
 
-    [self reloadData:NO];
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context = [sheet context];
+    if ([context isEqualToString:@"fixhalf"])
+        switch (button) {
+            case 1:
+                @synchronized (self) {
+                    for (int i = 0, e = [broken_ count]; i != e; ++i) {
+                        Package *broken = [broken_ objectAtIndex:i];
+                        [broken remove];
+
+                        NSString *id = [broken id];
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]);
+                    }
+
+                    [self resolve];
+                    [self perform];
+                }
+            break;
 
-    Package *package([database_ packageWithName:@"cydia"]);
-    NSString *application = package == nil ? @"Cydia" : [NSString stringWithFormat:@"Cydia/%@", [package installed]];
+            case 2:
+                [broken_ removeAllObjects];
+                [self _loaded];
+            break;
 
-    WebView *webview = [webview_ webView];
-    [webview setApplicationNameForUserAgent:application];
-    [webview setFrameLoadDelegate:self];
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"role"]) {
+        switch (button) {
+            case 1: Role_ = @"User"; break;
+            case 2: Role_ = @"Hacker"; break;
+            case 3: Role_ = @"Developer"; break;
+
+            default:
+                Role_ = nil;
+                _assert(false);
+        }
+
+        bool reset = Settings_ != nil;
+
+        Settings_ = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+            Role_, @"Role",
+        nil];
+
+        [Metadata_ setObject:Settings_ forKey:@"Settings"];
+
+        Changed_ = true;
+
+        if (reset)
+            [self updateData];
+        else
+            [self finish];
+    } else if ([context isEqualToString:@"upgrade"])
+        switch (button) {
+            case 1:
+                @synchronized (self) {
+                    for (int i = 0, e = [essential_ count]; i != e; ++i) {
+                        Package *essential = [essential_ objectAtIndex:i];
+                        [essential install];
+                    }
+
+                    [self resolve];
+                    [self perform];
+                }
+            break;
+
+            case 2:
+                Ignored_ = YES;
+            break;
+
+            default:
+                _assert(false);
+        }
+
+    [sheet dismiss];
+}
+
+- (void) reorganize {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    system("/usr/libexec/cydia/free.sh");
+    [self performSelectorOnMainThread:@selector(finish) withObject:nil waitUntilDone:NO];
+    [pool release];
+}
+
+- (void) applicationSuspend:(__GSEvent *)event {
+    if (hud_ == nil && ![progress_ isRunning])
+        [super applicationSuspend:event];
+}
+
+- (void) _animateSuspension:(BOOL)arg0 duration:(double)arg1 startTime:(double)arg2 scale:(float)arg3 {
+    if (hud_ == nil)
+        [super _animateSuspension:arg0 duration:arg1 startTime:arg2 scale:arg3];
+}
+
+- (void) _setSuspended:(BOOL)value {
+    if (hud_ == nil)
+        [super _setSuspended:value];
+}
+
+- (UIProgressHUD *) addProgressHUD {
+    UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
+    [hud show:YES];
+    [underlay_ addSubview:hud];
+    return hud;
+}
+
+- (void) applicationDidFinishLaunching:(id)unused {
+    Font12_ = [[UIFont systemFontOfSize:12] retain];
+    Font12Bold_ = [[UIFont boldSystemFontOfSize:12] retain];
+    Font14_ = [[UIFont systemFontOfSize:14] retain];
+    Font18Bold_ = [[UIFont boldSystemFontOfSize:18] retain];
+    Font22Bold_ = [[UIFont boldSystemFontOfSize:22] retain];
+
+    _assert(pkgInitConfig(*_config));
+    _assert(pkgInitSystem(*_config, _system));
+
+    confirm_ = nil;
+    tag_ = 1;
+
+    essential_ = [[NSMutableArray alloc] initWithCapacity:4];
+    broken_ = [[NSMutableArray alloc] initWithCapacity:4];
+
+    CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
+    window_ = [[UIWindow alloc] initWithContentRect:screenrect];
+
+    [window_ orderFront:self];
+    [window_ makeKey:self];
+    [window_ _setHidden:NO];
+
+    database_ = [[Database alloc] init];
+    progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
+    [database_ setDelegate:progress_];
+    [window_ setContentView:progress_];
 
-    url_ = [NSURL URLWithString:@"http://cydia.saurik.com/"];
-    [self loadNews];
+    underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];
+    [progress_ setContentView:underlay_];
 
     [progress_ resetView];
 
-    if (bootstrap_)
-        [self bootstrap];
+    if (
+        readlink("/Applications", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/Library/Ringtones", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/usr/include", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/usr/libexec", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL /*||
+        readlink("/var/lib", NULL, 0) == -1 && errno == EINVAL*/
+    ) {
+        [self setIdleTimerDisabled:YES];
+
+        hud_ = [self addProgressHUD];
+        [hud_ setText:@"Reorganizing\n\nWill Automatically\nRestart When Done"];
+
+        [self setStatusBarShowsProgress:YES];
+
+        [NSThread
+            detachNewThreadSelector:@selector(reorganize)
+            toTarget:self
+            withObject:nil
+        ];
+    } else
+        [self finish];
 }
 
 - (void) showKeyboard:(BOOL)show {
-    if (show)
-        [overlay_ addSubview:keyboard_];
+    CGSize keysize = [UIKeyboard defaultSize];
+    CGRect keydown = {{0, [overlay_ bounds].size.height}, keysize};
+    CGRect keyup = keydown;
+    keyup.origin.y -= keysize.height;
+
+    UIFrameAnimation *animation = [[[UIFrameAnimation alloc] initWithTarget:keyboard_] autorelease];
+    [animation setSignificantRectFields:2];
+
+    if (show) {
+        [animation setStartFrame:keydown];
+        [animation setEndFrame:keyup];
+        [keyboard_ activate];
+    } else {
+        [animation setStartFrame:keyup];
+        [animation setEndFrame:keydown];
+        [keyboard_ deactivate];
+    }
+
+    [[UIAnimator sharedAnimator]
+        addAnimations:[NSArray arrayWithObjects:animation, nil]
+        withDuration:KeyboardTime_
+        start:YES
+    ];
+}
+
+- (void) slideUp:(UIActionSheet *)alert {
+    if (Advanced_)
+        [alert presentSheetFromButtonBar:buttonbar_];
     else
-        [keyboard_ removeFromSuperview];
+        [alert presentSheetInView:overlay_];
 }
 
 @end
@@ -3632,24 +6353,55 @@ id Alloc_(id self, SEL selector) {
     return object;
 }*/
 
+/*IMP dealloc_;
+id Dealloc_(id self, SEL selector) {
+    id object = dealloc_(self, selector);
+    fprintf(stderr, "[%s]D-%p\n", self->isa->name, object);
+    return object;
+}*/
+
 int main(int argc, char *argv[]) {
-    struct nlist nl[2];
-    memset(nl, 0, sizeof(nl));
-    nl[0].n_un.n_name = "_useMDNSResponder";
-    nlist("/usr/lib/libc.dylib", nl);
-    if (nl[0].n_type != N_UNDF)
-        *(int *) nl[0].n_value = 0;
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
     bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0;
 
+    App_ = [[NSBundle mainBundle] bundlePath];
+    Home_ = NSHomeDirectory();
+    Locale_ = CFLocaleCopyCurrent();
+
+    {
+        NSString *plist = [Home_ stringByAppendingString:@"/Library/Preferences/com.apple.preferences.sounds.plist"];
+        if (NSDictionary *sounds = [NSDictionary dictionaryWithContentsOfFile:plist])
+            if (NSNumber *keyboard = [sounds objectForKey:@"keyboard"])
+                Sounds_Keyboard_ = [keyboard boolValue];
+    }
+
     setuid(0);
     setgid(0);
 
+    if (unlink("/var/cache/apt/pkgcache.bin") == -1)
+        _assert(errno == ENOENT);
+    if (unlink("/var/cache/apt/srcpkgcache.bin") == -1)
+        _assert(errno == ENOENT);
+
     /*Method alloc = class_getClassMethod([NSObject class], @selector(alloc));
     alloc_ = alloc->method_imp;
     alloc->method_imp = (IMP) &Alloc_;*/
 
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    /*Method dealloc = class_getClassMethod([NSObject class], @selector(dealloc));
+    dealloc_ = dealloc->method_imp;
+    dealloc->method_imp = (IMP) &Dealloc_;*/
+
+    if (NSDictionary *sysver = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"]) {
+        if (NSString *prover = [sysver valueForKey:@"ProductVersion"]) {
+            Firmware_ = strdup([prover UTF8String]);
+            NSArray *versions = [prover componentsSeparatedByString:@"."];
+            int count = [versions count];
+            Major_ = count > 0 ? [[versions objectAtIndex:0] intValue] : 0;
+            Minor_ = count > 1 ? [[versions objectAtIndex:1] intValue] : 0;
+            BugFix_ = count > 2 ? [[versions objectAtIndex:2] intValue] : 0;
+        }
+    }
 
     size_t size;
     sysctlbyname("hw.machine", NULL, &size, NULL, 0);
@@ -3657,27 +6409,76 @@ int main(int argc, char *argv[]) {
     sysctlbyname("hw.machine", machine, &size, NULL, 0);
     Machine_ = machine;
 
-    if (CFMutableDictionaryRef dict = IOServiceMatching("IOPlatformExpertDevice"))
-        if (io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, dict)) {
-            if (CFTypeRef serial = IORegistryEntryCreateCFProperty(service, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault, 0)) {
-                SerialNumber_ = strdup(CFStringGetCStringPtr((CFStringRef) serial, CFStringGetSystemEncoding()));
-                CFRelease(serial);
-            }
-
-            IOObjectRelease(service);
-        }
+    UniqueID_ = [[UIDevice currentDevice] uniqueIdentifier];
 
-    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];
-    else
+    else {
+        Settings_ = [Metadata_ objectForKey:@"Settings"];
+
         Packages_ = [Metadata_ objectForKey:@"Packages"];
+        Sections_ = [Metadata_ objectForKey:@"Sections"];
+        Sources_ = [Metadata_ objectForKey:@"Sources"];
+    }
+
+    if (Settings_ != nil)
+        Role_ = [Settings_ objectForKey:@"Role"];
+
+    if (Packages_ == nil) {
+        Packages_ = [[[NSMutableDictionary alloc] initWithCapacity:128] autorelease];
+        [Metadata_ setObject:Packages_ forKey:@"Packages"];
+    }
+
+    if (Sections_ == nil) {
+        Sections_ = [[[NSMutableDictionary alloc] initWithCapacity:32] autorelease];
+        [Metadata_ setObject:Sections_ forKey:@"Sections"];
+    }
+
+    if (Sources_ == nil) {
+        Sources_ = [[[NSMutableDictionary alloc] initWithCapacity:0] autorelease];
+        [Metadata_ setObject:Sources_ forKey:@"Sources"];
+    }
+
+    Documents_ = [[[NSMutableArray alloc] initWithCapacity:4] autorelease];
+
+    if (access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0)
+        dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);
+
+    if (access("/User", F_OK) != 0)
+        system("/usr/libexec/cydia/firmware.sh");
+
+    _assert([[NSFileManager defaultManager]
+        createDirectoryAtPath:@"/var/cache/apt/archives/partial"
+        withIntermediateDirectories:YES
+        attributes:nil
+        error:NULL
+    ]);
+
+    space_ = CGColorSpaceCreateDeviceRGB();
+
+    Blue_.Set(space_, 0.2, 0.2, 1.0, 1.0);
+    Blueish_.Set(space_, 0x19/255.f, 0x32/255.f, 0x50/255.f, 1.0);
+    Black_.Set(space_, 0.0, 0.0, 0.0, 1.0);
+    Off_.Set(space_, 0.9, 0.9, 0.9, 1.0);
+    Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);
+    White_.Set(space_, 1.0, 1.0, 1.0, 1.0);
+    Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0);
+
+    Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil];
+
+    SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease];
+
+    UIApplicationUseLegacyEvents(YES);
+    UIKeyboardDisableAutomaticAppearance();
+
+    int value = UIApplicationMain(argc, argv, @"Cydia", @"Cydia");
 
-    system("dpkg --configure -a");
+    CGColorSpaceRelease(space_);
+    CFRelease(Locale_);
 
-    UIApplicationMain(argc, argv, [Cydia class]);
     [pool release];
-    return 0;
+    return value;
 }