Fixes for 1.0.2.

[cydia.git] / Cydia.mm

diff --git a/Cydia.mm b/Cydia.mm
index 04c0dbe956d34a5651dc7ceea7452db8fac39f82..a773da849f5eb0f7a3df127a2eb7d0e6f9eaead6 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -1,15 +1,67 @@
+/* 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 Directives {{{ */

-#include <Foundation/NSURL.h>
+#include <objc/objc.h>
+#include <objc/runtime.h>
+
+#include <CoreGraphics/CoreGraphics.h>
+#include <GraphicsServices/GraphicsServices.h>
+#include <Foundation/Foundation.h>

 #include <UIKit/UIKit.h>
 #include <UIKit/UIKit.h>

-#import <GraphicsServices/GraphicsServices.h>
+#include <WebCore/DOMHTML.h>
+
+#import "BrowserView.h"
+#import "ResetView.h"
+#import "UICaboodle.h"
+
+#include <WebKit/WebFrame.h>
+#include <WebKit/WebView.h>

 
 #include <sstream>
 
 #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 <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/configuration.h>
 #include <apt-pkg/debmetaindex.h>
 #include <apt-pkg/error.h>


@@ -19,80 +71,143 @@
 #include <apt-pkg/sptr.h>
 
 #include <sys/sysctl.h>
 #include <apt-pkg/sptr.h>
 
 #include <sys/sysctl.h>

+#include <notify.h>

 
 extern "C" {
 #include <mach-o/nlist.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 <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)

 /* }}} */
 /* }}} */

-/* Miscellaneous Messages {{{ */
-@interface WebView
-- (void) setApplicationNameForUserAgent:(NSString *)applicationName;
-- (id) frameLoadDelegate;
-- (void) setFrameLoadDelegate:(id)delegate;
+
+/* iPhoneOS 2.0 Compatibility {{{ */
+#ifdef __OBJC2__
+@interface UICGColor : NSObject {
+}
+
+- (id) initWithCGColor:(CGColorRef)color;

 @end
 
 @end
 

-@interface NSString (Cydia)
-- (NSString *) stringByAddingPercentEscapes;
-- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;
+@interface UIFont {
+}
+
+- (UIFont *) fontWithSize:(CGFloat)size;

 @end
 @end

-/* }}} */

 
 

-/* Reset View (UIView) {{{ */
-@interface UIView (CYResetView)
-- (void) resetViewAnimated:(BOOL)animated;
+@interface NSObject (iPhoneOS)
+- (CGColorRef) cgColor;
+- (CGColorRef) CGColor;
+- (void) set;

 @end
 
 @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
 }
 
 @end

-/* }}} */
-/* Reset View (UITable) {{{ */
-@interface UITable (CYResetView)
-- (void) resetViewAnimated:(BOOL)animated;
+
+@interface UITextView (iPhoneOS)
+- (void) setTextSize:(float)size;

 @end
 
 @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
 }
 
 @end

+#endif

 /* }}} */
 /* }}} */

-/* Reset View (UISectionList) {{{ */
-@interface UISectionList (CYResetView)
-- (void) resetViewAnimated:(BOOL)animated;
+
+#ifdef __OBJC2__
+typedef enum {
+    kUIProgressIndicatorStyleMediumWhite = 1,
+    kUIProgressIndicatorStyleSmallWhite = 0,
+    kUIProgressIndicatorStyleSmallBlack = 4
+} UIProgressIndicatorStyle;
+#else
+typedef enum {
+    kUIProgressIndicatorStyleMediumWhite = 0,
+    kUIProgressIndicatorStyleSmallWhite = 2,
+    kUIProgressIndicatorStyleSmallBlack = 3
+} UIProgressIndicatorStyle;
+#endif
+
+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
 
 @end
 

-@implementation UISectionList (CYResetView)
+@implementation NSString (Cydia)

 
 

-- (void) resetViewAnimated:(BOOL)animated {
-    [[self table] resetViewAnimated:animated];
++ (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
 }
 
 @end

-/* }}} */

 
 /* Perl-Compatible RegEx {{{ */
 class Pcre {
 
 /* Perl-Compatible RegEx {{{ */
 class Pcre {


@@ -126,10 +241,12 @@ class Pcre {
     }
 
     NSString *operator [](size_t match) {
     }
 
     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) {
     }
 
     bool operator ()(const char *data, size_t size) {


@@ -138,19 +255,94 @@ class Pcre {
     }
 };
 /* }}} */
     }
 };
 /* }}} */

-/* CoreGraphicsServices Primitives {{{ */
+/* Mime Addresses {{{ */
+Pcre email_r("^\"?(.*)\"? <([^>]*)>$");
+
+@interface Address : NSObject {
+    NSString *name_;
+    NSString *email_;
+}
+
+- (NSString *) name;
+- (NSString *) email;
+
++ (Address *) addressWithString:(NSString *)string;
+- (Address *) initWithString:(NSString *)string;
+@end
+
+@implementation Address
+
+- (void) dealloc {
+    [name_ release];
+    if (email_ != nil)
+        [email_ release];
+    [super dealloc];
+}
+
+- (NSString *) name {
+    return name_;
+}
+
+- (NSString *) email {
+    return email_;
+}
+
++ (Address *) addressWithString:(NSString *)string {
+    return [[[Address alloc] initWithString:string] autorelease];
+}
+
+- (Address *) initWithString:(NSString *)string {
+    if ((self = [super init]) != nil) {
+        const char *data = [string UTF8String];
+        size_t size = [string length];
+
+        if (email_r(data, size)) {
+            name_ = [email_r[1] retain];
+            email_ = [email_r[2] retain];
+        } else {
+            name_ = [[NSString alloc]
+                initWithBytes:data
+                length:size
+                encoding:kCFStringEncodingUTF8
+            ];
+
+            email_ = nil;
+        }
+    } return self;
+}
+
+@end
+/* }}} */
+/* CoreGraphics Primitives {{{ */

 class CGColor {
   private:
     CGColorRef color_;
 
   public:
 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(CGColorSpaceRef space, float red, float green, float blue, float alpha) :
+        color_(NULL)
+    {
+        Set(space, red, green, blue, alpha);
+    }
+
+    void Clear() {
+        if (color_ != NULL)
+            CGColorRelease(color_);

     }
 
     ~CGColor() {
     }
 
     ~CGColor() {

-        CGColorRelease(color_);
+        Clear();
+    }
+
+    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() {
     }
 
     operator CGColorRef() {


@@ -164,20 +356,98 @@ class GSFont {
 
   public:
     ~GSFont() {
 
   public:
     ~GSFont() {

-        /* XXX: no GSFontRelease()? */

         CFRelease(font_);
     }
 };
 /* }}} */
         CFRelease(font_);
     }
 };
 /* }}} */

+/* Right Alignment {{{ */
+@interface UIRightTextLabel : UITextLabel {
+    float       _savedRightEdgeX;
+    BOOL        _sizedtofit_flag;
+}
+
+- (void) setFrame:(CGRect)frame;
+- (void) setText:(NSString *)text;
+- (void) realignText;
+@end
+
+@implementation UIRightTextLabel
+
+- (void) setFrame:(CGRect)frame {
+    [super setFrame:frame];
+    if (_sizedtofit_flag == NO) {
+        _savedRightEdgeX = frame.origin.x;
+        [self realignText];
+    }
+}
+
+- (void) setText:(NSString *)text {
+    [super setText:text];
+    [self realignText];
+}
+
+- (void) realignText {
+    CGRect oldFrame = [self frame];
+
+    _sizedtofit_flag = YES;
+    [self sizeToFit]; // shrink down size so I can right align it
+
+    CGRect newFrame = [self frame];
+
+    oldFrame.origin.x = _savedRightEdgeX - newFrame.size.width;
+    oldFrame.size.width = newFrame.size.width;
+    [super setFrame:oldFrame];
+    _sizedtofit_flag = NO;
+}
+
+@end
+/* }}} */

 
 

+/* Random Global Variables {{{ */

 static const int PulseInterval_ = 50000;
 static const int PulseInterval_ = 50000;

+static const int ButtonBarHeight_ = 48;
+static const float KeyboardTime_ = 0.4f;
+static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist";
+
+#ifndef Cydia_
+#define Cydia_ ""
+#endif
+
+static CGColor Blueish_;
+static CGColor Black_;
+static CGColor Clear_;
+static CGColor Red_;
+static CGColor White_;
+
+static NSString *Home_;
+static BOOL Sounds_Keyboard_;
+
+static BOOL Advanced_;
+static BOOL Loaded_;
+static BOOL Ignored_;
+
+const char *Firmware_ = NULL;

 const char *Machine_ = NULL;
 const char *SerialNumber_ = NULL;
 
 const char *Machine_ = NULL;
 const char *SerialNumber_ = NULL;
 

-bool bootstrap_ = false;
+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 NSMutableDictionary *Metadata_;
 static NSMutableDictionary *Packages_;
 
 static NSMutableDictionary *Metadata_;
 static NSMutableDictionary *Packages_;

+static bool Changed_;

 static NSDate *now_;
 
 NSString *GetLastUpdate() {
 static NSDate *now_;
 
 NSString *GetLastUpdate() {


@@ -186,22 +456,18 @@ NSString *GetLastUpdate() {
     if (update == nil)
         return @"Never or Unknown";
 
     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);
     CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);
 
     CFRelease(formatter);

-    CFRelease(locale);

 
     return [(NSString *) formatted autorelease];
 }
 
     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;
 
 NSString *SizeString(double size) {
     unsigned power = 0;


@@ -215,22 +481,26 @@ NSString *SizeString(double size) {
     return [NSString stringWithFormat:@"%.1f%s", size, powers_[power]];
 }
 
     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];
 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];
         [text setHTML:value];

-    else
+    else*/

         [text setText:value];
     [text setEnabled:NO];
 
         [text setText:value];
     [text setEnabled:NO];
 

-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-    CGColor clear(space, 0, 0, 0, 0);
-    [text setBackgroundColor:clear];
-    CGColorSpaceRelease(space);
+    [text setBackgroundColor:Clear_];

 
     CGRect frame = [text frame];
     [text setFrame:frame];
 
     CGRect frame = [text frame];
     [text setFrame:frame];


@@ -241,12 +511,62 @@ UITextView *GetTextView(NSString *value, float left, bool html) {
     return text;
 }
 
     return text;
 }
 

+NSString *Simplify(NSString *title) {
+    const char *data = [title UTF8String];
+    size_t size = [title length];
+
+    Pcre title_r("^(.*?)( \\(.*\\))?$");
+    if (title_r(data, size))
+        return title_r[1];
+    else
+        return title;
+}
+/* }}} */
+
+/* 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) addProgressOutput:(NSString *)output;
+@end
+
+@protocol ConfigurationDelegate
+- (void) repairWithSelector:(SEL)selector;
+- (void) setConfigurationData:(NSString *)data;
+@end
+
+@protocol CydiaDelegate
+- (void) installPackage:(Package *)package;
+- (void) removePackage:(Package *)package;
+- (void) slideUp:(UIAlertSheet *)alert;
+- (void) distUpgrade;
+@end
+/* }}} */
+

 /* Status Delegation {{{ */
 class Status :
     public pkgAcquireStatus
 {
   private:
 /* Status Delegation {{{ */
 class Status :
     public pkgAcquireStatus
 {
   private:

-    id delegate_;
+    _transient NSObject<ProgressDelegate> *delegate_;

 
   public:
     Status() :
 
   public:
     Status() :


@@ -266,7 +586,7 @@ class Status :
     }
 
     virtual void Fetch(pkgAcquire::ItemDesc &item) {
     }
 
     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) {
     }
 
     virtual void Done(pkgAcquire::ItemDesc &item) {


@@ -279,7 +599,10 @@ class Status :
         )
             return;
 
         )
             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) {
     }
 
     virtual bool Pulse(pkgAcquire *Owner) {


@@ -290,7 +613,7 @@ class Status :
             double(TotalBytes + TotalItems)
         );
 
             double(TotalBytes + TotalItems)
         );
 

-        [delegate_ setPercent:percent];
+        [delegate_ setProgressPercent:percent];

         return value;
     }
 
         return value;
     }
 


@@ -306,12 +629,12 @@ class Progress :
     public OpProgress
 {
   private:
     public OpProgress
 {
   private:

-    id delegate_;
+    _transient id<ProgressDelegate> delegate_;

 
   protected:
     virtual void Update() {
 
   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:
     }
 
   public:


@@ -325,1143 +648,1849 @@ class Progress :
     }
 
     virtual void Done() {
     }
 
     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;
-/* }}} */
-/* Mime Addresses {{{ */
-Pcre email_r("^\"?(.*)\"? <([^>]*)>$");
+/* Database Interface {{{ */
+@interface Database : NSObject {
+    pkgCacheFile cache_;
+    pkgDepCache::Policy *policy_;
+    pkgRecords *records_;
+    pkgProblemResolver *resolver_;
+    pkgAcquire *fetcher_;
+    FileFd *lock_;
+    SPtr<pkgPackageManager> manager_;
+    pkgSourceList *list_;

 
 

-@interface Address : NSObject {
-    NSString *name_;
-    NSString *email_;
+    NSMutableDictionary *sources_;
+    NSMutableArray *packages_;
+
+    _transient NSObject<ConfigurationDelegate, ProgressDelegate> *delegate_;
+    Status status_;
+    Progress progress_;
+
+    int cydiafd_;
+    int statusfd_;
+    FILE *input_;

 }
 
 }
 

-- (void) dealloc;
+- (void) _readCydia:(NSNumber *)fd;
+- (void) _readStatus:(NSNumber *)fd;
+- (void) _readOutput:(NSNumber *)fd;
+
+- (FILE *) input;

 
 

-- (NSString *) name;
-- (NSString *) email;
+- (Package *) packageWithName:(NSString *)name;

 
 

-+ (Address *) addressWithString:(NSString *)string;
-- (Address *) initWithString:(NSString *)string;
+- (Database *) init;
+- (pkgCacheFile &) cache;
+- (pkgDepCache::Policy *) policy;
+- (pkgRecords *) records;
+- (pkgProblemResolver *) resolver;
+- (pkgAcquire &) fetcher;
+- (NSArray *) packages;
+- (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
 @end

+/* }}} */

 
 

-@implementation Address
+/* Source Class {{{ */
+@interface Source : NSObject {
+    NSString *description_;
+    NSString *label_;
+    NSString *origin_;

 
 

-- (void) dealloc {
-    [name_ release];
-    if (email_ != nil)
-        [email_ release];
-    [super dealloc];
-}
+    NSString *uri_;
+    NSString *distribution_;
+    NSString *type_;
+    NSString *version_;

 
 

-- (NSString *) name {
-    return name_;
-}
+    NSString *defaultIcon_;

 
 

-- (NSString *) email {
-    return email_;
+    BOOL trusted_;

 }
 
 }
 

-+ (Address *) addressWithString:(NSString *)string {
-    return [[[Address alloc] initWithString:string] autorelease];
-}
+- (Source *) initWithMetaIndex:(metaIndex *)index;

 
 

-- (Address *) initWithString:(NSString *)string {
-    if ((self = [super init]) != nil) {
-        const char *data = [string UTF8String];
-        size_t size = [string length];
-
-        if (email_r(data, size)) {
-            name_ = [email_r[1] retain];
-            email_ = [email_r[2] retain];
-        } else {
-            name_ = [[NSString stringWithCString:data length:size] retain];
-            email_ = nil;
-        }
-    } return self;
-}
+- (BOOL) trusted;

 
 

-@end
-/* }}} */
+- (NSString *) uri;
+- (NSString *) distribution;
+- (NSString *) type;

 
 

-/* Right Alignment {{{ */
-@interface UIRightTextLabel : UITextLabel {
-    float       _savedRightEdgeX;
-    BOOL        _sizedtofit_flag;
-}
+- (NSString *) description;
+- (NSString *) label;
+- (NSString *) origin;
+- (NSString *) version;

 
 

-- (void) setFrame:(CGRect)frame;
-- (void) setText:(NSString *)text;
-- (void) realignText;
+- (NSString *) defaultIcon;

 @end
 
 @end
 

-@implementation UIRightTextLabel
+@implementation Source

 
 

-- (void) setFrame:(CGRect)frame {
-    [super setFrame:frame];
-    if (_sizedtofit_flag == NO) {
-        _savedRightEdgeX = frame.origin.x;
-        [self realignText];
-    }
-}
+- (void) dealloc {
+    [uri_ release];
+    [distribution_ release];
+    [type_ release];

 
 

-- (void) setText:(NSString *)text {
-    [super setText:text];
-    [self realignText];
-}
+    if (description_ != nil)
+        [description_ release];
+    if (label_ != nil)
+        [label_ release];
+    if (origin_ != nil)
+        [origin_ release];
+    if (version_ != nil)
+        [version_ release];
+    if (defaultIcon_ != nil)
+        [defaultIcon_ release];

 
 

-- (void) realignText {
-    CGRect oldFrame = [self frame];
+    [super dealloc];
+}

 
 

-    _sizedtofit_flag = YES;
-    [self sizeToFit]; // shrink down size so I can right align it
+- (Source *) initWithMetaIndex:(metaIndex *)index {
+    if ((self = [super init]) != nil) {
+        trusted_ = index->IsTrusted();

 
 

-    CGRect newFrame = [self frame];
+        uri_ = [[NSString stringWithUTF8String:index->GetURI().c_str()] retain];
+        distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain];
+        type_ = [[NSString stringWithUTF8String:index->GetType()] retain];

 
 

-    oldFrame.origin.x = _savedRightEdgeX - newFrame.size.width;
-    oldFrame.size.width = newFrame.size.width;
-    [super setFrame:oldFrame];
-    _sizedtofit_flag = NO;
+        description_ = nil;
+        label_ = nil;
+        origin_ = nil;
+        version_ = nil;
+        defaultIcon_ = nil;
+
+        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];
+            }
+        }
+    } return self;

 }
 
 }
 

-@end
-/* }}} */
-/* Linear Algebra {{{ */
-inline float interpolate(float begin, float end, float fraction) {
-    return (end - begin) * fraction + begin;
+- (BOOL) trusted {
+    return trusted_;

 }
 }

-/* }}} */

 
 

-@class Package;
+- (NSString *) uri {
+    return uri_;
+}

 
 

-/* Database Interface {{{ */
-@interface Database : NSObject {
-    pkgCacheFile cache_;
-    pkgRecords *records_;
-    pkgProblemResolver *resolver_;
-    pkgAcquire *fetcher_;
-    FileFd *lock_;
-    SPtr<pkgPackageManager> manager_;
+- (NSString *) distribution {
+    return distribution_;
+}

 
 

-    id delegate_;
-    Status status_;
-    Progress progress_;
-    int statusfd_;
+- (NSString *) type {
+    return type_;

 }
 
 }
 

-- (void) dealloc;
+- (NSString *) description {
+    return description_;
+}

 
 

-- (void) _readStatus:(NSNumber *)fd;
-- (void) _readOutput:(NSNumber *)fd;
+- (NSString *) label {
+    return 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
 /* }}} */
 @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
 
 @end
 

-@implementation ResetView
+@implementation Relationship

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

-    [configure_ release];
-    [reload_ release];
-    [transition_ release];
-    [navbar_ release];
-    [views_ release];
+    [type_ release];
+    [id_ release];

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

-- (void) navigationBar:(UINavigationBar *)navbar poppedItem:(UINavigationItem *)item {
-    [views_ removeLastObject];
-    UIView *view([views_ lastObject]);
-    [view resetViewAnimated:!resetting_];
-
-    if (!resetting_) {
-        [transition_ transition:2 toView:view];
-        [self _resetView];
-    }
+- (NSString *) type {
+    return type_;

 }
 
 }
 

-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [sheet dismiss];
+- (NSString *) id {
+    return id_;

 }
 
 }
 

-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        views_ = [[NSMutableArray arrayWithCapacity:4] retain];
+- (NSString *) name {
+    _assert(false);
+    return nil;
+}

 
 

-        struct CGRect bounds = [self bounds];
-        CGSize navsize = [UINavigationBar defaultSizeWithPrompt];
-        CGRect navrect = {{0, 0}, navsize};
+@end
+/* }}} */
+/* Package Class {{{ */
+NSString *Scour(const char *field, const char *begin, const char *end) {
+    size_t i(0), l(strlen(field));

 
 

-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [self addSubview:navbar_];
+    for (;;) {
+        const char *name = begin + i;
+        const char *colon = name + l;
+        const char *value = colon + 1;

 
 

-        [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
+        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;

 
 

-        transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
-            bounds.origin.x, bounds.origin.y + navsize.height, bounds.size.width, bounds.size.height - navsize.height
-        )];
+            return [NSString stringWithUTF8Bytes:value length:(line - value)];
+        } else {
+            begin = std::find(begin, end, '\n');
+            if (begin == end)
+                return nil;
+            ++begin;
+        }
+    }
+}

 
 

-        //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];
+@interface Package : NSObject {
+    pkgCache::PkgIterator iterator_;
+    _transient Database *database_;
+    pkgCache::VerIterator version_;
+    pkgCache::VerFileIterator file_;

 
 

-        //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];
+    Source *source_;
+    bool cached_;

 
 

-        [navbar_ addSubview:configure_];
-        [navbar_ addSubview:reload_];
+    NSString *latest_;
+    NSString *installed_;

 
 

-        [self addSubview:transition_];
-    } return self;
-}
+    NSString *id_;
+    NSString *name_;
+    NSString *tagline_;
+    NSString *icon_;
+    NSString *website_;
+    Address *sponsor_;
+    Address *author_;

 
 

-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
+    NSArray *relationships_;

 }
 
 }
 

-- (void) configurePushed {
-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-        initWithTitle:@"Sources Unimplemented"
-        buttons:[NSArray arrayWithObjects:@"Okay", nil]
-        defaultButtonIndex:0
-        delegate:self
-        context:self
-    ] autorelease];
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;

 
 

-    [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];
-}
+- (pkgCache::PkgIterator) iterator;

 
 

-- (void) reloadPushed {
-    [delegate_ update];
-}
+- (NSString *) section;
+- (Address *) maintainer;
+- (size_t) size;
+- (NSString *) description;
+- (NSString *) index;

 
 

-- (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];
+- (NSDate *) seen;

 
 

-    [navbar_ showButtonsWithLeftTitle:nil rightTitle:right];
+- (NSString *) latest;
+- (NSString *) installed;

 
 

-    [transition_ transition:([views_ count] == 0 ? 0 : 1) toView:view];
-    [views_ addObject:view];
-}
+- (BOOL) valid;
+- (BOOL) upgradableAndEssential:(BOOL)essential;
+- (BOOL) essential;
+- (BOOL) broken;

 
 

-- (void) popViews:(unsigned)views {
-    resetting_ = true;
-    for (unsigned i(0); i != views; ++i)
-        [navbar_ popNavigationItem];
-    resetting_ = false;
+- (BOOL) half;
+- (BOOL) halfConfigured;
+- (BOOL) halfInstalled;
+- (BOOL) hasMode;
+- (NSString *) mode;

 
 

-    [self _resetView];
-    [transition_ transition:2 toView:[views_ lastObject]];
-}
+- (NSString *) id;
+- (NSString *) name;
+- (NSString *) tagline;
+- (NSString *) icon;
+- (NSString *) website;
+- (Address *) author;

 
 

-- (void) resetView:(BOOL)clear {
-    resetting_ = true;
+- (NSArray *) relationships;

 
 

-    if ([views_ count] > 1) {
-        [navbar_ disableAnimation];
-        while ([views_ count] != (clear ? 1 : 2))
-            [navbar_ popNavigationItem];
-        [navbar_ enableAnimation];
-        if (!clear)
-            [navbar_ popNavigationItem];
-    }
+- (Source *) source;

 
 

-    resetting_ = false;
+- (BOOL) matches:(NSString *)text;

 
 

-    [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 *) isSearchedForBy:(NSString *)search;
+- (NSNumber *) isInstalledInSection:(NSString *)section;
+- (NSNumber *) isUninstalledInSection:(NSString *)section;

 
 @end
 
 @end

-/* }}} */
-/* Confirmation View {{{ */
-void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString *key) {
-    if ([packages count] == 0)
-        return;

 
 

-    UITextView *text = GetTextView([packages count] == 0 ? @"n/a" : [packages componentsJoinedByString:@", "], 110, false);
-    [fields setObject:text forKey:key];
+@implementation Package

 
 

-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-    CGColor blue(space, 0, 0, 0.4, 1);
-    [text setTextColor:blue];
-    CGColorSpaceRelease(space);
-}
+- (void) dealloc {
+    if (source_ != nil)
+        [source_ release];

 
 

-@protocol ConfirmationViewDelegate
-- (void) cancel;
-- (void) confirm;
-@end
+    [latest_ release];
+    if (installed_ != nil)
+        [installed_ release];

 
 

-@interface ConfirmationView : UIView {
-    Database *database_;
-    id delegate_;
-    UITransitionView *transition_;
-    UIView *overlay_;
-    UINavigationBar *navbar_;
-    UIPreferencesTable *table_;
-    NSMutableDictionary *fields_;
-    UIAlertSheet *essential_;
+    [id_ release];
+    if (name_ != nil)
+        [name_ release];
+    [tagline_ release];
+    if (icon_ != nil)
+        [icon_ release];
+    if (website_ != nil)
+        [website_ release];
+    if (sponsor_ != nil)
+        [sponsor_ release];
+    if (author_ != nil)
+        [author_ release];
+
+    if (relationships_ != nil)
+        [relationships_ release];
+
+    [super dealloc];

 }
 
 }
 

-- (void) dealloc;
-- (void) cancel;
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
+    if ((self = [super init]) != nil) {
+        iterator_ = iterator;
+        database_ = database;

 
 

-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
+        version_ = [database_ policy]->GetCandidateVer(iterator_);
+        latest_ = version_.end() ? nil : [StripVersion([NSString stringWithUTF8String:version_.VerStr()]) retain];

 
 

-- (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;
+        if (!version_.end())
+            file_ = version_.FileList();
+        else {
+            pkgCache &cache([database_ cache]);
+            file_ = pkgCache::VerFileIterator(cache, cache.VerFileP);
+        }

 
 

-- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate;
+        pkgCache::VerIterator current = iterator_.CurrentVer();
+        installed_ = current.end() ? nil : [StripVersion([NSString stringWithUTF8String:current.VerStr()]) retain];
+
+        id_ = [[[NSString stringWithUTF8String:iterator_.Name()] lowercaseString] retain];
+
+        if (!file_.end()) {
+            pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+
+            const char *begin, *end;
+            parser->GetRec(begin, end);
+
+            name_ = Scour("Name", begin, end);
+            if (name_ != nil)
+                name_ = [name_ retain];
+            tagline_ = [[NSString stringWithUTF8String:parser->ShortDesc().c_str()] retain];
+            icon_ = Scour("Icon", begin, end);
+            if (icon_ != nil)
+                icon_ = [icon_ retain];
+            website_ = Scour("Homepage", begin, end);
+            if (website_ == nil)
+                website_ = Scour("Website", begin, end);
+            if (website_ != nil)
+                website_ = [website_ retain];
+            NSString *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];
+        }

 
 

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

 
 

-@implementation ConfirmationView
-#include "internals.h"
+            [Packages_ setObject:metadata forKey:id_];
+            Changed_ = true;
+        }
+    } return self;
+}

 
 

-- (void) dealloc {
-    [transition_ release];
-    [overlay_ release];
-    [navbar_ release];
-    [table_ release];
-    [fields_ release];
-    if (essential_ != nil)
-        [essential_ release];
-    [super dealloc];
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
+    return [[[Package alloc]
+        initWithIterator:iterator 
+        database:database
+    ] autorelease];

 }
 
 }
 

-- (void) cancel {
-    [transition_ transition:7 toView:nil];
-    [delegate_ cancel];
+- (pkgCache::PkgIterator) iterator {
+    return iterator_;

 }
 
 }
 

-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
-    if (from != nil && to == nil)
-        [self removeFromSuperview];
+- (NSString *) section {
+    const char *section = iterator_.Section();
+    return section == NULL ? nil : [[NSString stringWithUTF8String:section] stringByReplacingCharacter:'_' withCharacter:' '];

 }
 
 }
 

-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    switch (button) {
-        case 0:
-            if (essential_ != nil)
-                [essential_ popupAlertAnimated:YES];
-            else
-                [delegate_ confirm];
-        break;
+- (Address *) maintainer {
+    if (file_.end())
+        return nil;
+    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+    return [Address addressWithString:[NSString stringWithUTF8String:parser->Maintainer().c_str()]];
+}

 
 

-        case 1:
-            [self cancel];
-        break;
-    }
+- (size_t) size {
+    return version_.end() ? 0 : version_->InstalledSize;

 }
 
 }
 

-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [essential_ dismiss];
-    [self cancel];
+- (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"];

 }
 
 }
 

-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
-    return 2;
+- (NSString *) index {
+    NSString *index = [[[self name] substringToIndex:1] uppercaseString];
+    return [index length] != 0 && isalpha([index characterAtIndex:0]) ? index : @"123";

 }
 
 }
 

-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
-    switch (group) {
-        case 0: return @"Statistics";
-        case 1: return @"Modifications";
+- (NSDate *) seen {
+    return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"];
+}

 
 

-        default: _assert(false);
-    }
+- (NSString *) latest {
+    return latest_;

 }
 
 }
 

-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
-    switch (group) {
-        case 0: return 3;
-        case 1: return [fields_ count];
+- (NSString *) installed {
+    return installed_;
+}

 
 

-        default: _assert(false);
-    }
+- (BOOL) valid {
+    return !version_.end();

 }
 
 }
 

-- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
-    if (group != 1 || row == -1)
-        return proposed;
+- (BOOL) upgradableAndEssential:(BOOL)essential {
+    pkgCache::VerIterator current = iterator_.CurrentVer();
+
+    if (current.end())
+        return essential && [self essential];

     else {
     else {

-        _assert(size_t(row) < [fields_ count]);
-        return [[[fields_ allValues] objectAtIndex:row] visibleTextRect].size.height + TextViewOffset_;
+        pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_);
+        return !candidate.end() && candidate != current;

     }
 }
 
     }
 }
 

-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
-    UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
-    [cell setShowSelection:NO];
+- (BOOL) essential {
+    return (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES;
+}

 
 

-    switch (group) {
-        case 0: switch (row) {
-            case 0: {
-                [cell setTitle:@"Downloading"];
-                [cell setValue:SizeString([database_ fetcher].FetchNeeded())];
-            } break;
+- (BOOL) broken {
+    return [database_ cache][iterator_].InstBroken();
+}

 
 

-            case 1: {
-                [cell setTitle:@"Resuming At"];
-                [cell setValue:SizeString([database_ fetcher].PartialPresent())];
-            } break;
+- (BOOL) half {
+    unsigned char current = iterator_->CurrentState;
+    return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled;
+}

 
 

-            case 2: {
-                double size([database_ cache]->UsrSize());
+- (BOOL) halfConfigured {
+    return iterator_->CurrentState == pkgCache::State::HalfConfigured;
+}

 
 

-                if (size < 0) {
-                    [cell setTitle:@"Disk Freeing"];
-                    [cell setValue:SizeString(-size)];
-                } else {
-                    [cell setTitle:@"Disk Using"];
-                    [cell setValue:SizeString(size)];
-                }
-            } break;
+- (BOOL) halfInstalled {
+    return iterator_->CurrentState == pkgCache::State::HalfInstalled;
+}

 
 

-            default: _assert(false);
-        } break;
+- (BOOL) hasMode {
+    pkgDepCache::StateCache &state([database_ cache][iterator_]);
+    return state.Mode != pkgDepCache::ModeKeep;
+}

 
 

-        case 1:
-            _assert(size_t(row) < [fields_ count]);
-            [cell setTitle:[[fields_ allKeys] objectAtIndex:row]];
-            [cell addSubview:[[fields_ allValues] objectAtIndex:row]];
-        break;
+- (NSString *) mode {
+    pkgDepCache::StateCache &state([database_ cache][iterator_]);

 
 

-        default: _assert(false);
+    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);

     }
     }

+}

 
 

-    return cell;
+- (NSString *) id {
+    return id_;

 }
 
 }
 

-- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate {
-    if ((self = [super initWithFrame:[view bounds]]) != nil) {
-        database_ = database;
-        delegate_ = delegate;
+- (NSString *) name {
+    return name_ == nil ? id_ : name_;
+}

 
 

-        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
-        [self addSubview:transition_];
+- (NSString *) tagline {
+    return tagline_;
+}

 
 

-        overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+- (NSString *) icon {
+    return icon_;
+}

 
 

-        CGSize navsize = [UINavigationBar defaultSize];
-        CGRect navrect = {{0, 0}, navsize};
-        CGRect bounds = [overlay_ bounds];
+- (NSString *) website {
+    return website_;
+}

 
 

-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
+- (Address *) sponsor {
+    return sponsor_;
+}

 
 

-        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease];
-        [navbar_ pushNavigationItem:navitem];
-        [navbar_ showButtonsWithLeftTitle:@"Cancel" rightTitle:@"Confirm"];
+- (Address *) author {
+    return author_;
+}

 
 

-        fields_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
+- (NSArray *) relationships {
+    return relationships_;
+}

 
 

-        NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16];
-        NSMutableArray *upgrading = [NSMutableArray arrayWithCapacity:16];
-        NSMutableArray *removing = [NSMutableArray arrayWithCapacity:16];
+- (Source *) source {
+    if (!cached_) {
+        source_ = file_.end() ? nil : [[database_ getSource:file_.File()] retain];
+        cached_ = true;
+    }

 
 

-        bool essential(false);
+    return source_;
+}

 
 

-        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;
-            }
-        }
+- (BOOL) matches:(NSString *)text {
+    if (text == nil)
+        return NO;

 
 

-        if (!essential)
-            essential_ = nil;
-        else {
-            essential_ = [[UIAlertSheet alloc]
-                initWithTitle:@"Unable to Comply"
-                buttons:[NSArray arrayWithObjects:@"Okay", nil]
-                defaultButtonIndex:0
-                delegate:self
-                context:self
-            ];
+    NSRange range;

 
 

-            [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."];
-        }
+    range = [[self id] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;

 
 

-        AddTextView(fields_, installing, @"Installing");
-        AddTextView(fields_, upgrading, @"Upgrading");
-        AddTextView(fields_, removing, @"Removing");
+    range = [[self name] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;

 
 

-        table_ = [[UIPreferencesTable alloc] initWithFrame:CGRectMake(
-            0, navsize.height, bounds.size.width, bounds.size.height - navsize.height
-        )];
+    range = [[self tagline] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;

 
 

-        [table_ setReusesTableCells:YES];
-        [table_ setDataSource:self];
-        [table_ reloadData];
+    return NO;
+}

 
 

-        [overlay_ addSubview:navbar_];
-        [overlay_ addSubview:table_];
+- (NSComparisonResult) compareByName:(Package *)package {
+    NSString *lhs = [self name];
+    NSString *rhs = [package name];

 
 

-        [view addSubview:self];
+    if ([lhs length] != 0 && [rhs length] != 0) {
+        unichar lhc = [lhs characterAtIndex:0];
+        unichar rhc = [rhs characterAtIndex:0];

 
 

-        [transition_ setDelegate:self];
+        if (isalpha(lhc) && !isalpha(rhc))
+            return NSOrderedAscending;
+        else if (!isalpha(lhc) && isalpha(rhc))
+            return NSOrderedDescending;
+    }

 
 

-        UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease];
-        [transition_ transition:0 toView:blank];
-        [transition_ transition:3 toView:overlay_];
-    } return self;
+    return [lhs caseInsensitiveCompare:rhs];

 }
 
 }
 

-@end
-/* }}} */
+- (NSComparisonResult) compareBySection:(Package *)package {
+    NSString *lhs = [self section];
+    NSString *rhs = [package section];

 
 

-/* Package Class {{{ */
-NSString *Scour(const char *field, const char *begin, const char *end) {
-    size_t i(0), l(strlen(field));
+    if (lhs == NULL && rhs != NULL)
+        return NSOrderedAscending;
+    else if (lhs != NULL && rhs == NULL)
+        return NSOrderedDescending;
+    else if (lhs != NULL && rhs != NULL) {
+        NSComparisonResult result = [lhs caseInsensitiveCompare:rhs];
+        if (result != NSOrderedSame)
+            return result;
+    }

 
 

-    for (;;) {
-        const char *name = begin + i;
-        const char *colon = name + l;
-        const char *value = colon + 1;
+    return NSOrderedSame;
+}

 
 

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

     }
     }

-}

 
 

-@interface Package : NSObject {
-    pkgCache::PkgIterator iterator_;
-    Database *database_;
-    pkgCache::VerIterator version_;
-    pkgCache::VerFileIterator file_;
+    return [self compareByName:package];
+}

 
 

-    NSString *latest_;
-    NSString *installed_;
+- (NSComparisonResult) compareForChanges:(Package *)package {
+    BOOL lhs = [self upgradableAndEssential:YES];
+    BOOL rhs = [package upgradableAndEssential:YES];

 
 

-    NSString *id_;
-    NSString *name_;
-    NSString *tagline_;
-    NSString *icon_;
-    NSString *bundle_;
-    NSString *website_;
+    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) dealloc;
+- (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);
+}

 
 

-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file;
-+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
+- (void) remove {
+    pkgProblemResolver *resolver = [database_ resolver];
+    resolver->Clear(iterator_);
+    resolver->Protect(iterator_);
+    resolver->Remove(iterator_);
+    [database_ cache]->MarkDelete(iterator_, true);
+}

 
 

-- (NSString *) section;
-- (Address *) maintainer;
-- (size_t) size;
-- (NSString *) description;
-- (NSString *) index;
+- (NSNumber *) isSearchedForBy:(NSString *)search {
+    return [NSNumber numberWithBool:([self valid] && [self matches:search])];
+}

 
 

-- (NSDate *) seen;
+- (NSNumber *) isInstalledInSection:(NSString *)section {
+    return [NSNumber numberWithBool:([self installed] != nil && (section == nil || [section isEqualToString:[self section]]))];
+}

 
 

-- (NSString *) latest;
-- (NSString *) installed;
-- (BOOL) upgradable;
+- (NSNumber *) isUninstalledInSection:(NSString *)name {
+    NSString *section = [self section];

 
 

-- (NSString *) id;
-- (NSString *) name;
-- (NSString *) tagline;
-- (NSString *) icon;
-- (NSString *) bundle;
-- (NSString *) website;
+    return [NSNumber numberWithBool:([self valid] && [self installed] == nil && (
+        (name == nil ||
+        section == nil && [name length] == 0 ||
+        [name isEqualToString:section])
+    ))];
+}

 
 

-- (BOOL) matches:(NSString *)text;
+@end
+/* }}} */
+/* Section Class {{{ */
+@interface Section : NSObject {
+    NSString *name_;
+    size_t row_;
+    size_t count_;
+}

 
 

-- (NSComparisonResult) compareByName:(Package *)package;
-- (NSComparisonResult) compareBySectionAndName:(Package *)package;
-- (NSComparisonResult) compareForChanges:(Package *)package;
+- (Section *) initWithName:(NSString *)name row:(size_t)row;
+- (NSString *) name;
+- (size_t) row;
+- (size_t) count;
+- (void) addToCount;

 
 

-- (void) install;
-- (void) remove;

 @end
 
 @end
 

-@implementation Package
+@implementation Section

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

-    [latest_ release];
-    if (installed_ != nil)
-        [installed_ release];
-
-    [id_ release];
-    if (name_ != nil)
-        [name_ release];
-    [tagline_ release];
-    if (icon_ != nil)
-        [icon_ release];
-    if (bundle_ != nil)
-        [bundle_ release];
+    [name_ release];

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

-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file {
+- (Section *) initWithName:(NSString *)name row:(size_t)row {

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

-        iterator_ = iterator;
-        database_ = database;
+        name_ = [name retain];
+        row_ = row;
+    } return self;
+}

 
 

-        version_ = version;
-        file_ = file;
+- (NSString *) name {
+    return name_;
+}

 
 

-        pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+- (size_t) row {
+    return row_;
+}

 
 

-        const char *begin, *end;
-        parser->GetRec(begin, end);
+- (size_t) count {
+    return count_;
+}

 
 

-        latest_ = [[NSString stringWithCString:version_.VerStr()] retain];
-        installed_ = iterator_.CurrentVer().end() ? nil : [[NSString stringWithCString:iterator_.CurrentVer().VerStr()] retain];
+- (void) addToCount {
+    ++count_;
+}

 
 

-        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];
+@end
+/* }}} */

 
 

-        NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
-        if (metadata == nil) {
-            metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                now_, @"FirstSeen",
-            nil];
+/* Database Implementation {{{ */
+@implementation Database

 
 

-            [Packages_ setObject:metadata forKey:id_];
-        }
-    } return self;
+- (void) dealloc {
+    _assert(false);
+    [super dealloc];

 }
 
 }
 

-+ (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;
-}
+- (void) _readCydia:(NSNumber *)fd {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

 
 

-- (NSString *) section {
-    return [[NSString stringWithCString:iterator_.Section()] stringByReplacingCharacter:'_' withCharacter:' '];
-}
+    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+    std::istream is(&ib);
+    std::string line;

 
 

-- (Address *) maintainer {
-    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
-    return [Address addressWithString:[NSString stringWithCString:parser->Maintainer().c_str()]];
-}
+    while (std::getline(is, line)) {
+        const char *data(line.c_str());
+        //size_t size = line.size();
+        fprintf(stderr, "C:%s\n", data);
+    }

 
 

-- (size_t) size {
-    return version_->InstalledSize;
+    [pool release];
+    _assert(false);

 }
 
 }
 

-- (NSString *) description {
-    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
-    NSString *description([NSString stringWithCString:parser->LongDesc().c_str()]);
+- (void) _readStatus:(NSNumber *)fd {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

 
 

-    NSArray *lines = [description componentsSeparatedByString:@"\n"];
-    NSMutableArray *trimmed = [NSMutableArray arrayWithCapacity:([lines count] - 1)];
-    if ([lines count] < 2)
-        return nil;
+    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+    std::istream is(&ib);
+    std::string line;

 
 

-    NSCharacterSet *whitespace = [NSCharacterSet whitespaceCharacterSet];
-    for (size_t i(1); i != [lines count]; ++i) {
-        NSString *trim = [[lines objectAtIndex:i] stringByTrimmingCharactersInSet:whitespace];
-        [trimmed addObject:trim];
+    Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$");
+    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);

     }
 
     }
 

-    return [trimmed componentsJoinedByString:@"\n"];
+    [pool release];
+    _assert(false);

 }
 
 }
 

-- (NSString *) index {
-    return [[[self name] substringToIndex:1] uppercaseString];
-}
+- (void) _readOutput:(NSNumber *)fd {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

 
 

-- (NSDate *) seen {
-    return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"];
-}
+    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+    std::istream is(&ib);
+    std::string line;

 
 

-- (NSString *) latest {
-    return latest_;
-}
+    while (std::getline(is, line)) {
+        fprintf(stderr, "O:%s\n", line.c_str());
+        [delegate_ addProgressOutput:[NSString stringWithUTF8String:line.c_str()]];
+    }

 
 

-- (NSString *) installed {
-    return installed_;
+    [pool release];
+    _assert(false);

 }
 
 }
 

-- (BOOL) upgradable {
-    NSString *installed = [self installed];
-    return installed != nil && [[self latest] compare:installed] != NSOrderedSame ? YES : NO;
+- (FILE *) input {
+    return input_;

 }
 
 }
 

-- (NSString *) id {
-    return id_;
+- (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];

 }
 
 }
 

-- (NSString *) name {
-    return name_ == nil ? id_ : name_;
-}
+- (Database *) init {
+    if ((self = [super init]) != nil) {
+        policy_ = NULL;
+        records_ = NULL;
+        resolver_ = NULL;
+        fetcher_ = NULL;
+        lock_ = NULL;

 
 

-- (NSString *) tagline {
-    return tagline_;
-}
+        sources_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
+        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];

 
 

-- (NSString *) icon {
-    return icon_;
-}
+        int fds[2];

 
 

-- (NSString *) bundle {
-    return bundle_;
-}
+        _assert(pipe(fds) != -1);
+        cydiafd_ = fds[1];

 
 

-- (NSString *) website {
-    return website_;
-}
+        _config->Set("APT::Keep-Fds::", cydiafd_);
+        setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 0"] UTF8String], _not(int));

 
 

-- (BOOL) matches:(NSString *)text {
-    if (text == nil)
-        return NO;
+        [NSThread
+            detachNewThreadSelector:@selector(_readCydia:)
+            toTarget:self
+            withObject:[[NSNumber numberWithInt:fds[0]] retain]
+        ];

 
 

-    NSRange range;
+        _assert(pipe(fds) != -1);
+        statusfd_ = fds[1];

 
 

-    range = [[self name] rangeOfString:text options:NSCaseInsensitiveSearch];
-    if (range.location != NSNotFound)
-        return YES;
+        [NSThread
+            detachNewThreadSelector:@selector(_readStatus:)
+            toTarget:self
+            withObject:[[NSNumber numberWithInt:fds[0]] retain]
+        ];

 
 

-    range = [[self tagline] rangeOfString:text options:NSCaseInsensitiveSearch];
-    if (range.location != NSNotFound)
-        return YES;
+        _assert(pipe(fds) != -1);
+        _assert(dup2(fds[0], 0) != -1);
+        _assert(close(fds[0]) != -1);

 
 

-    return NO;
-}
+        input_ = fdopen(fds[1], "a");

 
 

-- (NSComparisonResult) compareByName:(Package *)package {
-    return [[self name] caseInsensitiveCompare:[package name]];
+        _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;

 }
 
 }
 

-- (NSComparisonResult) compareBySectionAndName:(Package *)package {
-    NSComparisonResult result = [[self section] compare:[package section]];
-    if (result != NSOrderedSame)
-        return result;
-    return [self compareByName:package];
+- (pkgCacheFile &) cache {
+    return cache_;

 }
 
 }
 

-- (NSComparisonResult) compareForChanges:(Package *)package {
-    BOOL lhs = [self upgradable];
-    BOOL rhs = [package upgradable];
+- (pkgDepCache::Policy *) policy {
+    return policy_;
+}

 
 

-    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);
-        }
-    }
+- (pkgRecords *) records {
+    return records_;
+}

 
 

-    return [self compareByName:package];
+- (pkgProblemResolver *) resolver {
+    return resolver_;

 }
 
 }
 

-- (void) install {
-    pkgProblemResolver *resolver = [database_ resolver];
-    resolver->Clear(iterator_);
-    resolver->Protect(iterator_);
-    [database_ cache]->MarkInstall(iterator_, false);
+- (pkgAcquire &) fetcher {
+    return *fetcher_;

 }
 
 }
 

-- (void) remove {
-    pkgProblemResolver *resolver = [database_ resolver];
-    resolver->Clear(iterator_);
-    resolver->Protect(iterator_);
-    resolver->Remove(iterator_);
-    [database_ cache]->MarkDelete(iterator_, true);
+- (NSArray *) packages {
+    return packages_;
+}
+
+- (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)
+        return;
+
+    _system->UnLock();
+    pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_);
+
+    if (result == pkgPackageManager::Failed)
+        return;
+    if (_error->PendingError())
+        return;
+    if (result != pkgPackageManager::Completed)
+        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
 /* }}} */
 }
 
 @end
 /* }}} */

-/* Section Class {{{ */
-@interface Section : NSObject {
-    NSString *name_;
-    size_t row_;
-    NSMutableArray *packages_;
+
+/* Confirmation View {{{ */
+void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString *key) {
+    if ([packages count] == 0)
+        return;
+
+    UITextView *text = GetTextView([packages count] == 0 ? @"n/a" : [packages componentsJoinedByString:@", "], 120, false);
+    [fields setObject:text forKey:key];
+
+    CGColor blue(space_, 0, 0, 0.4, 1);
+    [text setTextColor:blue];
+}
+
+@protocol ConfirmationViewDelegate
+- (void) cancel;
+- (void) confirm;
+@end
+
+@interface ConfirmationView : UIView {
+    Database *database_;
+    id delegate_;
+    UITransitionView *transition_;
+    UIView *overlay_;
+    UINavigationBar *navbar_;
+    UIPreferencesTable *table_;
+    NSMutableDictionary *fields_;
+    UIAlertSheet *essential_;
+}
+
+- (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
+                [delegate_ confirm];
+        break;
+
+        case 1:
+            [self cancel];
+        break;
+    }
+}
+
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    NSString *context = [sheet context];
+
+    if ([context isEqualToString:@"remove"])
+        switch (button) {
+            case 1:
+                [self cancel];
+                break;
+            case 2:
+                [delegate_ confirm];
+                break;
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"unable"])
+        [self cancel];
+
+    [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);
+    }
+}
+
+- (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) dealloc;
+- (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];
+        if (Advanced_)
+            [navbar_ setBarStyle:1];
+        [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);
+
+        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];
+            }
+        }
+
+        if (!remove)
+            essential_ = nil;
+        else if (Advanced_ || true) {
+            essential_ = [[UIAlertSheet 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_ = [[UIAlertSheet 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_ setReusesTableCells:YES];
+        [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 {{{ */
+Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
+
+@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_;
+}
+
+- (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;
+
+@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:Black_];
+        else {
+            background_ = [[UIView alloc] initWithFrame:[self bounds]];
+            [background_ setBackgroundColor:Black_];
+            [self addSubview:background_];
+        }
+
+        [self addSubview:transition_];

 
 

-- (Section *) initWithName:(NSString *)name row:(size_t)row;
-- (NSString *) name;
-- (size_t) row;
-- (NSArray *) packages;
-- (size_t) count;
-- (void) addPackage:(Package *)package;
-@end
+        CGSize navsize = [UINavigationBar defaultSize];
+        CGRect navrect = {{0, 0}, navsize};

 
 

-@implementation Section
+        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
+        [overlay_ addSubview:navbar_];

 
 

-- (void) dealloc {
-    [name_ release];
-    [packages_ release];
-    [super dealloc];
-}
+        [navbar_ setBarStyle:1];
+        [navbar_ setDelegate:self];

 
 

-- (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;
-}
+        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:nil] autorelease];
+        [navbar_ pushNavigationItem:navitem];

 
 

-- (NSString *) name {
-    return name_;
-}
+        CGRect bounds = [overlay_ bounds];
+        CGSize prgsize = [UIProgressBar defaultSize];

 
 

-- (size_t) row {
-    return row_;
-}
+        CGRect prgrect = {{
+            (bounds.size.width - prgsize.width) / 2,
+            bounds.size.height - prgsize.height - 20
+        }, prgsize};

 
 

-- (NSArray *) packages {
-    return packages_;
-}
+        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
+        [progress_ setStyle:0];

 
 

-- (size_t) count {
-    return [packages_ count];
-}
+        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(
+            10,
+            bounds.size.height - prgsize.height - 50,
+            bounds.size.width - 20,
+            24
+        )];

 
 

-- (void) addPackage:(Package *)package {
-    [packages_ addObject:package];
-}
+        [status_ setColor:White_];
+        [status_ setBackgroundColor:Clear_];

 
 

-@end
-/* }}} */
+        [status_ setCentersHorizontally:YES];
+        //[status_ setFont:font];

 
 

-/* Package View {{{ */
-@protocol PackageViewDelegate
-- (void) performPackage:(Package *)package;
-@end
+        output_ = [[UITextView alloc] initWithFrame:CGRectMake(
+            10,
+            navrect.size.height + 20,
+            bounds.size.width - 20,
+            bounds.size.height - navsize.height - 62 - navrect.size.height
+        )];

 
 

-@interface PackageView : UIView {
-    UIPreferencesTable *table_;
-    Package *package_;
-    UITextView *description_;
-    id delegate_;
-}
+        //[output_ setTextFont:@"Courier New"];
+        [output_ setTextSize:12];

 
 

-- (void) dealloc;
+        [output_ setTextColor:White_];
+        [output_ setBackgroundColor:Clear_];

 
 

-- (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;
+        [output_ setMarginTop:0];
+        [output_ setAllowsRubberBanding:YES];
+        [output_ setEditable:NO];

 
 

-- (BOOL) canSelectRow:(int)row;
-- (void) tableRowSelected:(NSNotification *)notification;
+        [overlay_ addSubview:output_];

 
 

-- (Package *) package;
+        close_ = [[UIPushButton alloc] initWithFrame:CGRectMake(
+            10,
+            bounds.size.height - prgsize.height - 50,
+            bounds.size.width - 20,
+            32 + prgsize.height
+        )];

 
 

-- (id) initWithFrame:(struct CGRect)frame;
-- (void) setPackage:(Package *)package;
-- (void) setDelegate:(id)delegate;
-@end
+        [close_ setAutosizesToFit:NO];
+        [close_ setDrawsShadow:YES];
+        [close_ setStretchBackground:YES];
+        [close_ setTitle:@"Close Window"];
+        [close_ setEnabled:YES];

 
 

-@implementation PackageView
+        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+        [close_ setTitleFont:bold];
+        CFRelease(bold);

 
 

-- (void) dealloc {
-    if (package_ != nil)
-        [package_ release];
-    if (description_ != nil)
-        [description_ release];
-    [table_ release];
-    [super dealloc];
+        [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;

 }
 
 }
 

-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
-    return 2;
+- (void) setContentView:(UIView *)view {
+    view_ = [view retain];

 }
 
 }
 

-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
-    switch (group) {
-        case 0: return nil;
-        case 1: return @"Details";
-        case 2: return @"Source";
+- (void) resetView {
+    [transition_ transition:6 toView:view_];
+}

 
 

-        default: _assert(false);
+- (void) alertSheet:(UIAlertSheet *)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 != 0 || row != 1)
-        return proposed;
-    else
-        return [description_ visibleTextRect].size.height + TextViewOffset_;
+- (void) closeButtonPushed {
+    [delegate_ progressViewIsComplete:self];
+    [self resetView];

 }
 
 }
 

-- (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;
+- (void) _retachThread {
+    UINavigationItem *item = [navbar_ topItem];
+    [item setTitle:@"Complete"];

 
 

-        default: _assert(false);
-    }
+    [overlay_ addSubview:close_];
+    [progress_ removeFromSuperview];
+    [status_ removeFromSuperview];

 }
 
 }
 

-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
-    UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
-    [cell setShowSelection:NO];
+- (void) _detachNewThreadData:(ProgressData *)data {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

 
 

-    switch (group) {
-        case 0: switch (row) {
-            case 0:
-                [cell setTitle:[package_ name]];
-                [cell setValue:[package_ latest]];
-            break;
+    [[data target] performSelector:[data selector] withObject:[data object]];
+    [data release];

 
 

-            case 1:
-                [cell addSubview:description_];
-            break;
+    [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES];

 
 

-            case 2:
-                [cell setTitle:@"More Information"];
-                [cell setShowDisclosure:YES];
-                [cell setShowSelection:YES];
-            break;
+    [pool release];
+}

 
 

-            default: _assert(false);
-        } break;
+- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title {
+    UINavigationItem *item = [navbar_ topItem];
+    [item setTitle:title];

 
 

-        case 1: switch (row) {
-            case 0:
-                [cell setTitle:@"Identifier"];
-                [cell setValue:[package_ id]];
-            break;
+    [status_ setText:nil];
+    [output_ setText:@""];
+    [progress_ setProgress:0];

 
 

-            case 1: {
-                [cell setTitle:@"Installed Version"];
-                NSString *installed([package_ installed]);
-                [cell setValue:(installed == nil ? @"n/a" : installed)];
-            } break;
+    [close_ removeFromSuperview];
+    [overlay_ addSubview:progress_];
+    [overlay_ addSubview:status_];

 
 

-            case 2:
-                [cell setTitle:@"Section"];
-                [cell setValue:[package_ section]];
-            break;
+    [transition_ transition:6 toView:overlay_];

 
 

-            case 3:
-                [cell setTitle:@"Expanded Size"];
-                [cell setValue:SizeString([package_ size])];
-            break;
+    [NSThread
+        detachNewThreadSelector:@selector(_detachNewThreadData:)
+        toTarget:self
+        withObject:[[ProgressData alloc]
+            initWithSelector:selector
+            target:target
+            object:object
+        ]
+    ];
+}

 
 

-            case 4:
-                [cell setTitle:@"Maintainer"];
-                [cell setValue:[[package_ maintainer] name]];
-                [cell setShowDisclosure:YES];
-                [cell setShowSelection:YES];
-            break;
+- (void) repairWithSelector:(SEL)selector {
+    [self
+        detachNewThreadSelector:selector
+        toTarget:database_
+        withObject:nil
+        title:@"Repairing..."
+    ];
+}

 
 

-            default: _assert(false);
-        } break;
+- (void) setConfigurationData:(NSString *)data {
+    [self
+        performSelectorOnMainThread:@selector(_setConfigurationData:)
+        withObject:data
+        waitUntilDone:YES
+    ];
+}

 
 

-        case 2: switch (row) {
-        } break;
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    Package *package = id == nil ? nil : [database_ packageWithName:id];

 
 

-        default: _assert(false);
-    }
+    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        initWithTitle:(package == nil ? @"Source Error" : [package name])
+        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"error"
+    ] autorelease];

 
 

-    return cell;
+    [sheet setBodyText:error];
+    [sheet popupAlertAnimated:YES];

 }
 
 }
 

-- (BOOL) canSelectRow:(int)row {
-    return YES;
+- (void) setProgressTitle:(NSString *)title {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressTitle:)
+        withObject:title
+        waitUntilDone: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;
-    }
+- (void) setProgressPercent:(float)percent {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressPercent:)
+        withObject:[NSNumber numberWithFloat:percent]
+        waitUntilDone:YES
+    ];

 }
 
 }
 

-- (Package *) package {
-    return package_;
+- (void) addProgressOutput:(NSString *)output {
+    [self
+        performSelectorOnMainThread:@selector(_addProgressOutput:)
+        withObject:output
+        waitUntilDone:YES
+    ];

 }
 
 }
 

-- (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];
-    } return self;
-}
+- (void) _setConfigurationData:(NSString *)data {
+    _assert(conffile_r(data));

 
 

-- (void) setPackage:(Package *)package {
-    if (package_ != nil) {
-        [package_ autorelease];
-        package_ = nil;
-    }
+    NSString *ofile = conffile_r[1];
+    //NSString *nfile = conffile_r[2];

 
 

-    if (description_ != nil) {
-        [description_ release];
-        description_ = nil;
-    }
+    UIAlertSheet *sheet = [[[UIAlertSheet 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];

 
 

-    if (package != nil) {
-        package_ = [package retain];
+    [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]];

 
 

-        NSString *description([package description]);
-        if (description == nil)
-            description = [package tagline];
-        description_ = [GetTextView(description, 12, true) retain];
+    [sheet popupAlertAnimated:YES];
+}

 
 

-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-        CGColor black(space, 0, 0, 0, 1);
-        [description_ setTextColor:black];
-        CGColorSpaceRelease(space);
+- (void) _setProgressTitle:(NSString *)title {
+    [status_ setText:[title stringByAppendingString:@"..."]];
+}

 
 

-        [table_ reloadData];
-    }
+- (void) _setProgressPercent:(NSNumber *)percent {
+    [progress_ setProgress:[percent floatValue]];

 }
 
 }
 

-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
+- (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];

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

+

 /* Package Cell {{{ */
 @interface PackageCell : UITableCell {
 /* Package Cell {{{ */
 @interface PackageCell : UITableCell {

+    UIImageView *icon_;

     UITextLabel *name_;
     UITextLabel *name_;

-    UITextLabel *version_;

     UITextLabel *description_;
     UITextLabel *description_;

-    SEL versioner_;
+    UITextLabel *source_;
+    //UIImageView *trusted_;
+#ifdef USE_BADGES
+    UIImageView *badge_;
+    UITextLabel *status_;
+#endif
+    BOOL setup_;

 }
 
 }
 

-- (void) dealloc;
-
-- (PackageCell *) initWithVersioner:(SEL)versioner;
+- (PackageCell *) init;

 - (void) setPackage:(Package *)package;
 
 - (void) _setSelected:(float)fraction;
 - (void) setPackage:(Package *)package;
 
 - (void) _setSelected:(float)fraction;


@@ -1469,46 +2498,64 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
 - (void) _setSelectionFadeFraction:(float)fraction;
 
 - (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
 - (void) _setSelectionFadeFraction:(float)fraction;
 

++ (int) heightForPackage:(Package *)package;
+

 @end
 
 @implementation PackageCell
 
 - (void) dealloc {
 @end
 
 @implementation PackageCell
 
 - (void) dealloc {

+    [icon_ release];

     [name_ release];
     [name_ release];

-    [version_ release];

     [description_ release];
     [description_ release];

+    [source_ release];
+#ifdef USE_BADGES
+    [badge_ release];
+    [status_ release];
+#endif
+    //[trusted_ release];

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

-- (PackageCell *) initWithVersioner:(SEL)versioner {
+- (PackageCell *) init {

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

-        versioner_ = versioner;
-
-        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
-        GSFontRef large = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 20);
+        GSFontRef large = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12);

         GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14);
 
         GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14);
 

-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+        icon_ = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, 30, 30)];

 
 

-        CGColor clear(space, 0, 0, 0, 0);
-
-        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 7, 250, 25)];
-        [name_ setBackgroundColor:clear];
+        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 8, 240, 25)];
+        [name_ setBackgroundColor:Clear_];

         [name_ setFont:bold];
 
         [name_ setFont:bold];
 

-        version_ = [[UIRightTextLabel alloc] initWithFrame:CGRectMake(286, 7, 70, 25)];
-        [version_ setBackgroundColor:clear];
-        [version_ setFont:large];
+        source_ = [[UITextLabel alloc] initWithFrame:CGRectMake(58, 28, 225, 20)];
+        [source_ setBackgroundColor:Clear_];
+        [source_ setFont:large];

 
 

-        description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(13, 35, 315, 20)];
-        [description_ setBackgroundColor:clear];
+        description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 46, 280, 20)];
+        [description_ setBackgroundColor:Clear_];

         [description_ setFont:small];
 
         [description_ setFont:small];
 

+        /*trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
+        [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];*/
+
+#ifdef USE_BADGES
+        badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
+
+        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];
+        [status_ setBackgroundColor:Clear_];
+        [status_ setFont:small];
+#endif
+
+        /*[icon_ setImage:[UIImage applicationImageNamed:@"unknown.png"]];
+        [icon_ zoomToScale:0.5];
+        [icon_ setFrame:CGRectMake(10, 10, 30, 30)];*/
+
+        [self addSubview:icon_];

         [self addSubview:name_];
         [self addSubview:name_];

-        [self addSubview:version_];

         [self addSubview:description_];
         [self addSubview:description_];

-
-        CGColorSpaceRelease(space);
+        [self addSubview:source_];

 
         CFRelease(small);
         CFRelease(large);
 
         CFRelease(small);
         CFRelease(large);


@@ -1517,37 +2564,96 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (void) setPackage:(Package *)package {
 }
 
 - (void) setPackage:(Package *)package {

+    /*if (setup_)
+        return;
+    else
+        setup_ = YES;*/
+
+    Source *source = [package source];
+
+    UIImage *image = nil;
+    if (NSString *icon = [package icon])
+        image = [UIImage imageAtPath:[icon substringFromIndex:6]];
+    if (image == nil) if (NSString *icon = [source defaultIcon])
+        image = [UIImage imageAtPath:[icon substringFromIndex:6]];
+    if (image == nil)
+        image = [UIImage applicationImageNamed:@"unknown.png"];
+    [icon_ setImage:image];
+
+    /*if (image != nil) {
+        CGSize size = [image size];
+        float scale = 30 / std::max(size.width, size.height);
+        [icon_ zoomToScale:scale];
+    }*/
+
+    [icon_ setFrame:CGRectMake(10, 10, 30, 30)];
+

     [name_ setText:[package name]];
     [name_ setText:[package name]];

-    [version_ setText:[package latest]];

     [description_ setText:[package tagline]];
     [description_ setText:[package tagline]];

-}

 
 

-- (void) _setSelected:(float)fraction {
-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+    NSString *label = nil;
+    bool trusted = false;

 
 

-    CGColor black(space,
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-    1.0);
+    if (source != nil) {
+        label = [source label];
+        trusted = [source trusted];
+    } else if ([[package id] isEqualToString:@"firmware"])
+        label = @"Apple";
+
+    if (label == nil)
+        label = @"Unknown/Local";
+
+    NSString *from = [NSString stringWithFormat:@"from %@", label];
+
+    NSString *section = Simplify([package section]);
+    if (section != nil && ![section isEqualToString:label])
+        from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]];
+
+    [source_ setText:from];
+
+#ifdef USE_BADGES
+    [badge_ removeFromSuperview];
+    [status_ removeFromSuperview];
+
+    if (NSString *mode = [package mode]) {
+        [badge_ setImage:[UIImage applicationImageNamed:
+            [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png"
+        ]];

 
 

-    CGColor blue(space,
-        interpolate(0.2, 1.0, fraction),
-        interpolate(0.2, 1.0, fraction),
-        interpolate(1.0, 1.0, fraction),
+        [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:Red_];
+    } else {
+        [badge_ setImage:nil];
+        [status_ setText:nil];
+        goto done;
+    }
+
+    [self addSubview:badge_];
+    [self addSubview:status_];
+  done:;
+#endif
+}
+
+- (void) _setSelected:(float)fraction {
+    CGColor black(space_,
+        Interpolate(0.0, 1.0, fraction),
+        Interpolate(0.0, 1.0, fraction),
+        Interpolate(0.0, 1.0, fraction),

     1.0);
 
     1.0);
 

-    CGColor gray(space,
-        interpolate(0.4, 1.0, fraction),
-        interpolate(0.4, 1.0, fraction),
-        interpolate(0.4, 1.0, fraction),
+    CGColor gray(space_,
+        Interpolate(0.4, 1.0, fraction),
+        Interpolate(0.4, 1.0, fraction),
+        Interpolate(0.4, 1.0, fraction),

     1.0);
 
     [name_ setColor:black];
     1.0);
 
     [name_ setColor:black];

-    [version_ setColor:blue];

     [description_ setColor:gray];
     [description_ setColor:gray];

-
-    CGColorSpaceRelease(space);
+    [source_ setColor:black];

 }
 
 - (void) setSelected:(BOOL)selected {
 }
 
 - (void) setSelected:(BOOL)selected {


@@ -1566,563 +2672,664 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [super _setSelectionFadeFraction:fraction];
 }
 
     [super _setSelectionFadeFraction:fraction];
 }
 

-@end
-/* }}} */
-
-/* Database Implementation {{{ */
-@implementation Database
-
-- (void) dealloc {
-    _assert(false);
-    [super dealloc];
++ (int) heightForPackage:(Package *)package {
+#ifdef USE_BADGES
+    if ([package hasMode] || [package half])
+        return 96;
+    else
+#endif
+        return 73;

 }
 
 }
 

-- (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;
-
-    const char *error;
-    int offset;
-    pcre *code = pcre_compile("^([^:]*):([^:]*):([^:]*):(.*)$", 0, &error, &offset, NULL);
-
-    pcre_extra *study = NULL;
-    int capture;
-    pcre_fullinfo(code, study, PCRE_INFO_CAPTURECOUNT, &capture);
-    int matches[(capture + 1) * 3];
-
-    while (std::getline(is, line)) {
-        const char *data(line.c_str());
-
-        _assert(pcre_exec(code, study, data, line.size(), 0, 0, matches, sizeof(matches) / sizeof(matches[0])) >= 0);
-
-        std::istringstream buffer(line.substr(matches[6], matches[7] - matches[6]));
-        float percent;
-        buffer >> percent;
-        [delegate_ setPercent:(percent / 100)];
-
-        NSString *string = [NSString stringWithCString:(data + matches[8]) length:(matches[9] - matches[8])];
-        std::string type(line.substr(matches[2], matches[3] - matches[2]));
-
-        if (type == "pmerror")
-            [delegate_ setError:string];
-        else if (type == "pmstatus")
-            [delegate_ setTitle:string];
-        else if (type == "pmconffile")
-            ;
-        else _assert(false);
-    }
-
-    [pool release];
-    _assert(false);
+@end
+/* }}} */
+/* Section Cell {{{ */
+@interface SectionCell : UITableCell {
+    UITextLabel *name_;
+    UITextLabel *count_;

 }
 
 }
 

-- (void) _readOutput:(NSNumber *)fd {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (id) init;
+- (void) setSection:(Section *)section;

 
 

-    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
-    std::istream is(&ib);
-    std::string line;
+- (void) _setSelected:(float)fraction;
+- (void) setSelected:(BOOL)selected;
+- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
+- (void) _setSelectionFadeFraction:(float)fraction;

 
 

-    while (std::getline(is, line))
-        [delegate_ addOutput:[NSString stringWithCString:line.c_str()]];
+@end

 
 

-    [pool release];
-    _assert(false);
-}
+@implementation SectionCell

 
 

-- (Package *) packageWithName:(NSString *)name {
-    pkgCache::PkgIterator iterator(cache_->FindPkg([name cString]));
-    return iterator.end() ? nil : [Package packageWithIterator:iterator database:self];
+- (void) dealloc {
+    [name_ release];
+    [count_ release];
+    [super dealloc];

 }
 
 }
 

-- (Database *) init {
+- (id) init {

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

-        records_ = NULL;
-        resolver_ = NULL;
-        fetcher_ = NULL;
-        lock_ = NULL;
-
-        int fds[2];
-
-        _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[1], 1) != -1);
-        _assert(close(fds[1]) != -1);
+        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+        GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 12);

 
 

-        [NSThread
-            detachNewThreadSelector:@selector(_readOutput:)
-            toTarget:self
-            withObject:[[NSNumber numberWithInt:fds[0]] retain]
-        ];
-    } return self;
-}
+        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 9, 250, 25)];
+        [name_ setBackgroundColor:Clear_];
+        [name_ setFont:bold];

 
 

-- (pkgCacheFile &) cache {
-    return cache_;
-}
+        count_ = [[UITextLabel alloc] initWithFrame:CGRectMake(11, 7, 29, 32)];
+        [count_ setCentersHorizontally:YES];
+        [count_ setBackgroundColor:Clear_];
+        [count_ setFont:small];
+        [count_ setColor:White_];

 
 

-- (pkgRecords *) records {
-    return records_;
-}
+        UIImageView *folder = [[[UIImageView alloc] initWithFrame:CGRectMake(8, 7, 32, 32)] autorelease];
+        [folder setImage:[UIImage applicationImageNamed:@"folder.png"]];

 
 

-- (pkgProblemResolver *) resolver {
-    return resolver_;
-}
+        [self addSubview:folder];
+        [self addSubview:name_];
+        [self addSubview:count_];

 
 

-- (pkgAcquire &) fetcher {
-    return *fetcher_;
-}
+        [self _setSelected:0];

 
 

-- (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;
+        CFRelease(small);
+        CFRelease(bold);
+    } return self;

 }
 
 }
 

-- (void) prepare {
-    pkgRecords records(cache_);
-
-    lock_ = new FileFd();
-    lock_->Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
-    _assert(!_error->PendingError());
-
-    pkgSourceList list;
-    _assert(list.ReadMainList());
-
-    manager_ = (_system->CreatePM(cache_));
-    _assert(manager_->GetArchives(fetcher_, &list, &records));
-    _assert(!_error->PendingError());
+- (void) setSection:(Section *)section {
+    if (section == nil) {
+        [name_ setText:@"All Packages"];
+        [count_ setText:nil];
+    } else {
+        NSString *name = [section name];
+        [name_ setText:(name == nil ? @"(No Section)" : name)];
+        [count_ setText:[NSString stringWithFormat:@"%d", [section count]]];
+    }

 }
 
 }
 

-- (void) perform {
-    if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue)
-        return;
-
-    _system->UnLock();
-    pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_);
+- (void) _setSelected:(float)fraction {
+    CGColor black(space_,
+        Interpolate(0.0, 1.0, fraction),
+        Interpolate(0.0, 1.0, fraction),
+        Interpolate(0.0, 1.0, fraction),
+    1.0);

 
 

-    if (result == pkgPackageManager::Failed)
-        return;
-    if (_error->PendingError())
-        return;
-    if (result != pkgPackageManager::Completed)
-        return;
+    [name_ setColor:black];

 }
 
 }
 

-- (void) update {
-    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));
-    _assert(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"];
+- (void) setSelected:(BOOL)selected {
+    [self _setSelected:(selected ? 1.0 : 0.0)];
+    [super setSelected:selected];

 }
 
 }
 

-- (void) upgrade {
-    _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
-    _assert(pkgApplyStatus(cache_));
-
-    if (cache_->BrokenCount() != 0) {
-        _assert(pkgFixBroken(cache_));
-        _assert(cache_->BrokenCount() == 0);
-        _assert(pkgMinimizeUpgrade(cache_));
-    }
-
-    _assert(pkgDistUpgrade(cache_));
+- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
+    if (!fade)
+        [self _setSelected:(selected ? 1.0 : 0.0)];
+    [super setSelected:selected withFade:fade];

 }
 
 }
 

-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
-    status_.setDelegate(delegate);
-    progress_.setDelegate(delegate);
+- (void) _setSelectionFadeFraction:(float)fraction {
+    [self _setSelected:fraction];
+    [super _setSelectionFadeFraction:fraction];

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

-/* Progress Data {{{ */
-@interface ProgressData : NSObject {
-    SEL selector_;
-    id target_;
-    id object_;
+/* File Table {{{ */
+@interface FileTable : RVPage {
+    _transient Database *database_;
+    Package *package_;
+    NSString *name_;
+    NSMutableArray *files_;
+    UITable *list_;

 }
 
 }
 

-- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) setPackage:(Package *)package;

 
 

-- (SEL) selector;
-- (id) target;
-- (id) object;

 @end
 
 @end
 

-@implementation ProgressData
+@implementation FileTable

 
 

-- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object {
-    if ((self = [super init]) != nil) {
-        selector_ = selector;
-        target_ = target;
-        object_ = object;
-    } return self;
+- (void) dealloc {
+    if (package_ != nil)
+        [package_ release];
+    if (name_ != nil)
+        [name_ release];
+    [files_ release];
+    [list_ release];
+    [super dealloc];

 }
 
 }
 

-- (SEL) selector {
-    return selector_;
+- (int) numberOfRowsInTable:(UITable *)table {
+    return files_ == nil ? 0 : [files_ count];

 }
 
 }
 

-- (id) target {
-    return target_;
+- (float) table:(UITable *)table heightForRow:(int)row {
+    return 24;

 }
 
 }
 

-- (id) object {
-    return object_;
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
+    if (reusing == nil) {
+        reusing = [[[UIImageAndTextTableCell alloc] init] autorelease];
+        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+        [[(UIImageAndTextTableCell *)reusing titleTextLabel] setFont:font];
+        CFRelease(font);
+    }
+    [(UIImageAndTextTableCell *)reusing setTitle:[files_ objectAtIndex:row]];
+    return reusing;

 }
 
 }
 

-@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_;
+- (BOOL) canSelectRow:(int)row {
+    return NO;

 }
 
 }
 

-- (void) dealloc;
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;

 
 

-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
+        files_ = [[NSMutableArray arrayWithCapacity:32] retain];

 
 

-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate;
-- (void) setContentView:(UIView *)view;
-- (void) resetView;
+        list_ = [[UITable alloc] initWithFrame:[self bounds]];
+        [self addSubview:list_];

 
 

-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
+        UITableColumn *column = [[[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:[self frame].size.width
+        ] autorelease];

 
 

-- (void) _retachThread;
-- (void) _detachNewThreadData:(ProgressData *)data;
-- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title;
+        [list_ setDataSource:self];
+        [list_ setSeparatorStyle:1];
+        [list_ addTableColumn:column];
+        [list_ setDelegate:self];
+        [list_ setReusesTableCells:YES];
+    } return self;
+}

 
 

-- (void) setError:(NSString *)error;
-- (void) _setError:(NSString *)error;
+- (void) setPackage:(Package *)package {
+    if (package_ != nil) {
+        [package_ autorelease];
+        package_ = nil;
+    }

 
 

-- (void) setTitle:(NSString *)title;
-- (void) _setTitle:(NSString *)title;
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
+    }

 
 

-- (void) setPercent:(float)percent;
-- (void) _setPercent:(NSNumber *)percent;
+    [files_ removeAllObjects];

 
 

-- (void) addOutput:(NSString *)output;
-- (void) _addOutput:(NSString *)output;
-@end
+    if (package != nil) {
+        package_ = [package retain];
+        name_ = [[package id] retain];

 
 

-@protocol ProgressViewDelegate
-- (void) progressViewIsComplete:(ProgressView *)sender;
-@end
+        NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_];

 
 

-@implementation ProgressView
+        {
+            std::ifstream fin([path UTF8String]);
+            std::string line;
+            while (std::getline(fin, line))
+                [files_ addObject:[NSString stringWithUTF8String:line.c_str()]];
+        }

 
 

-- (void) dealloc {
-    [view_ release];
-    if (background_ != nil)
-        [background_ release];
-    [transition_ release];
-    [overlay_ release];
-    [navbar_ release];
-    [progress_ release];
-    [output_ release];
-    [status_ release];
-    [super dealloc];
-}
+        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]]
+                ]];
+            }
+        }
+    }

 
 

-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
-    if (bootstrap_ && from == overlay_ && to == view_)
-        exit(0);
+    [list_ reloadData];

 }
 
 }
 

-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        delegate_ = delegate;
-
-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-
-        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) reloadData {
+    [self setPackage:[database_ packageWithName:name_]];
+    [self reloadButtons];
+}

 
 

-        overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+- (NSString *) title {
+    return @"Installed Files";
+}

 
 

-        if (bootstrap_)
-            [overlay_ setBackgroundColor:black];
-        else {
-            background_ = [[UIView alloc] initWithFrame:[self bounds]];
-            [background_ setBackgroundColor:black];
-            [self addSubview:background_];
-        }
+- (NSString *) backButtonTitle {
+    return @"Files";
+}

 
 

-        [self addSubview:transition_];
+@end
+/* }}} */
+/* Package View {{{ */
+@protocol PackageViewDelegate
+- (void) performPackage:(Package *)package;
+@end

 
 

-        CGSize navsize = [UINavigationBar defaultSize];
-        CGRect navrect = {{0, 0}, navsize};
+@interface PackageView : RVPage {
+    _transient Database *database_;
+    UIPreferencesTable *table_;
+    Package *package_;
+    NSString *name_;
+    UITextView *description_;
+    NSMutableArray *buttons_;
+}

 
 

-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [overlay_ addSubview:navbar_];
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) setPackage:(Package *)package;

 
 

-        [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
+@end

 
 

-        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:nil] autorelease];
-        [navbar_ pushNavigationItem:navitem];
+@implementation PackageView

 
 

-        CGRect bounds = [overlay_ bounds];
-        CGSize prgsize = [UIProgressBar defaultSize];
+- (void) dealloc {
+    [table_ setDataSource:nil];
+    [table_ setDelegate:nil];

 
 

-        CGRect prgrect = {{
-            (bounds.size.width - prgsize.width) / 2,
-            bounds.size.height - prgsize.height - 20
-        }, prgsize};
+    if (package_ != nil)
+        [package_ release];
+    if (name_ != nil)
+        [name_ release];
+    if (description_ != nil)
+        [description_ release];
+    [table_ release];
+    [buttons_ release];
+    [super dealloc];
+}

 
 

-        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
-        [overlay_ addSubview:progress_];
+- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
+    int number = 2;
+    if ([package_ installed] != nil)
+        ++number;
+    if ([package_ source] != nil)
+        ++number;
+    return number;
+}

 
 

-        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(
-            10,
-            bounds.size.height - prgsize.height - 50,
-            bounds.size.width - 20,
-            24
-        )];
+- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
+    if (group-- == 0)
+        return nil;
+    else if ([package_ installed] != nil && group-- == 0)
+        return @"Installed Package";
+    else if (group-- == 0)
+        return @"Package Details";
+    else if ([package_ source] != nil && group-- == 0)
+        return @"Source Information";
+    else _assert(false);
+}

 
 

-        [status_ setColor:white];
-        [status_ setBackgroundColor:clear];
+- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
+    if (description_ == nil || group != 0 || row != 1)
+        return proposed;
+    else
+        return [description_ visibleTextRect].size.height + TextViewOffset_;
+}

 
 

-        [status_ setCentersHorizontally:YES];
-        //[status_ setFont:font];
+- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
+    if (group-- == 0) {
+        int number = 1;
+        if ([package_ author] != nil)
+            ++number;
+        if (description_ != nil)
+            ++number;
+        if ([package_ website] != nil)
+            ++number;
+        return number;
+    } else if ([package_ installed] != nil && group-- == 0)
+        return 2;
+    else if (group-- == 0) {
+        int number = 2;
+        if ([package_ size] != 0)
+            ++number;
+        if ([package_ maintainer] != nil)
+            ++number;
+        if ([package_ sponsor] != nil)
+            ++number;
+        if ([package_ relationships] != nil)
+            ++number;
+        if ([[package_ source] trusted])
+            ++number;
+        return number;
+    } else if ([package_ source] != nil && group-- == 0) {
+        Source *source = [package_ source];
+        NSString *description = [source description];
+        int number = 1;
+        if (description != nil && ![description isEqualToString:[source label]])
+            ++number;
+        if ([source origin] != nil)
+            ++number;
+        return number;
+    } else _assert(false);
+}

 
 

-        output_ = [[UITextView alloc] initWithFrame:CGRectMake(
-            10,
-            navrect.size.height + 20,
-            bounds.size.width - 20,
-            bounds.size.height - navsize.height - 62 - navrect.size.height
-        )];
+- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
+    UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
+    [cell setShowSelection:NO];

 
 

-        //[output_ setTextFont:@"Courier New"];
-        [output_ setTextSize:12];
+    if (group-- == 0) {
+        if (false) {
+        } else if (row-- == 0) {
+            [cell setTitle:[package_ name]];
+            [cell setValue:[package_ latest]];
+        } else if ([package_ author] != nil && row-- == 0) {
+            [cell setTitle:@"Author"];
+            [cell setValue:[[package_ author] name]];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else if (description_ != nil && row-- == 0) {
+            [cell addSubview:description_];
+        } else if ([package_ website] != nil && row-- == 0) {
+            [cell setTitle:@"More Information"];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else _assert(false);
+    } else if ([package_ installed] != nil && group-- == 0) {
+        if (false) {
+        } else if (row-- == 0) {
+            [cell setTitle:@"Version"];
+            NSString *installed([package_ installed]);
+            [cell setValue:(installed == nil ? @"n/a" : installed)];
+        } else if (row-- == 0) {
+            [cell setTitle:@"Filesystem Content"];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else _assert(false);
+    } else if (group-- == 0) {
+        if (false) {
+        } else if (row-- == 0) {
+            [cell setTitle:@"Identifier"];
+            [cell setValue:[package_ id]];
+        } else if (row-- == 0) {
+            [cell setTitle:@"Section"];
+            NSString *section([package_ section]);
+            [cell setValue:(section == nil ? @"n/a" : section)];
+        } else if ([package_ size] != 0 && row-- == 0) {
+            [cell setTitle:@"Expanded Size"];
+            [cell setValue:SizeString([package_ size])];
+        } else if ([package_ maintainer] != nil && row-- == 0) {
+            [cell setTitle:@"Maintainer"];
+            [cell setValue:[[package_ maintainer] name]];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else if ([package_ sponsor] != nil && row-- == 0) {
+            [cell setTitle:@"Sponsor"];
+            [cell setValue:[[package_ sponsor] name]];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else if ([package_ relationships] != nil && row-- == 0) {
+            [cell setTitle:@"Package Relationships"];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else if ([[package_ source] trusted] && row-- == 0) {
+            [cell setIcon:[UIImage applicationImageNamed:@"trusted.png"]];
+            [cell setValue:@"This package has been signed."];
+        } else _assert(false);
+    } else if ([package_ source] != nil && group-- == 0) {
+        Source *source = [package_ source];
+        NSString *description = [source description];
+
+        if (false) {
+        } else if (row-- == 0) {
+            NSString *label = [source label];
+            if (label == nil)
+                label = [source uri];
+            [cell setTitle:label];
+            [cell setValue:[source version]];
+        } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) {
+            [cell setValue:description];
+        } else if ([source origin] != nil && row-- == 0) {
+            [cell setTitle:@"Origin"];
+            [cell setValue:[source origin]];
+        } else _assert(false);
+    } else _assert(false);

 
 

-        [output_ setTextColor:white];
-        [output_ setBackgroundColor:clear];
+    return cell;
+}

 
 

-        [output_ setMarginTop:0];
-        [output_ setAllowsRubberBanding:YES];
+- (BOOL) canSelectRow:(int)row {
+    return YES;
+}

 
 

-        [overlay_ addSubview:output_];
-        [overlay_ addSubview:status_];
+- (void) tableRowSelected:(NSNotification *)notification {
+    int row = [table_ selectedRow];
+    if (row == INT_MAX)
+        return;

 
 

-        [progress_ setStyle:0];
+    #define _else else goto _label; return; } _label:

 
 

-        CGColorSpaceRelease(space);
-    } return self;
+    if (true) {
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if ([package_ author] != nil && row-- == 0) {
+            [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
+                [[package_ author] email],
+                [[NSString stringWithFormat:@"regarding apt package \"%@\"",
+                    [package_ name]
+                ] stringByAddingPercentEscapes]
+            ]]];
+        } else if (description_ != nil && row-- == 0) {
+        } else if ([package_ website] != nil && row-- == 0) {
+            NSURL *url = [NSURL URLWithString:[package_ website]];
+            BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+            [browser setDelegate:delegate_];
+            [book_ pushPage:browser];
+            [browser loadURL:url];
+    } _else if ([package_ installed] != nil) {
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if (row-- == 0) {
+            FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
+            [files setDelegate:delegate_];
+            [files setPackage:package_];
+            [book_ pushPage:files];
+    } _else if (true) {
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if ([package_ size] != 0 && row-- == 0) {
+        } else if ([package_ maintainer] != nil && row-- == 0) {
+            [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
+                [[package_ maintainer] email],
+                [[NSString stringWithFormat:@"regarding apt package \"%@\"",
+                    [package_ name]
+                ] stringByAddingPercentEscapes]
+            ]]];
+        } else if ([package_ sponsor] != nil && row-- == 0) {
+            NSURL *url = [NSURL URLWithString:[[package_ sponsor] email]];
+            BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+            [browser setDelegate:delegate_];
+            [book_ pushPage:browser];
+            [browser loadURL:url];
+        } else if ([package_ relationships] != nil && row-- == 0) {
+        } else if ([[package_ source] trusted] && row-- == 0) {
+    } _else if ([package_ source] != nil) {
+        Source *source = [package_ source];
+        NSString *description = [source description];
+
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) {
+        } else if ([source origin] != nil && row-- == 0) {
+    } _else _assert(false);
+
+    #undef _else
+}
+
+- (void) _clickButtonWithName:(NSString *)name {
+    if ([name isEqualToString:@"Install"])
+        [delegate_ installPackage:package_];
+    else if ([name isEqualToString:@"Reinstall"])
+        [delegate_ installPackage:package_];
+    else if ([name isEqualToString:@"Remove"])
+        [delegate_ removePackage:package_];
+    else if ([name isEqualToString:@"Upgrade"])
+        [delegate_ installPackage:package_];
+    else _assert(false);

 }
 
 }
 

-- (void) setContentView:(UIView *)view {
-    view_ = [view retain];
-}
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    int count = [buttons_ count];
+    _assert(count != 0);
+    _assert(button <= count + 1);

 
 

-- (void) resetView {
-    [transition_ transition:6 toView:view_];
-}
+    if (count != button - 1)
+        [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];

 
 

-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {

     [sheet dismiss];
 }
 
     [sheet dismiss];
 }
 

-- (void) _retachThread {
-    [delegate_ progressViewIsComplete:self];
-    [self resetView];
-}
-
-- (void) _detachNewThreadData:(ProgressData *)data {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (void) _rightButtonClicked {
+    int count = [buttons_ count];
+    _assert(count != 0);

 
 

-    [[data target] performSelector:[data selector] withObject:[data object]];
-    [data release];
+    if (count == 1)
+        [self _clickButtonWithName:[buttons_ objectAtIndex:0]];
+    else {
+        NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)];
+        [buttons addObjectsFromArray:buttons_];
+        [buttons addObject:@"Cancel"];
+
+        [delegate_ slideUp:[[[UIAlertSheet alloc]
+            initWithTitle:nil
+            buttons:buttons
+            defaultButtonIndex:2
+            delegate:self
+            context:@"manage"
+        ] autorelease]];
+    }
+}

 
 

-    [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES];
+- (NSString *) rightButtonTitle {
+    int count = [buttons_ count];
+    return count == 0 ? nil : count != 1 ? @"Modify" : [buttons_ objectAtIndex:0];
+}

 
 

-    [pool release];
+- (NSString *) title {
+    return @"Details";

 }
 
 }
 

-- (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];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;

 
 

-    [status_ setText:nil];
-    [output_ setText:@""];
-    [progress_ setProgress:0];
+        table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]];
+        [self addSubview:table_];

 
 

-    [transition_ transition:6 toView:overlay_];
+        [table_ setDataSource:self];
+        [table_ setDelegate:self];

 
 

-    [NSThread
-        detachNewThreadSelector:@selector(_detachNewThreadData:)
-        toTarget:self
-        withObject:[[ProgressData alloc]
-            initWithSelector:selector
-            target:target
-            object:object
-        ]
-    ];
+        buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
+    } return self;

 }
 
 }
 

-- (void) setError:(NSString *)error {
-    [self
-        performSelectorOnMainThread:@selector(_setError:)
-        withObject:error
-        waitUntilDone:YES
-    ];
-}
+- (void) setPackage:(Package *)package {
+    if (package_ != nil) {
+        [package_ autorelease];
+        package_ = nil;
+    }

 
 

-- (void) _setError:(NSString *)error {
-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-        initWithTitle:@"Package Error"
-        buttons:[NSArray arrayWithObjects:@"Okay", nil]
-        defaultButtonIndex:0
-        delegate:self
-        context:self
-    ] autorelease];
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
+    }

 
 

-    [sheet setBodyText:error];
-    [sheet popupAlertAnimated:YES];
-}
+    if (description_ != nil) {
+        [description_ release];
+        description_ = nil;
+    }

 
 

-- (void) setTitle:(NSString *)title {
-    [self
-        performSelectorOnMainThread:@selector(_setTitle:)
-        withObject:title
-        waitUntilDone:YES
-    ];
-}
+    [buttons_ removeAllObjects];

 
 

-- (void) _setTitle:(NSString *)title {
-    [status_ setText:[title stringByAppendingString:@"..."]];
-}
+    if (package != nil) {
+        package_ = [package retain];
+        name_ = [[package id] retain];

 
 

-- (void) setPercent:(float)percent {
-    [self
-        performSelectorOnMainThread:@selector(_setPercent:)
-        withObject:[NSNumber numberWithFloat:percent]
-        waitUntilDone:YES
-    ];
-}
+        NSString *description([package description]);
+        if (description == nil)
+            description = [package tagline];
+        if (description != nil) {
+            description_ = [GetTextView(description, 12, true) retain];
+            [description_ setTextColor:Black_];
+        }

 
 

-- (void) _setPercent:(NSNumber *)percent {
-    [progress_ setProgress:[percent floatValue]];
+        [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) addOutput:(NSString *)output {
-    [self
-        performSelectorOnMainThread:@selector(_addOutput:)
-        withObject:output
-        waitUntilDone:YES
-    ];
+- (void) resetViewAnimated:(BOOL)animated {
+    [table_ resetViewAnimated:animated];

 }
 
 }
 

-- (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];
+- (void) reloadData {
+    [self setPackage:[database_ packageWithName:name_]];
+    [self reloadButtons];

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

-

 /* Package Table {{{ */
 /* Package Table {{{ */

-@protocol PackageTableDelegate
-- (void) packageTable:(id)table packageSelected:(Package *)package;
-@end
-
-@interface PackageTable : UIView {
-    SEL versioner_;
-    UISectionList *list_;
-
-    id delegate_;
-    NSArray *packages_;
+@interface PackageTable : RVPage {
+    _transient Database *database_;
+    NSString *title_;
+    SEL filter_;
+    id object_;
+    NSMutableArray *packages_;

     NSMutableArray *sections_;
     NSMutableArray *sections_;

+    UISectionList *list_;

 }
 
 }
 

-- (void) dealloc;
+- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object;

 
 

-- (int) numberOfSectionsInSectionList:(UISectionList *)list;
-- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section;
-- (int) sectionList:(UISectionList *)list rowForSection:(int)section;
+- (void) setDelegate:(id)delegate;
+- (void) setObject:(id)object;

 
 

-- (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) reloadData;
+- (void) resetCursor;

 
 

-- (id) initWithFrame:(CGRect)frame versioner:(SEL)versioner;
+- (UISectionList *) list;

 
 

-- (void) setDelegate:(id)delegate;
-- (void) setPackages:(NSArray *)packages;
+- (void) setShouldHideHeaderInShortLists:(BOOL)hide;

 
 

-- (void) resetViewAnimated:(BOOL)animated;
-- (UITable *) table;

 @end
 
 @implementation PackageTable
 
 - (void) dealloc {
 @end
 
 @implementation PackageTable
 
 - (void) dealloc {

-    [list_ release];
+    [list_ setDataSource:nil];
+
+    [title_ release];
+    if (object_ != nil)
+        [object_ release];
+    [packages_ release];

     [sections_ release];
     [sections_ release];

-    if (packages_ != nil)
-        [packages_ release];
+    [list_ release];

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


@@ -2143,12 +3350,12 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
 }
 
 - (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)
 }
 
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
     if (reusing == nil)

-        reusing = [[[PackageCell alloc] initWithVersioner:versioner_] autorelease];
+        reusing = [[[PackageCell alloc] init] autorelease];

     [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]];
     return reusing;
 }
     [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]];
     return reusing;
 }


@@ -2159,12 +3366,24 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [[notification object] selectedRow];
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [[notification object] selectedRow];

-    [delegate_ 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];

 }
 
 }
 

-- (id) initWithFrame:(CGRect)frame versioner:(SEL)versioner {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        versioner_ = versioner;
+- (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];
+
+        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];

         sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
         list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:YES];
         sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
         list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:YES];


@@ -2173,7 +3392,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         UITableColumn *column = [[[UITableColumn alloc]
             initWithTitle:@"Name"
             identifier:@"name"
         UITableColumn *column = [[[UITableColumn alloc]
             initWithTitle:@"Name"
             identifier:@"name"

-            width:frame.size.width
+            width:[self frame].size.width

         ] autorelease];
 
         UITable *table = [list_ table];
         ] autorelease];
 
         UITable *table = [list_ table];


@@ -2183,6 +3402,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [table setReusesTableCells:YES];
 
         [self addSubview:list_];
         [table setReusesTableCells:YES];
 
         [self addSubview:list_];

+        [self reloadData];

     } return self;
 }
 
     } return self;
 }
 


@@ -2190,202 +3410,395 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     delegate_ = delegate;
 }
 
     delegate_ = delegate;
 }
 

-- (void) setPackages:(NSArray *)packages {
-    if (packages_ != nil)
-        [packages_ autorelease];
-    _assert(packages != nil);
-    packages_ = [packages retain];
+- (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];
 
     [sections_ removeAllObjects];
 

+    for (size_t i(0); i != [packages count]; ++i) {
+        Package *package([packages objectAtIndex:i]);
+        if ([[package performSelector:filter_ withObject:object_] boolValue])
+            [packages_ addObject:package];
+    }
+

     Section *section = nil;
 
     for (size_t offset(0); offset != [packages_ count]; ++offset) {
         Package *package = [packages_ objectAtIndex:offset];
         NSString *name = [package index];
 
     Section *section = nil;
 
     for (size_t offset(0); offset != [packages_ count]; ++offset) {
         Package *package = [packages_ objectAtIndex:offset];
         NSString *name = [package index];
 

-        if (section == nil || ![[section name] isEqual:name]) {
+        if (section == nil || ![[section name] isEqualToString:name]) {

             section = [[[Section alloc] initWithName:name row:offset] autorelease];
             [sections_ addObject:section];
         }
 
             section = [[[Section alloc] initWithName:name row:offset] autorelease];
             [sections_ addObject:section];
         }
 

-        [section addPackage:package];
+        [section addToCount];

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

+- (NSString *) title {
+    return title_;
+}
+

 - (void) resetViewAnimated:(BOOL)animated {
 - (void) resetViewAnimated:(BOOL)animated {

-    [[list_ table] selectRow:-1 byExtendingSelection:NO withFade:animated];
+    [list_ resetViewAnimated:animated];
+}
+
+- (void) resetCursor {
+    [[list_ table] scrollPointVisibleAtTopLeft:CGPointMake(0, 0) animated:NO];
+}
+
+- (UISectionList *) list {
+    return list_;

 }
 
 }
 

-- (UITable *) table {
-    return [list_ table];
+- (void) setShouldHideHeaderInShortLists:(BOOL)hide {
+    [list_ setShouldHideHeaderInShortLists:hide];

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

-/* Section Cell {{{ */
-@interface SectionCell : UITableCell {
-    UITextLabel *name_;
-    UITextLabel *count_;
+/* Browser Implementation {{{ */
+@implementation BrowserView
+
+- (void) dealloc {
+    WebView *webview = [webview_ webView];
+    [webview setFrameLoadDelegate:nil];
+    [webview setResourceLoadDelegate:nil];
+    [webview setUIDelegate:nil];
+
+    [scroller_ setDelegate:nil];
+    [webview_ setDelegate:nil];
+
+    [scroller_ release];
+    [webview_ release];
+    [urls_ release];
+    [indicator_ release];
+    if (title_ != nil)
+        [title_ release];
+    [super dealloc];

 }
 
 }
 

-- (void) dealloc;
+- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
+    NSMutableURLRequest *request = [NSMutableURLRequest
+        requestWithURL:url
+        cachePolicy:policy
+        timeoutInterval:30.0
+    ];

 
 

-- (id) init;
-- (void) setSection:(Section *)section;
+    [request addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"];
+    [request addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
+    [request addValue:[NSString stringWithUTF8String:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];

 
 

-- (void) _setSelected:(float)fraction;
-- (void) setSelected:(BOOL)selected;
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
-- (void) _setSelectionFadeFraction:(float)fraction;
+    [self loadRequest:request];
+}

 
 

-@end

 
 

-@implementation SectionCell
+- (void) loadURL:(NSURL *)url {
+    [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy];
+}

 
 

-- (void) dealloc {
-    [name_ release];
-    [count_ release];
-    [super dealloc];
+// XXX: this needs to add the headers
+- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request {
+    return request;

 }
 
 }
 

-- (id) init {
-    if ((self = [super init]) != nil) {
-        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
-        GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 12);
+- (void) loadRequest:(NSURLRequest *)request {
+    [webview_ loadRequest:request];
+}

 
 

-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-        CGColor clear(space, 0, 0, 0, 0);
-        CGColor white(space, 1, 1, 1, 1);
+- (void) reloadURL {
+    NSURL *url = [[[urls_ lastObject] retain] autorelease];
+    [urls_ removeLastObject];
+    [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData];
+}

 
 

-        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(47, 9, 250, 25)];
-        [name_ setBackgroundColor:clear];
-        [name_ setFont:bold];
+- (WebView *) webView {
+    return [webview_ webView];
+}

 
 

-        count_ = [[UITextLabel alloc] initWithFrame:CGRectMake(11, 7, 29, 32)];
-        [count_ setCentersHorizontally:YES];
-        [count_ setBackgroundColor:clear];
-        [count_ setFont:small];
-        [count_ setColor:white];
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame {
+    [scroller_ setContentSize:frame.size];
+}

 
 

-        UIImageView *folder = [[[UIImageView alloc] initWithFrame:CGRectMake(8, 7, 32, 32)] autorelease];
-        [folder setImage:[UIImage applicationImageNamed:@"folder.png"]];
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
+    [self view:sender didSetFrame:frame];
+}

 
 

-        [self addSubview:folder];
-        [self addSubview:name_];
-        [self addSubview:count_];
+- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
+    return [self _addHeadersToRequest:request];
+}

 
 

-        [self _setSelected:0];
+- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
+    if ([[[request URL] scheme] isEqualToString:@"apptapp"])
+        return nil;
+    [self setBackButtonTitle:title_];
+    BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+    [browser setDelegate:delegate_];
+    [book_ pushPage:browser];
+    [browser loadRequest:[self _addHeadersToRequest:request]];
+    return [browser webView];
+}
+
+- (void) webView:(WebView *)sender willClickElement:(id)element {
+    if (![element respondsToSelector:@selector(href)])
+        return;
+    NSString *href = [element href];
+    if (href == nil)
+        return;
+    if ([href hasPrefix:@"apptapp://package/"]) {
+        NSString *name = [href substringFromIndex:18];
+        Package *package = [database_ packageWithName:name];
+        if (package == nil) {
+            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+                initWithTitle:@"Cannot Locate Package"
+                buttons:[NSArray arrayWithObjects:@"Close", nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"missing"
+            ] autorelease];

 
 

-        CGColorSpaceRelease(space);
+            [sheet setBodyText:[NSString stringWithFormat:
+                @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
+            , name]];

 
 

-        CFRelease(small);
-        CFRelease(bold);
-    } return self;
+            [sheet popupAlertAnimated:YES];
+        } else {
+            [self setBackButtonTitle:title_];
+            PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+            [view setDelegate:delegate_];
+            [view setPackage:package];
+            [book_ pushPage:view];
+        }
+    }

 }
 
 }
 

-- (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) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
+    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;

     }
     }

+
+    [self setTitle:@"Loading..."];
+
+    WebView *webview = [webview_ webView];
+    NSString *href = [webview mainFrameURL];
+    [urls_ addObject:[NSURL URLWithString:href]];
+
+    CGRect webrect = [scroller_ frame];
+    webrect.size.height = 0;
+    [webview_ setFrame:webrect];

 }
 
 }
 

-- (void) _setSelected:(float)fraction {
-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+- (void) _finishLoading {
+    if (!reloading_) {
+        loading_ = false;
+        [indicator_ stopAnimation];
+        [self reloadButtons];
+    }
+}

 
 

-    CGColor black(space,
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-    1.0);
+- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
+    if ([frame parentFrame] != nil)
+        return;
+    [self _finishLoading];
+}

 
 

-    [name_ setColor:black];
+- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
+    if ([frame parentFrame] != nil)
+        return;
+    [self setTitle:[error localizedDescription]];
+    [self _finishLoading];
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+        loading_ = false;
+
+        struct CGRect bounds = [self bounds];
+
+        UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:bounds] autorelease];
+        [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
+        [self addSubview:pinstripe];
+
+        scroller_ = [[UIScroller alloc] initWithFrame:bounds];
+        [self addSubview:scroller_];
+
+        [scroller_ setScrollingEnabled:YES];
+        [scroller_ setAdjustForContentSizeChange:YES];
+        [scroller_ setClipsSubviews:YES];
+        [scroller_ setAllowsRubberBanding:YES];
+        [scroller_ setScrollDecelerationFactor:0.99];
+        [scroller_ setDelegate:self];
+
+        CGRect webrect = [scroller_ bounds];
+        webrect.size.height = 0;
+
+        webview_ = [[UIWebView alloc] initWithFrame:webrect];
+        [scroller_ addSubview:webview_];
+
+        [webview_ setTilingEnabled:YES];
+        [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
+        [webview_ setAutoresizes:YES];
+        [webview_ setDelegate:self];
+        //[webview_ setEnabledGestures:2];
+
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite];
+        indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 42, indsize.width, indsize.height)];
+        [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite];
+
+        Package *package([database_ packageWithName:@"cydia"]);
+        NSString *application = package == nil ? @"Cydia" : [NSString
+            stringWithFormat:@"Cydia/%@",
+            [package installed]
+        ];
+
+        WebView *webview = [webview_ webView];
+        [webview setApplicationNameForUserAgent:application];
+        [webview setFrameLoadDelegate:self];
+        [webview setResourceLoadDelegate:self];
+        [webview setUIDelegate:self];

 
 

-    CGColorSpaceRelease(space);
+        urls_ = [[NSMutableArray alloc] initWithCapacity:16];
+    } return self;

 }
 
 }
 

-- (void) setSelected:(BOOL)selected {
-    [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected];
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    [sheet dismiss];

 }
 
 }
 

-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
-    if (!fade)
-        [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected withFade:fade];
+- (void) _leftButtonClicked {
+    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        initWithTitle:@"About Cydia Installer"
+        buttons:[NSArray arrayWithObjects:@"Close", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"about"
+    ] 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/"
+    ];
+
+    [sheet popupAlertAnimated:YES];

 }
 
 }
 

-- (void) _setSelectionFadeFraction:(float)fraction {
-    [self _setSelected:fraction];
-    [super _setSelectionFadeFraction:fraction];
+- (void) _rightButtonClicked {
+    reloading_ = true;
+    [self reloadURL];
+}
+
+- (NSString *) leftButtonTitle {
+    return @"About";
+}
+
+- (NSString *) rightButtonTitle {
+    return loading_ ? @"" : @"Reload";
+}
+
+- (NSString *) title {
+    return nil;
+}
+
+- (NSString *) backButtonTitle {
+    return @"Browser";
+}
+
+- (void) setPageActive:(BOOL)active {
+    if (active)
+        [book_ addSubview:indicator_];
+    else
+        [indicator_ removeFromSuperview];
+}
+
+- (void) resetViewAnimated:(BOOL)animated {

 }
 
 @end
 /* }}} */
 }
 
 @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_;
+    UIView *overlay_;
+    UIProgressIndicator *indicator_;
+    UITextLabel *prompt_;
+    UIProgressBar *progress_;
+    bool updating_;

 }
 
 }
 

-- (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 *packages_;
+    NSMutableArray *sections_;
+    UITable *list_;
+    UIView *accessory_;
+}

 
 

-- (void) packageTable:(id)table packageSelected:(Package *)package;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) reloadData;

 
 

-- (id) initWithFrame:(CGRect)frame;
-- (void) setPackages:(NSArray *)packages;
-- (void) setDelegate:(id)delegate;

 @end
 
 @implementation InstallView
 
 - (void) dealloc {
 @end
 
 @implementation InstallView
 
 - (void) dealloc {

+    [list_ setDataSource:nil];
+    [list_ setDelegate:nil];
+

     [packages_ release];
     [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];
+    [sections_ release];
+    [list_ release];
+    [accessory_ release];

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

-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    if (button == 0) {
-        [[view_ package] install];
-        [delegate_ resolve];
-        [delegate_ perform];
-    }
-}
-

 - (int) numberOfRowsInTable:(UITable *)table {
     return [sections_ count] + 1;
 }
 - (int) numberOfRowsInTable:(UITable *)table {
     return [sections_ count] + 1;
 }


@@ -2397,10 +3810,7 @@ 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];
 - (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:(row == 0 ? nil : [sections_ objectAtIndex:(row - 1)])];

     return reusing;
 }
 
     return reusing;
 }
 


@@ -2410,71 +3820,56 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [[notification object] selectedRow];
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [[notification object] selectedRow];

+    if (row == INT_MAX)
+        return;

 
 

-    if (row == INT_MAX) {
-        [section_ release];
-        section_ = nil;
-
-        [table_ release];
-        table_ = nil;
-    } else {
-        _assert(section_ == nil);
-        _assert(table_ == nil);
-
-        Section *section;
-        NSString *name;
-
-        if (row == 0) {
-            section = nil;
-            section_ = nil;
-            name = @"All Packages";
-        } else {
-            section = [sections_ objectAtIndex:(row - 1)];
-            name = [section name];
-            section_ = [name retain];
-        }
-
-        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;
+    Section *section;
+    NSString *name;
+    NSString *title;

 
 

-        [view_ release];
-        view_ = nil;
+    if (row == 0) {
+        section = nil;
+        name = nil;
+        title = @"All Packages";

     } else {
     } else {

-        _assert(package_ == nil);
-        _assert(view_ == nil);
+        section = [sections_ objectAtIndex:(row - 1)];
+        name = [section name];

 
 

-        package_ = [[package name] retain];
+        if (name != nil)
+            title = name;
+        else {
+            name = @"";
+            title = @"(No Section)";
+        }
+    }

 
 

-        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
-        [view_ setDelegate:delegate_];
+    PackageTable *table = [[[PackageTable alloc]
+        initWithBook:book_
+        database:database_
+        title:title
+        filter:@selector(isUninstalledInSection:)
+        with:name
+    ] autorelease];

 
 

-        [view_ setPackage:package];
+    [table setDelegate:delegate_];

 
 

-        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:@"Install"];
-    }
+    [book_ pushPage:table];

 }
 
 }
 

-- (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];
         packages_ = [[NSMutableArray arrayWithCapacity:16] retain];

+        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];

 
 

-        list_ = [[UITable alloc] initWithFrame:[transition_ bounds]];
-        [self pushView:list_ withTitle:@"Install" backButtonTitle:@"Sections" rightButton:nil];
+        list_ = [[UITable alloc] initWithFrame:[self bounds]];
+        [self addSubview:list_];

 
         UITableColumn *column = [[[UITableColumn alloc]
             initWithTitle:@"Name"
             identifier:@"name"
 
         UITableColumn *column = [[[UITableColumn alloc]
             initWithTitle:@"Name"
             identifier:@"name"

-            width:frame.size.width
+            width:[self frame].size.width

         ] autorelease];
 
         [list_ setDataSource:self];
         ] autorelease];
 
         [list_ setDataSource:self];


@@ -2483,119 +3878,81 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [list_ setDelegate:self];
         [list_ setReusesTableCells:YES];
 
         [list_ setDelegate:self];
         [list_ setReusesTableCells:YES];
 

-        [transition_ transition:0 toView:list_];
+        [self reloadData];

     } return self;
 }
 
     } return self;
 }
 

-- (void) setPackages:(NSArray *)packages {
+- (void) reloadData {
+    NSArray *packages = [database_ packages];
+

     [packages_ removeAllObjects];
     [packages_ removeAllObjects];

+    [sections_ removeAllObjects];

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

-        if ([package installed] == nil)
+        if ([package valid] && [package installed] == nil)

             [packages_ addObject:package];
     }
 
             [packages_ addObject:package];
     }
 

-    [packages_ sortUsingSelector:@selector(compareBySectionAndName:)];
-    NSMutableArray *sections = [NSMutableArray arrayWithCapacity:16];
-
-    Section *nsection = nil;
-    Package *npackage = nil;
+    [packages_ sortUsingSelector:@selector(compareBySection:)];

 
     Section *section = nil;
     for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
         Package *package = [packages_ objectAtIndex:offset];
         NSString *name = [package section];
 
 
     Section *section = nil;
     for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
         Package *package = [packages_ objectAtIndex:offset];
         NSString *name = [package section];
 

-        if (section == nil || ![[section name] isEqual:name]) {
+        if (section == nil || name != nil && ![[section name] isEqualToString:name]) {

             section = [[[Section alloc] initWithName:name row:offset] autorelease];
             section = [[[Section alloc] initWithName:name row:offset] autorelease];

-
-            if ([name isEqualToString:section_])
-                nsection = section;
-            [sections addObject:section];
+            [sections_ addObject:section];

         }
 
         }
 

-        if ([[package name] isEqualToString:package_])
-            npackage = package;
-        [section addPackage:package];
+        [section addToCount];

     }
 
     }
 

-    if (sections_ != nil)
-        [sections_ release];
-    sections_ = [sections retain];
-
-    [packages_ sortUsingSelector:@selector(compareByName:)];
-

     [list_ reloadData];
     [list_ reloadData];

+}

 
 

-    unsigned views(0);
-
-    if (npackage != nil)
-        [view_ setPackage:npackage];
-    else if (package_ != nil)
-        ++views;
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
+}

 
 

-    if (nsection != nil)
-        [table_ setPackages:[nsection packages]];
-    else if (section_ != nil)
-        ++views;
+- (NSString *) title {
+    return @"Install";
+}

 
 

-    [self popViews:views];
-    [self setPrompt];
+- (NSString *) backButtonTitle {
+    return @"Sections";

 }
 
 }
 

-- (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
-    [super setDelegate:delegate];
+- (UIView *) accessoryView {
+    return accessory_;

 }
 
 @end
 /* }}} */
 /* Changes View {{{ */
 }
 
 @end
 /* }}} */
 /* Changes View {{{ */

-@interface ChangesView : ResetView <
-    PackageTableDelegate
-> {
-    UISectionList *list_;
+@interface ChangesView : RVPage {
+    _transient Database *database_;

     NSMutableArray *packages_;
     NSMutableArray *sections_;
     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 {
 @end
 
 @implementation ChangesView
 
 - (void) dealloc {

-    [list_ release];
+    [[list_ table] setDelegate:nil];
+    [list_ setDataSource:nil];
+

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

-    if (view_ != nil)
-        [view_ release];
-    if (package_ != nil)
-        [package_ release];
+    [list_ release];

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


@@ -2616,12 +3973,12 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
 }
 
 - (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)
 }
 
 - (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;
 }
     [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]];
     return reusing;
 }


@@ -2632,53 +3989,34 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [[notification object] selectedRow];
 
 - (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];
 
         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];
         [list_ setShouldHideHeaderInShortLists:NO];
         [list_ setDataSource:self];
         //[list_ setSectionListStyle:1];


@@ -2686,7 +4024,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         UITableColumn *column = [[[UITableColumn alloc]
             initWithTitle:@"Name"
             identifier:@"name"
         UITableColumn *column = [[[UITableColumn alloc]
             initWithTitle:@"Name"
             identifier:@"name"

-            width:frame.size.width
+            width:[self frame].size.width

         ] autorelease];
 
         UITable *table = [list_ table];
         ] autorelease];
 
         UITable *table = [list_ table];


@@ -2695,505 +4033,632 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [table setDelegate:self];
         [table setReusesTableCells:YES];
 
         [table setDelegate:self];
         [table setReusesTableCells:YES];
 

-        [self pushView:list_ withTitle:@"Changes" backButtonTitle:nil rightButton:nil];
+        [self reloadData];

     } return self;
 }
 
     } return self;
 }
 

-- (void) setPackages:(NSArray *)packages {
+- (void) reloadData {
+    NSArray *packages = [database_ packages];
+

     [packages_ removeAllObjects];
     [packages_ removeAllObjects];

+    [sections_ removeAllObjects];
+

     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
     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 upgradableAndEssential:NO])

             [packages_ addObject:package];
     }
 
     [packages_ sortUsingSelector:@selector(compareForChanges:)];
 
             [packages_ addObject:package];
     }
 
     [packages_ sortUsingSelector:@selector(compareForChanges:)];
 

-    [sections_ removeAllObjects];
-

     Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades" row:0] autorelease];
     Section *section = nil;
 
     Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades" row:0] 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];
     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];
 
             NSDate *seen = [package seen];
 

-            CFLocaleRef locale = CFLocaleCopyCurrent();
-            CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
-            CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
+            NSString *name;

 
 

-            NSString *name = (NSString *) formatted;
+            if (seen == nil)
+                name = [@"n/a ?" retain];
+            else {
+                name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
+            }

 
 

-            if (section == nil || ![[section name] isEqual:name]) {
+            if (section == nil || ![[section name] isEqualToString:name]) {

                 section = [[[Section alloc] initWithName:name row:offset] autorelease];
                 [sections_ addObject:section];
             }
 
                 section = [[[Section alloc] initWithName:name row:offset] autorelease];
                 [sections_ addObject:section];
             }
 

-            [section addPackage:package];
-
-            CFRelease(formatter);
-            CFRelease(formatted);
-            CFRelease(locale);
+            [name release];
+            [section addToCount];

         }
     }
 
         }
     }
 

-    count_ = [[upgradable packages] count];
-    if (count_ != 0)
+    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];
         [sections_ insertObject:upgradable atIndex:0];
 
     [list_ reloadData];

+    [self reloadButtons];
+}

 
 

-    if (npackage != nil)
-        [view_ setPackage:npackage];
-    else if (package_ != nil)
-        [self popViews:1];
-
-    [self _resetView];
-    [self setPrompt];
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];

 }
 
 }
 

-- (void) _resetView {
-    if ([views_ count] == 1)
-        [navbar_ showButtonsWithLeftTitle:(count_ == 0 ? nil : @"Upgrade All") rightTitle:nil];
+- (NSString *) leftButtonTitle {
+    return [(CYBook *)book_ updating] ? nil : @"Refresh";

 }
 
 }
 

-- (size_t) count {
-    return count_;
+- (NSString *) rightButtonTitle {
+    return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade All (%u)", upgrades_];

 }
 
 }
 

-- (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
-    [super setDelegate:delegate];
+- (NSString *) title {
+    return @"Changes";

 }
 
 @end
 /* }}} */
 /* Manage View {{{ */
 }
 
 @end
 /* }}} */
 /* Manage View {{{ */

-@interface ManageView : ResetView <
-    PackageTableDelegate
-> {
-    PackageTable *table_;
-    PackageView *view_;
-    NSString *package_;
+@interface ManageView : PackageTable {
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+
+@end
+
+@implementation ManageView
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super
+        initWithBook:book
+        database:database
+        title:nil
+        filter:@selector(isInstalledInSection:)
+        with:nil
+    ]) != nil) {
+    } return self;
+}
+
+- (NSString *) title {
+    return @"Installed Packages";

 }
 
 }
 

-- (void) dealloc;
+- (NSString *) backButtonTitle {
+    return @"All Packages";
+}

 
 

-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
+@end
+/* }}} */
+/* Search View {{{ */
+@protocol SearchViewDelegate
+- (void) showKeyboard:(BOOL)show;
+@end

 
 

-- (void) packageTable:(id)table packageSelected:(Package *)package;
+@interface SearchView : RVPage {
+    UIView *accessory_;
+    UISearchField *field_;
+    UITransitionView *transition_;
+    PackageTable *table_;
+    UIPreferencesTable *advanced_;
+    UIView *dimmed_;
+    bool flipped_;
+    bool reload_;
+}

 
 

-- (id) initWithFrame:(CGRect)frame;
-- (void) setPackages:(NSArray *)packages;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) reloadData;

 
 

-- (void) setDelegate:(id)delegate;

 @end
 
 @end
 

-@implementation ManageView
+@implementation SearchView

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

+#ifndef __OBJC2__
+    [[field_ textTraits] setEditingDelegate:nil];
+#endif
+    [field_ setDelegate:nil];
+
+    [accessory_ release];
+    [field_ release];
+    [transition_ release];

     [table_ release];
     [table_ release];

-    if (view_ != nil)
-        [view_ release];
-    if (package_ != nil)
-        [package_ release];
+    [advanced_ release];
+    [dimmed_ release];

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

-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    if (button == 0) {
-        [[view_ package] remove];
-        [delegate_ resolve];
-        [delegate_ perform];
+- (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);

     }
 }
 
     }
 }
 

-- (void) packageTable:(id)table packageSelected:(Package *)package {
-    if (package == nil) {
-        [package_ release];
-        package_ = nil;
+- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
+    switch (group) {
+        case 0: return 0;

 
 

-        [view_ release];
-        view_ = nil;
-    } else {
-        _assert(package_ == nil);
-        _assert(view_ == nil);
+        default: _assert(false);
+    }
+}

 
 

-        package_ = [[package name] retain];
+- (void) _showKeyboard:(BOOL)show {
+    CGSize keysize = [UIKeyboard defaultSize];
+    CGRect keydown = [book_ pageBounds];
+    CGRect keyup = keydown;
+    keyup.size.height -= keysize.height - ButtonBarHeight_;

 
 

-        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
-        [view_ setDelegate:delegate_];
+    float delay = KeyboardTime_ * ButtonBarHeight_ / keysize.height;

 
 

-        [view_ setPackage:package];
+    UIFrameAnimation *animation = [[[UIFrameAnimation alloc] initWithTarget:[table_ list]] autorelease];
+    [animation setSignificantRectFields:8];

 
 

-        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:@"Uninstall"];
+    if (show) {
+        [animation setStartFrame:keydown];
+        [animation setEndFrame:keyup];
+    } else {
+        [animation setStartFrame:keyup];
+        [animation setEndFrame:keydown];

     }
     }

+
+    UIAnimator *animator = [UIAnimator sharedAnimator];
+
+    [animator
+        addAnimations:[NSArray arrayWithObjects:animation, nil]
+        withDuration:(KeyboardTime_ - delay)
+        start:!show
+    ];
+
+    if (show)
+        [animator performSelector:@selector(startAnimation:) withObject:animation afterDelay:delay];
+
+    [delegate_ showKeyboard:show];

 }
 
 }
 

-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        table_ = [[PackageTable alloc] initWithFrame:[transition_ bounds] versioner:@selector(latest)];
-        [table_ setDelegate:self];
+- (void) textFieldDidBecomeFirstResponder:(UITextField *)field {
+    [self _showKeyboard:YES];
+}

 
 

-        [self pushView:table_ withTitle:@"Uninstall" backButtonTitle:@"Packages" rightButton:nil];
-    } return self;
+- (void) textFieldDidResignFirstResponder:(UITextField *)field {
+    [self _showKeyboard:NO];

 }
 
 }
 

-- (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) keyboardInputChanged:(UIFieldEditor *)editor {
+    if (reload_) {
+        NSString *text([field_ text]);
+        [field_ setClearButtonStyle:(text == nil || [text length] == 0 ? 0 : 2)];
+        [self reloadData];
+        reload_ = false;

     }
     }

+}

 
 

-    [local sortUsingSelector:@selector(compareByName:)];
+- (void) textFieldClearButtonPressed:(UITextField *)field {
+    reload_ = true;
+}
+
+- (void) keyboardInputShouldDelete:(id)input {
+    reload_ = true;
+}

 
 

-    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;
+- (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;

     }
     }

+}

 
 

-    [table_ setPackages:local];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        CGRect pageBounds = [book_ pageBounds];

 
 

-    if (npackage != nil)
-        [view_ setPackage:npackage];
-    else if (package_ != nil)
-        [self popViews:1];
+        /*UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:pageBounds] autorelease];
+        [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
+        [self addSubview:pinstripe];*/

 
 

-    [self setPrompt];
-}
+        transition_ = [[UITransitionView alloc] initWithFrame:pageBounds];
+        [self addSubview:transition_];

 
 

-- (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
-    [super setDelegate:delegate];
+        advanced_ = [[UIPreferencesTable alloc] initWithFrame:pageBounds];
+
+        [advanced_ setReusesTableCells:YES];
+        [advanced_ setDataSource:self];
+        [advanced_ reloadData];
+
+        dimmed_ = [[UIView alloc] initWithFrame:pageBounds];
+        CGColor dimmed(space_, 0, 0, 0, 0.5);
+        [dimmed_ setBackgroundColor:dimmed];
+
+        table_ = [[PackageTable alloc]
+            initWithBook:book
+            database:database
+            title:nil
+            filter:@selector(isSearchedForBy:)
+            with:nil
+        ];
+
+        [table_ setShouldHideHeaderInShortLists:NO];
+        [transition_ transition:0 toView:table_];
+
+        CGRect cnfrect = {{1, 38}, {17, 18}};
+
+        CGRect area;
+        area.origin.x = cnfrect.size.width + 15;
+        area.origin.y = 30;
+        area.size.width = [self bounds].size.width - area.origin.x - 18;
+        area.size.height = [UISearchField defaultHeight];
+
+        field_ = [[UISearchField alloc] initWithFrame:area];
+
+        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+        [field_ setFont:font];
+        CFRelease(font);
+
+        [field_ setPlaceholder:@"Package Names & Descriptions"];
+        [field_ setPaddingTop:5];
+        [field_ setDelegate:self];
+
+#ifndef __OBJC2__
+        UITextTraits *traits = [field_ textTraits];
+        [traits setEditingDelegate:self];
+        [traits setReturnKeyType:6];
+        [traits setAutoCapsType:0];
+        [traits setAutoCorrectionType:1];
+#endif
+
+        accessory_ = [[UIView alloc] initWithFrame:CGRectMake(0, 6, 6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height + 30)];
+        [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];
+    } return self;

 }
 
 }
 

-@end
-/* }}} */
-/* Search View {{{ */
-@protocol SearchViewDelegate
-- (void) showKeyboard:(BOOL)show;
-@end
+- (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
+}

 
 

-@interface SearchView : ResetView <
-    PackageTableDelegate
-> {
-    NSMutableArray *packages_;
-    UIView *accessory_;
-    UISearchField *field_;
-    PackageTable *table_;
-    PackageView *view_;
-    NSString *package_;
+- (void) configurePushed {
+    [field_ resignFirstResponder];
+    [self flipPage];

 }
 
 }
 

-- (void) dealloc;
+- (void) resetViewAnimated:(BOOL)animated {
+    if (flipped_)
+        [self flipPage];
+    [table_ resetViewAnimated:animated];
+}

 
 

-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-- (void) packageTable:(id)table packageSelected:(Package *)package;
+- (void) reloadData {
+    if (flipped_)
+        [self flipPage];
+    [table_ setObject:[field_ text]];
+    [table_ reloadData];
+    [table_ resetCursor];
+}

 
 

-- (void) textFieldDidBecomeFirstResponder:(UITextField *)field;
-- (void) textFieldDidResignFirstResponder:(UITextField *)field;
+- (UIView *) accessoryView {
+    return accessory_;
+}

 
 

-- (void) keyboardInputChanged:(UIFieldEditor *)editor;
-- (BOOL) keyboardInput:(id)input shouldInsertText:(NSString *)text isMarkedText:(int)marked;
+- (NSString *) title {
+    return nil;
+}

 
 

-- (id) initWithFrame:(CGRect)frame;
-- (void) setPackages:(NSArray *)packages;
+- (NSString *) backButtonTitle {
+    return @"Search";
+}

 
 

-- (void) setDelegate:(id)delegate;
-- (void) resetPackage:(Package *)package;
-- (void) searchPackages;
+- (void) setDelegate:(id)delegate {
+    [table_ setDelegate:delegate];
+    [super setDelegate:delegate];
+}

 
 @end
 
 @end

+/* }}} */

 
 

-@implementation SearchView
+@implementation CYBook

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

-    [packages_ release];
-    [accessory_ release];
-    [field_ release];
-    [table_ release];
-    if (view_ != nil)
-        [view_ release];
-    if (package_ != nil)
-        [package_ release];
+    [overlay_ release];
+    [indicator_ release];
+    [prompt_ release];
+    [progress_ release];

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

-- (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];
-    }
+- (NSString *) getTitleForPage:(RVPage *)page {
+    return Simplify([super getTitleForPage:page]);

 }
 
 }
 

-- (void) packageTable:(id)table packageSelected:(Package *)package {
-    if (package == nil) {
-        [navbar_ setAccessoryView:accessory_ animate:(resetting_ ? NO : YES) goingBack:YES];
+- (BOOL) updating {
+    return updating_;
+}

 
 

-        [package_ release];
-        package_ = nil;
+- (void) update {
+    [navbar_ setPrompt:@""];
+    [navbar_ addSubview:overlay_];
+    [indicator_ startAnimation];
+    [prompt_ setText:@"Updating Database..."];
+    [progress_ setProgress:0];

 
 

-        [view_ release];
-        view_ = nil;
-    } else {
-        [navbar_ setAccessoryView:nil animate:YES goingBack:NO];
+    updating_ = true;
+
+    [NSThread
+        detachNewThreadSelector:@selector(_update)
+        toTarget:self
+        withObject:nil
+    ];
+}
+
+- (void) _update_ {
+    updating_ = false;

 
 

-        _assert(package_ == nil);
-        _assert(view_ == nil);
+    [overlay_ removeFromSuperview];
+    [indicator_ stopAnimation];
+    [delegate_ reloadData];

 
 

-        package_ = [[package name] retain];
+    [self setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
+}

 
 

-        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
-        [view_ setDelegate:delegate_];
+- (id) initWithFrame:(CGRect)frame database:(Database *)database {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        database_ = database;

 
 

-        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:nil];
-        [self resetPackage:package];
-    }
-}
+        if (Advanced_)
+            [navbar_ setBarStyle:1];

 
 

-- (void) textFieldDidBecomeFirstResponder:(UITextField *)field {
-    [delegate_ showKeyboard:YES];
-    [table_ setEnabled:NO];
+        CGRect ovrrect = [navbar_ bounds];
+        ovrrect.size.height = ([UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height)
+#ifdef __OBJC2__
+            - 4
+#endif
+        ;

 
 

-    /*CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-    CGColor dimmed(alpha, 0, 0, 0, 0.5);
-    [editor_ setBackgroundColor:dimmed];
-    CGColorSpaceRelease(space);*/
-}
+        overlay_ = [[UIView alloc] initWithFrame:ovrrect];

 
 

-- (void) textFieldDidResignFirstResponder:(UITextField *)field {
-    [table_ setEnabled:YES];
-    [delegate_ showKeyboard:NO];
-}
+        UIProgressIndicatorStyle style = Advanced_ ?
+            kUIProgressIndicatorStyleSmallWhite :
+            kUIProgressIndicatorStyleSmallBlack;

 
 

-- (void) keyboardInputChanged:(UIFieldEditor *)editor {
-    NSString *text([field_ text]);
-    [field_ setClearButtonStyle:(text == nil || [text length] == 0 ? 0 : 2)];
-}
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
+        unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
+        CGRect indrect = {{indoffset, indoffset}, indsize};

 
 

-- (BOOL) keyboardInput:(id)input shouldInsertText:(NSString *)text isMarkedText:(int)marked {
-    if ([text length] != 1 || [text characterAtIndex:0] != '\n')
-        return YES;
+        indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
+        [indicator_ setStyle:style];
+        [overlay_ addSubview:indicator_];

 
 

-    [self searchPackages];
-    [field_ resignFirstResponder];
-    return NO;
-}
+        CGSize prmsize = {200, indsize.width};

 
 

-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+        CGRect prmrect = {{
+            indoffset * 2 + indsize.width,
+            (ovrrect.size.height - prmsize.height) / 2
+        }, prmsize};

 
 

-        table_ = [[PackageTable alloc] initWithFrame:[transition_ bounds] versioner:@selector(latest)];
-        [table_ setDelegate:self];
+        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12);

 
 

-        CGRect area = [self bounds];
-        area.origin.y = 30;
-        area.origin.x = 0;
-        area.size.width -= 12;
-        area.size.height = [UISearchField defaultHeight];
+        prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];

 
 

-        field_ = [[UISearchField alloc] initWithFrame:area];
+        [prompt_ setColor:(Advanced_ ? White_ : Blueish_)];
+        [prompt_ setBackgroundColor:Clear_];
+        [prompt_ setFont:font];

 
 

-        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
-        [field_ setFont:font];

         CFRelease(font);
 
         CFRelease(font);
 

-        [field_ setPlaceholder:@"Package Names & Descriptions"];
-        [field_ setPaddingTop:5];
-        [field_ setDelegate:self];
-
-        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};

 
 

-        [navbar_ setAccessoryView:accessory_];
-        [self pushView:table_ withTitle:nil backButtonTitle:@"Search" rightButton:nil];
+        CGRect prgrect = {{
+            ovrrect.size.width - prgsize.width - 10,
+            (ovrrect.size.height - prgsize.height) / 2
+        } , prgsize};

 
 

-        /* XXX: for the love of god just fix this */
-        [navbar_ removeFromSuperview];
-        [reload_ removeFromSuperview];
-        [configure_ removeFromSuperview];
-        [self addSubview:navbar_];
-        [self addSubview:reload_];
-        [self addSubview:configure_];
+        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
+        [progress_ setStyle:0];
+        [overlay_ addSubview:progress_];

     } return self;
 }
 
     } return self;
 }
 

-- (void) setPackages:(NSArray *)packages {
-    [packages_ removeAllObjects];
-    [packages_ addObjectsFromArray:packages];
-    [packages_ sortUsingSelector:@selector(compareByName:)];
+- (void) _update {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

 
 

-    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;
-    }
+    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
+    ];
+
+    [pool release];
+}

 
 

-    [self setPrompt];
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];

 }
 
 }
 

-- (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
-    [super setDelegate:delegate];
+- (void) setProgressTitle:(NSString *)title {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressTitle:)
+        withObject:title
+        waitUntilDone:YES
+    ];

 }
 
 }
 

-- (void) resetPackage:(Package *)package {
-    [view_ setPackage:package];
-    NSString *right = [package installed] == nil ? @"Install" : @"Uninstall";
-    [navbar_ showButtonsWithLeftTitle:nil rightTitle:right];
+- (void) setProgressPercent:(float)percent {

 }
 
 }
 

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

 
 

-    NSMutableArray *packages([NSMutableArray arrayWithCapacity:16]);
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    [sheet dismiss];
+}

 
 

-    for (size_t offset(0), count([packages_ count]); offset != count; ++offset) {
-        Package *package = [packages_ objectAtIndex:offset];
-        if ([package matches:text])
-            [packages addObject:package];
-    }
+- (void) _setProgressTitle:(NSString *)title {
+    [prompt_ setText:[title stringByAppendingString:@"..."]];
+}

 
 

-    [table_ setPackages:packages];
-    [[table_ table] scrollPointVisibleAtTopLeft:CGPointMake(0, 0) animated:NO];
+- (void) _addProgressOutput:(NSString *)output {

 }
 
 @end
 }
 
 @end

-/* }}} */

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

-    SearchViewDelegate
+    SearchViewDelegate,
+    CydiaDelegate

 > {
     UIWindow *window_;
 > {
     UIWindow *window_;

+

     UIView *underlay_;
     UIView *overlay_;
     UIView *underlay_;
     UIView *overlay_;

-    UITransitionView *transition_;
+    CYBook *book_;

     UIButtonBar *buttonbar_;
 
     ConfirmationView *confirm_;
 
     UIButtonBar *buttonbar_;
 
     ConfirmationView *confirm_;
 

+    NSMutableArray *essential_;
+    NSMutableArray *broken_;
+

     Database *database_;
     ProgressView *progress_;
 
     Database *database_;
     ProgressView *progress_;
 

-    UIView *featured_;
-    UINavigationBar *navbar_;
-    UIScroller *scroller_;
-    UIWebView *webview_;
-    NSURL *url_;
-    UIProgressIndicator *indicator_;
+    unsigned tag_;
+
+    UIKeyboard *keyboard_;

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

-
-    bool restart_;
-    unsigned tag_;
-
-    UIKeyboard *keyboard_;

 }
 
 }
 

-- (void) loadNews;
-- (void) reloadData:(BOOL)reset;
-- (void) setPrompt;
-
-- (void) resolve;
-- (void) perform;
-- (void) upgrade;
-- (void) update;
-
-- (void) cancel;
-- (void) confirm;
-
-- (void) progressViewIsComplete:(ProgressView *)progress;
-
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
-- (void) buttonBarItemTapped:(id)sender;
-
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old;
-
-- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame;
-
-- (void) applicationWillSuspend;
-- (void) applicationDidFinishLaunching:(id)unused;

 @end
 
 @implementation Cydia
 @end
 
 @implementation Cydia

-#include "internals.h"

 
 

-- (void) loadNews {
-    NSMutableURLRequest *request = [NSMutableURLRequest
-        requestWithURL:url_
-        cachePolicy:NSURLRequestReloadIgnoringCacheData
-        timeoutInterval:30.0
-    ];
+- (void) _loaded {
+    if ([broken_ count] != 0) {
+        int count = [broken_ count];
+
+        UIAlertSheet *sheet = [[[UIAlertSheet 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];

 
 

-    [request addValue:[NSString stringWithCString:Machine_] forHTTPHeaderField:@"X-Machine"];
-    [request addValue:[NSString stringWithCString:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];
+        [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];
+
+        UIAlertSheet *sheet = [[[UIAlertSheet 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];

 
 

-    [webview_ loadRequest:request];
+        [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) reloadData:(BOOL)reset {
-    [database_ reloadData];
+- (void) _reloadData {
+    /*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
+    [hud setText:@"Reloading Data"];
+    [overlay_ addSubview:hud];
+    [hud show:YES];*/

 
 

-    size_t count = 16;
+    [database_ reloadData];

 
     if (Packages_ == nil) {
 
     if (Packages_ == nil) {

-        Packages_ = [[NSMutableDictionary alloc] initWithCapacity:count];
+        Packages_ = [[NSMutableDictionary alloc] initWithCapacity:128];

         [Metadata_ setObject:Packages_ forKey:@"Packages"];
     }
 
         [Metadata_ setObject:Packages_ forKey:@"Packages"];
     }
 

-    now_ = [NSDate date];
+    size_t changes(0);

 
 

-    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];
+    [essential_ removeAllObjects];
+    [broken_ removeAllObjects];

 
 

-    [install_ setPackages:packages];
-    [changes_ setPackages:packages];
-    [manage_ setPackages:packages];
-    [search_ setPackages:packages];
+    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;
+        }
+    }

 
 

-    if (size_t count = [changes_ count]) {
-        NSString *badge([[NSNumber numberWithInt:count] stringValue]);
+    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];
         [buttonbar_ setBadgeValue:badge forButton:3];
         if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
             [buttonbar_ setBadgeAnimated:YES forButton:3];


@@ -3205,11 +4670,40 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [self removeApplicationBadge];
     }
 
         [self removeApplicationBadge];
     }
 

-    _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
+    if (Changed_) {
+        _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
+        Changed_ = false;
+    }
+
+    /* XXX: this is just stupid */
+    if (tag_ != 2)
+        [install_ reloadData];
+    if (tag_ != 3)
+        [changes_ reloadData];
+    if (tag_ != 4)
+        [manage_ reloadData];
+    if (tag_ != 5)
+        [search_ reloadData];
+
+    [book_ reloadData];
+
+    if ([packages count] == 0);
+    else if (Loaded_)
+        [self _loaded];
+    else {
+        Loaded_ = YES;
+        [book_ update];
+    }
+
+    /*[hud show:NO];
+    [hud removeFromSuperview];*/

 }
 
 }
 

-- (void) setPrompt {
-    [navbar_ setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
+- (void) reloadData {
+    @synchronized (self) {
+        if (confirm_ == nil)
+            [self _reloadData];
+    }

 }
 
 - (void) resolve {
 }
 
 - (void) resolve {


@@ -3222,23 +4716,68 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (void) perform {
     [database_ prepare];
 
 - (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]];
+        }
+
+        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+            initWithTitle:[NSString stringWithFormat:@"%d Broken Packages", [database_ cache]->BrokenCount()]
+            buttons:[NSArray arrayWithObjects:@"Okay", nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"broken"
+        ] autorelease];
+
+        [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 {
 }
 
 - (void) cancel {

-    [self reloadData:NO];
-    [confirm_ release];
-    confirm_ = nil;
+    @synchronized (self) {
+        [confirm_ release];
+        confirm_ = nil;
+        [self _reloadData];
+    }

 }
 
 - (void) confirm {
     [overlay_ removeFromSuperview];
 }
 
 - (void) confirm {
     [overlay_ removeFromSuperview];

-    restart_ = true;
+    reload_ = true;

 
     [progress_
         detachNewThreadSelector:@selector(perform)
 
     [progress_
         detachNewThreadSelector:@selector(perform)


@@ -3264,111 +4803,127 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     ];
 }
 
     ];
 }
 

-- (void) update {
-    [progress_
-        detachNewThreadSelector:@selector(update)
-        toTarget:database_
-        withObject:nil
-        title:@"Refreshing Sources..."
-    ];
-}
-

 - (void) progressViewIsComplete:(ProgressView *)progress {
 - (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;
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    NSString *context = [sheet context];
+    if ([context isEqualToString:@"fixhalf"])
+        switch (button) {
+            case 1:
+                @synchronized (self) {
+                    for (int i = 0, e = [broken_ count]; i != e; ++i) {
+                        Package *broken = [broken_ objectAtIndex:i];
+                        [broken remove];
+
+                        NSString *id = [broken id];
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]);
+                    }
+
+                    [self resolve];
+                    [self perform];
+                }
+            break;

 
 

-        case 1:
-            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-                initWithTitle:@"About Cydia Packager"
-                buttons:[NSArray arrayWithObjects:@"Close", nil]
-                defaultButtonIndex:0
-                delegate:self
-                context:self
-            ] autorelease];
+            case 2:
+                [broken_ removeAllObjects];
+                [self _loaded];
+            break;

 
 

-            [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"
-            ];
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"upgrade"])
+        switch (button) {
+            case 1:
+                @synchronized (self) {
+                    for (int i = 0, e = [essential_ count]; i != e; ++i) {
+                        Package *essential = [essential_ objectAtIndex:i];
+                        [essential install];
+                    }
+
+                    [self resolve];
+                    [self perform];
+                }
+            break;

 
 

-            [sheet presentSheetFromButtonBar:buttonbar_];
-        break;
-    }
-}
+            case 2:
+                Ignored_ = YES;
+            break;
+
+            default:
+                _assert(false);
+        }

 
 

-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {

     [sheet dismiss];
 }
 
     [sheet dismiss];
 }
 

+- (void) setPage:(RVPage *)page {
+    [page resetViewAnimated:NO];
+    [page setDelegate:self];
+    [book_ setPage:page];
+}
+
+- (RVPage *) _setHomePage {
+    BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+    [self setPage:browser];
+    [browser loadURL:[NSURL URLWithString:@"http://cydia.saurik.com/"]];
+    return browser;
+}
+

 - (void) buttonBarItemTapped:(id)sender {
 - (void) buttonBarItemTapped:(id)sender {

-    UIView *view;

     unsigned tag = [sender tag];
     unsigned tag = [sender tag];

+    if (tag == tag_) {
+        [book_ resetViewAnimated:YES];
+        return;
+    }

 
     switch (tag) {
 
     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;
     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 {
 }
 
 - (void) applicationWillSuspend {

-    if (restart_)
-        system("launchctl stop com.apple.SpringBoard");

     [super applicationWillSuspend];
     [super applicationWillSuspend];

+
+    [database_ clean];
+
+    if (reload_) {
+        pid_t pid = ExecFork();
+        if (pid == 0) {
+            sleep(1);
+            if (pid_t child = fork())
+                waitpid(child, NULL, 0);
+            else {
+                execlp("launchctl", "launchctl", "unload", SpringBoard_, NULL);
+                exit(0);
+            }
+            execlp("launchctl", "launchctl", "load", SpringBoard_, NULL);
+            exit(0);
+        }
+    }

 }
 
 - (void) applicationDidFinishLaunching:(id)unused {
 }
 
 - (void) applicationDidFinishLaunching:(id)unused {


@@ -3376,9 +4931,11 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     _assert(pkgInitSystem(*_config, _system));
 
     confirm_ = nil;
     _assert(pkgInitSystem(*_config, _system));
 
     confirm_ = nil;

-    restart_ = false;

     tag_ = 1;
 
     tag_ = 1;
 

+    essential_ = [[NSMutableArray alloc] initWithCapacity:4];
+    broken_ = [[NSMutableArray alloc] initWithCapacity:4];
+

     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     window_ = [[UIWindow alloc] initWithContentRect:screenrect];
 
     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     window_ = [[UIWindow alloc] initWithContentRect:screenrect];
 


@@ -3386,7 +4943,9 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [window_ makeKey: self];
     [window_ _setHidden: NO];
 
     [window_ makeKey: self];
     [window_ _setHidden: NO];
 

-    progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] delegate:self];
+    database_ = [[Database alloc] init];
+    progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
+    [database_ setDelegate:progress_];

     [window_ setContentView:progress_];
 
     underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];
     [window_ setContentView:progress_];
 
     underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];


@@ -3397,70 +4956,22 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     if (!bootstrap_)
         [underlay_ addSubview:overlay_];
 
     if (!bootstrap_)
         [underlay_ addSubview:overlay_];
 

-    transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
+    book_ = [[CYBook alloc] initWithFrame:CGRectMake(

         0, 0, screenrect.size.width, screenrect.size.height - 48
         0, 0, screenrect.size.width, screenrect.size.height - 48

-    )];
-
-    [overlay_ addSubview:transition_];
-
-    featured_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
-
-    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"];
+    ) database:database_];

 
 

-    UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Featured"] autorelease];
-    [navbar_ pushNavigationItem:navitem];
+    [book_ setDelegate:self];

 
 

-    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,
 
     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,
             [NSNumber numberWithInt:1], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,

-            @"Featured", kUIButtonBarButtonTitle,
+            @"Home", kUIButtonBarButtonTitle,

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


@@ -3490,7 +5001,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             @"manage-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:4], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"manage-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:4], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,

-            @"Uninstall", kUIButtonBarButtonTitle,
+            @"Manage", kUIButtonBarButtonTitle,

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


@@ -3508,8 +5019,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     buttonbar_ = [[UIButtonBar alloc]
         initInView:overlay_
         withFrame:CGRectMake(
     buttonbar_ = [[UIButtonBar 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
     ];
         )
         withItemList:buttonitems
     ];


@@ -3524,62 +5035,64 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
     for (int i = 0; i != 5; ++i)
         [[buttonbar_ viewWithTag:(i + 1)] setFrame:CGRectMake(
 
     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];
         )];
 
     [buttonbar_ showSelectionForButton:1];

-    [transition_ transition:0 toView:featured_];
-

     [overlay_ addSubview:buttonbar_];
 
     [UIKeyboard initImplementationNow];
     [overlay_ addSubview:buttonbar_];
 
     [UIKeyboard initImplementationNow];

-
-    CGRect edtrect = [overlay_ bounds];
-    edtrect.origin.y += navsize.height;
-    edtrect.size.height -= navsize.height;
-

     CGSize keysize = [UIKeyboard defaultSize];
     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];
     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] initWithFrame:[transition_ bounds]];
-    [install_ setDelegate:self];
-
-    changes_ = [[ChangesView alloc] initWithFrame:[transition_ bounds]];
-    [changes_ setDelegate:self];
-
-    manage_ = [[ManageView alloc] initWithFrame:[transition_ bounds]];
-    [manage_ setDelegate:self];
-
-    search_ = [[SearchView alloc] initWithFrame:[transition_ bounds]];
-    [search_ setDelegate:self];
-
-    [self reloadData:NO];
-
-    Package *package([database_ packageWithName:@"cydia"]);
-    NSString *application = package == nil ? @"Cydia" : [NSString stringWithFormat:@"Cydia/%@", [package installed]];
-
-    WebView *webview = [webview_ webView];
-    [webview setApplicationNameForUserAgent:application];
-    [webview setFrameLoadDelegate:self];
-
-    url_ = [NSURL URLWithString:@"http://cydia.saurik.com/"];
-    [self loadNews];
+    install_ = [[InstallView alloc] initWithBook:book_ database:database_];
+    changes_ = [[ChangesView alloc] initWithBook:book_ database:database_];
+    manage_ = [[ManageView alloc] initWithBook:book_ database:database_];
+    search_ = [[SearchView alloc] initWithBook:book_ database:database_];

 
     [progress_ resetView];
 
     [progress_ resetView];

+    [self reloadData];

 
     if (bootstrap_)
         [self bootstrap];
 
     if (bootstrap_)
         [self bootstrap];

+    else
+        [self _setHomePage];

 }
 
 - (void) showKeyboard:(BOOL)show {
 }
 
 - (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:(UIAlertSheet *)alert {
+    if (Advanced_)
+        [alert presentSheetFromButtonBar:buttonbar_];

     else
     else

-        [keyboard_ removeFromSuperview];
+        [alert presentSheetInView:overlay_];

 }
 
 @end
 }
 
 @end


@@ -3632,16 +5145,27 @@ id Alloc_(id self, SEL selector) {
     return object;
 }*/
 
     return object;
 }*/
 

+/*IMP dealloc_;
+id Dealloc_(id self, SEL selector) {
+    id object = dealloc_(self, selector);
+    fprintf(stderr, "[%s]D-%p\n", self->isa->name, object);
+    return object;
+}*/
+

 int main(int argc, char *argv[]) {
 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;
 
 
     bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0;
 

+    Home_ = NSHomeDirectory();
+
+    {
+        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);
 
     setuid(0);
     setgid(0);
 


@@ -3649,7 +5173,20 @@ int main(int argc, char *argv[]) {
     alloc_ = alloc->method_imp;
     alloc->method_imp = (IMP) &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);
 
     size_t size;
     sysctlbyname("hw.machine", NULL, &size, NULL, 0);


@@ -3667,17 +5204,31 @@ int main(int argc, char *argv[]) {
             IOObjectRelease(service);
         }
 
             IOObjectRelease(service);
         }
 

-    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
         Packages_ = [Metadata_ objectForKey:@"Packages"];
 
 
     if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL)
         Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2];
     else
         Packages_ = [Metadata_ objectForKey:@"Packages"];
 

-    system("dpkg --configure -a");
+    if (access("/User", F_OK) != 0)
+        system("/usr/libexec/cydia/firmware.sh");
+
+    Locale_ = CFLocaleCopyCurrent();
+    space_ = CGColorSpaceCreateDeviceRGB();
+
+    Blueish_.Set(space_, 0x19/255.f, 0x32/255.f, 0x50/255.f, 1.0);
+    Black_.Set(space_, 0.0, 0.0, 0.0, 1.0);
+    Clear_.Set(space_, 0.0, 0.0, 0.0, 0.0);
+    Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);
+    White_.Set(space_, 1.0, 1.0, 1.0, 1.0);
+
+    int value = UIApplicationMain(argc, argv, [Cydia class]);
+
+    CGColorSpaceRelease(space_);
+    CFRelease(Locale_);

 
 

-    UIApplicationMain(argc, argv, [Cydia class]);

     [pool release];
     [pool release];

-    return 0;
+    return value;

 }
 }