* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef __OBJC2__
- #define UITextTraits UITextInputTraits
- #define textTraits textInputTraits
- #define setAutoCapsType setAutocapitalizationType
- #define setAutoCorrectionType setAutocorrectionType
- #define setPreferredKeyboardType setKeyboardType
-#endif
+// XXX: wtf/FastMalloc.h... wtf?
+#define USE_SYSTEM_MALLOC 1
/* #include Directives {{{ */
+#import "UICaboodle.h"
+
+#include <objc/message.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 <WebCore/DOMHTML.h>
-#import "BrowserView.h"
-#import "ResetView.h"
-#import "UICaboodle.h"
+#import <QuartzCore/CALayer.h>
+#import <UIKit/UIKit.h>
-#include <WebKit/WebFrame.h>
-#include <WebKit/WebView.h>
+#include <WebCore/WebCoreThread.h>
+#import <WebKit/WebDefaultUIKitDelegate.h>
+#include <iomanip>
#include <sstream>
#include <string>
#include <apt-pkg/debmetaindex.h>
#include <apt-pkg/error.h>
#include <apt-pkg/init.h>
+#include <apt-pkg/mmap.h>
#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/sha1.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/sptr.h>
+#include <apt-pkg/strutl.h>
+#include <apr-1/apr_pools.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/sysctl.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+
#include <notify.h>
+#include <dlfcn.h>
extern "C" {
#include <mach-o/nlist.h>
#include <errno.h>
#include <pcre.h>
+
+#include <ext/hash_map>
+
+#import "BrowserView.h"
+#import "ResetView.h"
+
+#import "substrate.h"
/* }}} */
-/* iPhoneOS 2.0 Compatibility {{{ */
-#ifdef __OBJC2__
-@interface UICGColor : NSObject {
+//#define _finline __attribute__((force_inline))
+#define _finline inline
+
+struct timeval _ltv;
+bool _itv;
+
+#define _limit(count) do { \
+ static size_t _count(0); \
+ if (++_count == count) \
+ exit(0); \
+} while (false)
+
+/* Profiler {{{ */
+#define _timestamp ({ \
+ struct timeval tv; \
+ gettimeofday(&tv, NULL); \
+ tv.tv_sec * 1000000 + tv.tv_usec; \
+})
+
+typedef std::vector<class ProfileTime *> TimeList;
+TimeList times_;
+
+class ProfileTime {
+ private:
+ const char *name_;
+ uint64_t total_;
+ uint64_t count_;
+
+ public:
+ ProfileTime(const char *name) :
+ name_(name),
+ total_(0)
+ {
+ times_.push_back(this);
+ }
+
+ void AddTime(uint64_t time) {
+ total_ += time;
+ ++count_;
+ }
+
+ void Print() {
+ if (total_ != 0)
+ std::cerr << std::setw(5) << count_ << ", " << std::setw(7) << total_ << " : " << name_ << std::endl;
+ total_ = 0;
+ count_ = 0;
+ }
+};
+
+class ProfileTimer {
+ private:
+ ProfileTime &time_;
+ uint64_t start_;
+
+ public:
+ ProfileTimer(ProfileTime &time) :
+ time_(time),
+ start_(_timestamp)
+ {
+ }
+
+ ~ProfileTimer() {
+ time_.AddTime(_timestamp - start_);
+ }
+};
+
+void PrintTimes() {
+ for (TimeList::const_iterator i(times_.begin()); i != times_.end(); ++i)
+ (*i)->Print();
+ std::cerr << "========" << std::endl;
}
-- (id) initWithCGColor:(CGColorRef)color;
-@end
+#define _profile(name) { \
+ static ProfileTime name(#name); \
+ ProfileTimer _ ## name(name);
+
+#define _end }
+/* }}} */
+/* Objective-C Handle<> {{{ */
+template <typename Type_>
+class _H {
+ typedef _H<Type_> This_;
+
+ private:
+ Type_ *value_;
+
+ _finline void Retain_() {
+ if (value_ != nil)
+ [value_ retain];
+ }
-@interface UIFont {
+ _finline void Clear_() {
+ if (value_ != nil)
+ [value_ release];
+ }
+
+ public:
+ _finline _H(Type_ *value = NULL, bool mended = false) :
+ value_(value)
+ {
+ if (!mended)
+ Retain_();
+ }
+
+ _finline ~_H() {
+ Clear_();
+ }
+
+ _finline This_ &operator =(Type_ *value) {
+ if (value_ != value) {
+ Clear_();
+ value_ = value;
+ Retain_();
+ } return this;
+ }
+};
+/* }}} */
+
+#define _pooled _H<NSAutoreleasePool> _pool([[NSAutoreleasePool alloc] init], true);
+
+void NSLogPoint(const char *fix, const CGPoint &point) {
+ NSLog(@"%s(%g,%g)", fix, point.x, point.y);
}
-+ (id)systemFontOfSize:(float)fp8;
-+ (id)boldSystemFontOfSize:(float)fp8;
-- (UIFont *) fontWithSize:(CGFloat)size;
-@end
+void NSLogRect(const char *fix, const CGRect &rect) {
+ NSLog(@"%s(%g,%g)+(%g,%g)", fix, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
+}
-@interface NSObject (iPhoneOS)
-- (CGColorRef) cgColor;
-- (CGColorRef) CGColor;
-- (void) set;
+@interface NSObject (Cydia)
+- (id) yieldToSelector:(SEL)selector withObject:(id)object;
+- (id) yieldToSelector:(SEL)selector;
@end
-@implementation NSObject (iPhoneOS)
+@implementation NSObject (Cydia)
-- (CGColorRef) cgColor {
- return [self CGColor];
+- (void) doNothing {
}
-- (CGColorRef) CGColor {
- return (CGColorRef) self;
+- (void) _yieldToContext:(NSMutableArray *)context { _pooled
+ SEL selector(reinterpret_cast<SEL>([[context objectAtIndex:0] pointerValue]));
+ id object([[context objectAtIndex:1] nonretainedObjectValue]);
+ volatile bool &stopped(*reinterpret_cast<bool *>([[context objectAtIndex:2] pointerValue]));
+
+ /* XXX: deal with exceptions */
+ id value([self performSelector:selector withObject:object]);
+
+ [context removeAllObjects];
+ if (value != nil)
+ [context addObject:value];
+
+ stopped = true;
+
+ [self
+ performSelectorOnMainThread:@selector(doNothing)
+ withObject:nil
+ waitUntilDone:NO
+ ];
+}
+
+- (id) yieldToSelector:(SEL)selector withObject:(id)object {
+ /*return [self performSelector:selector withObject:object];*/
+
+ volatile bool stopped(false);
+
+ NSMutableArray *context([NSMutableArray arrayWithObjects:
+ [NSValue valueWithPointer:selector],
+ [NSValue valueWithNonretainedObject:object],
+ [NSValue valueWithPointer:const_cast<bool *>(&stopped)],
+ nil]);
+
+ NSThread *thread([[[NSThread alloc]
+ initWithTarget:self
+ selector:@selector(_yieldToContext:)
+ object:context
+ ] autorelease]);
+
+ [thread start];
+
+ NSRunLoop *loop([NSRunLoop currentRunLoop]);
+ NSDate *future([NSDate distantFuture]);
+
+ while (!stopped && [loop runMode:NSDefaultRunLoopMode beforeDate:future]);
+
+ return [context count] == 0 ? nil : [context objectAtIndex:0];
}
-- (void) set {
- [[[[objc_getClass("UICGColor") alloc] initWithCGColor:[self CGColor]] autorelease] set];
+- (id) yieldToSelector:(SEL)selector {
+ return [self yieldToSelector:selector withObject:nil];
}
@end
+/* NSForcedOrderingSearch doesn't work on the iPhone */
+static const NSStringCompareOptions MatchCompareOptions_ = NSLiteralSearch | NSCaseInsensitiveSearch;
+static const NSStringCompareOptions BaseCompareOptions_ = NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch;
+static const NSStringCompareOptions ForcedCompareOptions_ = BaseCompareOptions_;
+static const NSStringCompareOptions LaxCompareOptions_ = BaseCompareOptions_ | NSCaseInsensitiveSearch;
+
+/* iPhoneOS 2.0 Compatibility {{{ */
+#ifdef __OBJC2__
@interface UITextView (iPhoneOS)
- (void) setTextSize:(float)size;
@end
#endif
/* }}} */
-@interface UIApplication (IdleTimer)
-- (void) setIdleTimerDisabled:(char)arg0;
+extern NSString * const kCAFilterNearest;
+
+/* Information Dictionaries {{{ */
+@interface NSMutableArray (Cydia)
+- (void) addInfoDictionary:(NSDictionary *)info;
@end
-#ifdef __OBJC2__
-typedef enum {
- kUIProgressIndicatorStyleMediumWhite = 1,
- kUIProgressIndicatorStyleSmallWhite = 0,
- kUIProgressIndicatorStyleSmallBlack = 4
-} UIProgressIndicatorStyle;
-#else
-typedef enum {
- kUIProgressIndicatorStyleMediumWhite = 0,
- kUIProgressIndicatorStyleSmallWhite = 2,
- kUIProgressIndicatorStyleSmallBlack = 3
-} UIProgressIndicatorStyle;
+@implementation NSMutableArray (Cydia)
+
+- (void) addInfoDictionary:(NSDictionary *)info {
+ [self addObject:info];
+}
+
+@end
+
+@interface NSMutableDictionary (Cydia)
+- (void) addInfoDictionary:(NSDictionary *)info;
+@end
+
+@implementation NSMutableDictionary (Cydia)
+
+- (void) addInfoDictionary:(NSDictionary *)info {
+ NSString *bundle = [info objectForKey:@"CFBundleIdentifier"];
+ [self setObject:info forKey:bundle];
+}
+
+@end
+/* }}} */
+/* Pop Transitions {{{ */
+@interface PopTransitionView : UITransitionView {
+}
+
+@end
+
+@implementation PopTransitionView
+
+- (void) transitionViewDidComplete:(UITransitionView *)view fromView:(UIView *)from toView:(UIView *)to {
+ if (from != nil && to == nil)
+ [self removeFromSuperview];
+}
+
+@end
+
+@implementation UIView (PopUpView)
+
+- (void) popFromSuperviewAnimated:(BOOL)animated {
+ [[self superview] transition:(animated ? UITransitionPushFromTop : UITransitionNone) toView:nil];
+}
+
+- (void) popSubview:(UIView *)view {
+ UITransitionView *transition([[[PopTransitionView alloc] initWithFrame:[self bounds]] autorelease]);
+ [transition setDelegate:transition];
+ [self addSubview:transition];
+
+ UIView *blank = [[[UIView alloc] initWithFrame:[transition bounds]] autorelease];
+ [transition transition:UITransitionNone toView:blank];
+ [transition transition:UITransitionPushFromBottom toView:view];
+}
+
+@end
+/* }}} */
+
+#define lprintf(args...) fprintf(stderr, args)
+
+#define ForRelease 0
+#define ForSaurik (0 && !ForRelease)
+#define LogBrowser (1 && !ForRelease)
+#define ManualRefresh (1 && !ForRelease)
+#define ShowInternals (0 && !ForRelease)
+#define IgnoreInstall (0 && !ForRelease)
+#define RecycleWebViews 0
+#define AlwaysReload (1 && !ForRelease)
+
+#if ForRelease
+#undef _trace
+#define _trace(args...)
+#undef _profile
+#define _profile(name) {
+#undef _end
+#define _end }
+#define PrintTimes() do {} while (false)
#endif
+/* Radix Sort {{{ */
+@interface NSMutableArray (Radix)
+- (void) radixSortUsingSelector:(SEL)selector withObject:(id)object;
+- (void) radixSortUsingFunction:(uint32_t (*)(id, void *))function withArgument:(void *)argument;
+@end
+
+struct RadixItem_ {
+ size_t index;
+ uint32_t key;
+};
+
+static void RadixSort_(NSMutableArray *self, size_t count, struct RadixItem_ *swap) {
+ struct RadixItem_ *lhs(swap), *rhs(swap + count);
+
+ static const size_t width = 32;
+ static const size_t bits = 11;
+ static const size_t slots = 1 << bits;
+ static const size_t passes = (width + (bits - 1)) / bits;
+
+ size_t *hist(new size_t[slots]);
+
+ for (size_t pass(0); pass != passes; ++pass) {
+ memset(hist, 0, sizeof(size_t) * slots);
+
+ for (size_t i(0); i != count; ++i) {
+ uint32_t key(lhs[i].key);
+ key >>= pass * bits;
+ key &= _not(uint32_t) >> width - bits;
+ ++hist[key];
+ }
+
+ size_t offset(0);
+ for (size_t i(0); i != slots; ++i) {
+ size_t local(offset);
+ offset += hist[i];
+ hist[i] = local;
+ }
+
+ for (size_t i(0); i != count; ++i) {
+ uint32_t key(lhs[i].key);
+ key >>= pass * bits;
+ key &= _not(uint32_t) >> width - bits;
+ rhs[hist[key]++] = lhs[i];
+ }
+
+ RadixItem_ *tmp(lhs);
+ lhs = rhs;
+ rhs = tmp;
+ }
+
+ delete [] hist;
+
+ NSMutableArray *values([NSMutableArray arrayWithCapacity:count]);
+ for (size_t i(0); i != count; ++i)
+ [values addObject:[self objectAtIndex:lhs[i].index]];
+ [self setArray:values];
+
+ delete [] swap;
+}
+
+@implementation NSMutableArray (Radix)
+
+- (void) radixSortUsingSelector:(SEL)selector withObject:(id)object {
+ NSInvocation *invocation([NSInvocation invocationWithMethodSignature:[NSMethodSignature signatureWithObjCTypes:"L12@0:4@8"]]);
+ [invocation setSelector:selector];
+ [invocation setArgument:&object atIndex:2];
+
+ size_t count([self count]);
+ struct RadixItem_ *swap(new RadixItem_[count * 2]);
+
+ for (size_t i(0); i != count; ++i) {
+ RadixItem_ &item(swap[i]);
+ item.index = i;
+
+ id object([self objectAtIndex:i]);
+ [invocation setTarget:object];
+
+ [invocation invoke];
+ [invocation getReturnValue:&item.key];
+ }
+
+ RadixSort_(self, count, swap);
+}
+
+- (void) radixSortUsingFunction:(uint32_t (*)(id, void *))function withArgument:(void *)argument {
+ size_t count([self count]);
+ struct RadixItem_ *swap(new RadixItem_[count * 2]);
+
+ for (size_t i(0); i != count; ++i) {
+ RadixItem_ &item(swap[i]);
+ item.index = i;
+
+ id object([self objectAtIndex:i]);
+ item.key = function(object, argument);
+ }
+
+ RadixSort_(self, count, swap);
+}
+
+@end
+/* }}} */
+
+/* Apple Bug Fixes {{{ */
+@implementation UIWebDocumentView (Cydia)
+
+- (void) _setScrollerOffset:(CGPoint)offset {
+ UIScroller *scroller([self _scroller]);
+
+ CGSize size([scroller contentSize]);
+ CGSize bounds([scroller bounds].size);
+
+ CGPoint max;
+ max.x = size.width - bounds.width;
+ max.y = size.height - bounds.height;
+
+ // wtf Apple?!
+ if (max.x < 0)
+ max.x = 0;
+ if (max.y < 0)
+ max.y = 0;
+
+ offset.x = offset.x < 0 ? 0 : offset.x > max.x ? max.x : offset.x;
+ offset.y = offset.y < 0 ? 0 : offset.y > max.y ? max.y : offset.y;
+
+ [scroller setOffset:offset];
+}
+
+@end
+/* }}} */
+
typedef enum {
kUIControlEventMouseDown = 1 << 0,
kUIControlEventMouseMovedInside = 1 << 2, // mouse moved inside control target
kUIControlAllEvents = (kUIControlEventMouseDown | kUIControlEventMouseMovedInside | kUIControlEventMouseMovedOutside | kUIControlEventMouseUpInside | kUIControlEventMouseUpOutside)
} UIControlEventMasks;
+NSUInteger DOMNodeList$countByEnumeratingWithState$objects$count$(DOMNodeList *self, SEL sel, NSFastEnumerationState *state, id *objects, NSUInteger count) {
+ size_t length([self length] - state->state);
+ if (length <= 0)
+ return 0;
+ else if (length > count)
+ length = count;
+ for (size_t i(0); i != length; ++i)
+ objects[i] = [self item:state->state++];
+ state->itemsPtr = objects;
+ state->mutationsPtr = (unsigned long *) self;
+ return length;
+}
+
@interface NSString (UIKit)
- (NSString *) stringByAddingPercentEscapes;
- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;
@end
@interface NSString (Cydia)
++ (NSString *) stringWithUTF8BytesNoCopy:(const char *)bytes length:(int)length;
++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length withZone:(NSZone *)zone inPool:(apr_pool_t *)pool;
+ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length;
- (NSComparisonResult) compareByPath:(NSString *)other;
+- (NSString *) stringByCachingURLWithCurrentCDN;
+- (NSString *) stringByAddingPercentEscapesIncludingReserved;
@end
@implementation NSString (Cydia)
-+ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length {
- char data[length + 1];
++ (NSString *) stringWithUTF8BytesNoCopy:(const char *)bytes length:(int)length {
+ return [[[NSString alloc] initWithBytesNoCopy:const_cast<char *>(bytes) length:length encoding:NSUTF8StringEncoding freeWhenDone:NO] autorelease];
+}
+
++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length withZone:(NSZone *)zone inPool:(apr_pool_t *)pool {
+ char *data(reinterpret_cast<char *>(apr_palloc(pool, length)));
memcpy(data, bytes, length);
- data[length] = '\0';
- return [NSString stringWithUTF8String:data];
+ return [[[NSString allocWithZone:zone] initWithBytesNoCopy:data length:length encoding:NSUTF8StringEncoding freeWhenDone:NO] autorelease];
+}
+
++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length {
+ return [[[NSString alloc] initWithBytes:bytes length:length encoding:NSUTF8StringEncoding] autorelease];
}
- (NSComparisonResult) compareByPath:(NSString *)other {
return result == NSOrderedSame ? value : result;
}
+- (NSString *) stringByCachingURLWithCurrentCDN {
+ return [self
+ stringByReplacingOccurrencesOfString:@"://"
+ withString:@"://ne.edgecastcdn.net/8003A4/"
+ options:0
+ /* XXX: this is somewhat inaccurate */
+ range:NSMakeRange(0, 10)
+ ];
+}
+
+- (NSString *) stringByAddingPercentEscapesIncludingReserved {
+ return [(id)CFURLCreateStringByAddingPercentEscapes(
+ kCFAllocatorDefault,
+ (CFStringRef) self,
+ NULL,
+ CFSTR(";/?:@&=+$,"),
+ kCFStringEncodingUTF8
+ ) autorelease];
+}
+
@end
+static inline NSString *CYLocalizeEx(NSString *key, NSString *value = nil) {
+ return [[NSBundle mainBundle] localizedStringForKey:key value:value table:nil];
+}
+
+#define CYLocalize(key) CYLocalizeEx(@ key)
+
+class CYString {
+ private:
+ char *data_;
+ size_t size_;
+ CFStringRef cache_;
+
+ _finline void clear_() {
+ if (cache_ != nil)
+ CFRelease(cache_);
+ }
+
+ public:
+ _finline bool empty() const {
+ return size_ == 0;
+ }
+
+ _finline size_t size() const {
+ return size_;
+ }
+
+ _finline char *data() const {
+ return data_;
+ }
+
+ _finline void clear() {
+ size_ = 0;
+ clear_();
+ }
+
+ _finline CYString() :
+ data_(0),
+ size_(0),
+ cache_(nil)
+ {
+ }
+
+ _finline ~CYString() {
+ clear_();
+ }
+
+ void operator =(const CYString &rhs) {
+ data_ = rhs.data_;
+ size_ = rhs.size_;
+
+ if (rhs.cache_ == nil)
+ cache_ = NULL;
+ else
+ cache_ = reinterpret_cast<CFStringRef>(CFRetain(rhs.cache_));
+ }
+
+ void set(apr_pool_t *pool, const char *data, size_t size) {
+ if (size == 0)
+ clear();
+ else {
+ clear_();
+
+ char *temp(reinterpret_cast<char *>(apr_palloc(pool, size)));
+ memcpy(temp, data, size);
+ data_ = temp;
+ size_ = size;
+ }
+ }
+
+ _finline void set(apr_pool_t *pool, const char *data) {
+ set(pool, data, data == NULL ? 0 : strlen(data));
+ }
+
+ _finline void set(apr_pool_t *pool, const std::string &rhs) {
+ set(pool, rhs.data(), rhs.size());
+ }
+
+ bool operator ==(const CYString &rhs) const {
+ return size_ == rhs.size_ && memcmp(data_, rhs.data_, size_) == 0;
+ }
+
+ operator id() {
+ if (cache_ == NULL) {
+ if (size_ == 0)
+ return nil;
+ cache_ = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<uint8_t *>(data_), size_, kCFStringEncodingUTF8, NO, kCFAllocatorNull);
+ } return (id) cache_;
+ }
+};
+
+extern "C" {
+ CF_EXPORT CFHashCode CFStringHashNSString(CFStringRef str);
+}
+
+struct NSStringMapHash :
+ std::unary_function<NSString *, size_t>
+{
+ _finline size_t operator ()(NSString *value) const {
+ return CFStringHashNSString((CFStringRef) value);
+ }
+};
+
+struct NSStringMapLess :
+ std::binary_function<NSString *, NSString *, bool>
+{
+ _finline bool operator ()(NSString *lhs, NSString *rhs) const {
+ return [lhs compare:rhs] == NSOrderedAscending;
+ }
+};
+
+struct NSStringMapEqual :
+ std::binary_function<NSString *, NSString *, bool>
+{
+ _finline bool operator ()(NSString *lhs, NSString *rhs) const {
+ return CFStringCompare((CFStringRef) lhs, (CFStringRef) rhs, 0) == kCFCompareEqualTo;
+ //CFEqual((CFTypeRef) lhs, (CFTypeRef) rhs);
+ //[lhs isEqualToString:rhs];
+ }
+};
+
/* Perl-Compatible RegEx {{{ */
class Pcre {
private:
code_ = pcre_compile(regex, 0, &error, &offset, NULL);
if (code_ == NULL) {
- fprintf(stderr, "%d:%s\n", offset, error);
+ lprintf("%d:%s\n", offset, error);
_assert(false);
}
/* Mime Addresses {{{ */
@interface Address : NSObject {
NSString *name_;
- NSString *email_;
+ NSString *address_;
}
- (NSString *) name;
-- (NSString *) email;
+- (NSString *) address;
+
+- (void) setAddress:(NSString *)address;
+ (Address *) addressWithString:(NSString *)string;
- (Address *) initWithString:(NSString *)string;
- (void) dealloc {
[name_ release];
- if (email_ != nil)
- [email_ release];
+ if (address_ != nil)
+ [address_ release];
[super dealloc];
}
return name_;
}
-- (NSString *) email {
- return email_;
+- (NSString *) address {
+ return address_;
+}
+
+- (void) setAddress:(NSString *)address {
+ if (address_ != nil)
+ [address_ autorelease];
+ if (address == nil)
+ address_ = nil;
+ else
+ address_ = [address retain];
}
+ (Address *) addressWithString:(NSString *)string {
return [[[Address alloc] initWithString:string] autorelease];
}
++ (NSArray *) _attributeKeys {
+ return [NSArray arrayWithObjects:@"address", @"name", nil];
+}
+
+- (NSArray *) attributeKeys {
+ return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+ return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
- (Address *) initWithString:(NSString *)string {
if ((self = [super init]) != nil) {
const char *data = [string UTF8String];
size_t size = [string length];
- static Pcre email_r("^\"?(.*)\"? <([^>]*)>$");
+ static Pcre address_r("^\"?(.*)\"? <([^>]*)>$");
- if (email_r(data, size)) {
- name_ = [email_r[1] retain];
- email_ = [email_r[2] retain];
+ if (address_r(data, size)) {
+ name_ = [address_r[1] retain];
+ address_ = [address_r[2] retain];
} else {
- name_ = [[NSString alloc]
- initWithBytes:data
- length:size
- encoding:kCFStringEncodingUTF8
- ];
-
- email_ = nil;
+ name_ = [string retain];
+ address_ = nil;
}
} return self;
}
return color_;
}
};
-
-class GSFont {
- private:
- GSFontRef font_;
-
- public:
- ~GSFont() {
- CFRelease(font_);
- }
-};
-/* }}} */
-/* Right Alignment {{{ */
-@interface UIRightTextLabel : UITextLabel {
- float _savedRightEdgeX;
- BOOL _sizedtofit_flag;
-}
-
-- (void) setFrame:(CGRect)frame;
-- (void) setText:(NSString *)text;
-- (void) realignText;
-@end
-
-@implementation UIRightTextLabel
-
-- (void) setFrame:(CGRect)frame {
- [super setFrame:frame];
- if (_sizedtofit_flag == NO) {
- _savedRightEdgeX = frame.origin.x;
- [self realignText];
- }
-}
-
-- (void) setText:(NSString *)text {
- [super setText:text];
- [self realignText];
-}
-
-- (void) realignText {
- CGRect oldFrame = [self frame];
-
- _sizedtofit_flag = YES;
- [self sizeToFit]; // shrink down size so I can right align it
-
- CGRect newFrame = [self frame];
-
- oldFrame.origin.x = _savedRightEdgeX - newFrame.size.width;
- oldFrame.size.width = newFrame.size.width;
- [super setFrame:oldFrame];
- _sizedtofit_flag = NO;
-}
-
-@end
/* }}} */
extern "C" void UISetColor(CGColorRef color);
static const int PulseInterval_ = 50000;
static const int ButtonBarHeight_ = 48;
static const float KeyboardTime_ = 0.3f;
-static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist";
-#ifndef Cydia_
-#define Cydia_ ""
-#endif
+#define SpringBoard_ "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist"
+#define SandboxTemplate_ "/usr/share/sandbox/SandboxTemplate.sb"
+#define NotifyConfig_ "/etc/notify.conf"
+
+static bool Queuing_;
static CGColor Blue_;
static CGColor Blueish_;
static CGColor Black_;
-static CGColor Clear_;
-static CGColor Red_;
+static CGColor Off_;
static CGColor White_;
static CGColor Gray_;
+static CGColor Green_;
+static CGColor Purple_;
+static CGColor Purplish_;
+static UIColor *InstallingColor_;
+static UIColor *RemovingColor_;
+
+static NSString *App_;
static NSString *Home_;
static BOOL Sounds_Keyboard_;
static BOOL Advanced_;
-//static BOOL Loaded_;
+static BOOL Loaded_;
static BOOL Ignored_;
static UIFont *Font12_;
static UIFont *Font18Bold_;
static UIFont *Font22Bold_;
-const char *Firmware_ = NULL;
-const char *Machine_ = NULL;
-const char *SerialNumber_ = NULL;
-
-unsigned Major_;
-unsigned Minor_;
-unsigned BugFix_;
+static const char *Machine_ = NULL;
+static const NSString *UniqueID_ = nil;
+static const NSString *Build_ = nil;
+static const NSString *Product_ = nil;
+static const NSString *Safari_ = nil;
CFLocaleRef Locale_;
CGColorSpaceRef space_;
-#define FW_LEAST(major, minor, bugfix) \
- (major < Major_ || major == Major_ && \
- (minor < Minor_ || minor == Minor_ && \
- bugfix <= BugFix_))
-
bool bootstrap_;
bool reload_;
-static NSMutableDictionary *SectionMap_;
+static NSDictionary *SectionMap_;
static NSMutableDictionary *Metadata_;
static _transient NSMutableDictionary *Settings_;
static _transient NSString *Role_;
static bool Changed_;
static NSDate *now_;
+#if RecycleWebViews
+static NSMutableArray *Documents_;
+#endif
+
NSString *GetLastUpdate() {
NSDate *update = [Metadata_ objectForKey:@"LastUpdate"];
if (update == nil)
- return @"Never or Unknown";
+ return CYLocalize("NEVER_OR_UNKNOWN");
CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);
return (end - begin) * fraction + begin;
}
+/* XXX: localize this! */
NSString *SizeString(double size) {
+ bool negative = size < 0;
+ if (negative)
+ size = -size;
+
unsigned power = 0;
while (size > 1024) {
size /= 1024;
static const char *powers_[] = {"B", "kB", "MB", "GB"};
- return [NSString stringWithFormat:@"%.1f%s", size, powers_[power]];
+ return [NSString stringWithFormat:@"%s%.1f %s", (negative ? "-" : ""), size, powers_[power]];
}
NSString *StripVersion(NSString *version) {
return version;
}
-static const float TextViewOffset_ = 22;
-
-UITextView *GetTextView(NSString *value, float left, bool html) {
- UITextView *text([[[UITextView alloc] initWithFrame:CGRectMake(left, 3, 310 - left, 1000)] autorelease]);
- [text setEditable:NO];
- [text setTextSize:16];
- /*if (html)
- [text setHTML:value];
- else*/
- [text setText:value];
- [text setEnabled:NO];
-
- [text setBackgroundColor:Clear_];
-
- CGRect frame = [text frame];
- [text setFrame:frame];
- CGRect rect = [text visibleTextRect];
- frame.size.height = rect.size.height;
- [text setFrame:frame];
-
- return text;
+NSString *LocalizeSection(NSString *section) {
+ return section;
}
NSString *Simplify(NSString *title) {
- (void) setProgressError:(NSString *)error forPackage:(NSString *)id;
- (void) setProgressTitle:(NSString *)title;
- (void) setProgressPercent:(float)percent;
+- (void) startProgress;
- (void) addProgressOutput:(NSString *)output;
+- (bool) isCancelling:(size_t)received;
@end
@protocol ConfigurationDelegate
- (void) setConfigurationData:(NSString *)data;
@end
+@class PackageView;
+
@protocol CydiaDelegate
+- (void) setPackageView:(PackageView *)view;
+- (void) clearPackage:(Package *)package;
- (void) installPackage:(Package *)package;
- (void) removePackage:(Package *)package;
-- (void) slideUp:(UIAlertSheet *)alert;
+- (void) slideUp:(UIActionSheet *)alert;
- (void) distUpgrade;
- (void) updateData;
- (void) syncData;
- (void) askForSettings;
- (UIProgressHUD *) addProgressHUD;
+- (void) removeProgressHUD:(UIProgressHUD *)hud;
+- (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag;
+- (RVPage *) pageForPackage:(NSString *)name;
+- (void) openMailToURL:(NSURL *)url;
+- (void) clearFirstResponder;
+- (PackageView *) packageView;
@end
/* }}} */
}
virtual void Fetch(pkgAcquire::ItemDesc &item) {
+ //NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]);
[delegate_ setProgressTitle:[NSString stringWithUTF8String:("Downloading " + item.ShortDesc).c_str()]];
}
)
return;
+ std::string &error(item.Owner->ErrorText);
+ if (error.empty())
+ return;
+
+ NSString *description([NSString stringWithUTF8String:item.Description.c_str()]);
+ NSArray *fields([description componentsSeparatedByString:@" "]);
+ NSString *source([fields count] == 0 ? nil : [fields objectAtIndex:0]);
+
[delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
- withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()], nil]
+ withObject:[NSArray arrayWithObjects:
+ [NSString stringWithUTF8String:error.c_str()],
+ source,
+ nil]
waitUntilDone:YES
];
}
);
[delegate_ setProgressPercent:percent];
- return value;
+ return [delegate_ isCancelling:CurrentBytes] ? false : value;
}
virtual void Start() {
+ [delegate_ startProgress];
}
virtual void Stop() {
protected:
virtual void Update() {
- [delegate_ setProgressTitle:[NSString stringWithUTF8String:Op.c_str()]];
- [delegate_ setProgressPercent:(Percent / 100)];
+ /*[delegate_ setProgressTitle:[NSString stringWithUTF8String:Op.c_str()]];
+ [delegate_ setProgressPercent:(Percent / 100)];*/
}
public:
}
virtual void Done() {
- [delegate_ setProgressPercent:1];
+ //[delegate_ setProgressPercent:1];
}
};
/* }}} */
/* Database Interface {{{ */
@interface Database : NSObject {
+ NSZone *zone_;
+ apr_pool_t *pool_;
+
+ unsigned era_;
+
pkgCacheFile cache_;
pkgDepCache::Policy *policy_;
pkgRecords *records_;
FILE *input_;
}
++ (Database *) sharedInstance;
+- (unsigned) era;
+
- (void) _readCydia:(NSNumber *)fd;
- (void) _readStatus:(NSNumber *)fd;
- (void) _readOutput:(NSNumber *)fd;
- (Package *) packageWithName:(NSString *)name;
-- (Database *) init;
- (pkgCacheFile &) cache;
- (pkgDepCache::Policy *) policy;
- (pkgRecords *) records;
- (pkgProblemResolver *) resolver;
- (pkgAcquire &) fetcher;
+- (pkgSourceList &) list;
- (NSArray *) packages;
- (NSArray *) sources;
- (void) reloadData;
NSString *description_;
NSString *label_;
NSString *origin_;
+ NSString *support_;
NSString *uri_;
NSString *distribution_;
- (NSComparisonResult) compareByNameAndType:(Source *)source;
+- (NSString *) supportForPackage:(NSString *)package;
+
- (NSDictionary *) record;
- (BOOL) trusted;
@implementation Source
-- (void) dealloc {
- [uri_ release];
- [distribution_ release];
- [type_ release];
+#define _clear(field) \
+ if (field != nil) \
+ [field release]; \
+ field = nil;
- if (description_ != nil)
- [description_ release];
- if (label_ != nil)
- [label_ release];
- if (origin_ != nil)
- [origin_ release];
- if (version_ != nil)
- [version_ release];
- if (defaultIcon_ != nil)
- [defaultIcon_ release];
- if (record_ != nil)
- [record_ release];
+- (void) _clear {
+ _clear(uri_)
+ _clear(distribution_)
+ _clear(type_)
+
+ _clear(description_)
+ _clear(label_)
+ _clear(origin_)
+ _clear(support_)
+ _clear(version_)
+ _clear(defaultIcon_)
+ _clear(record_)
+}
+- (void) dealloc {
+ [self _clear];
[super dealloc];
}
-- (Source *) initWithMetaIndex:(metaIndex *)index {
- if ((self = [super init]) != nil) {
- trusted_ = index->IsTrusted();
++ (NSArray *) _attributeKeys {
+ return [NSArray arrayWithObjects:@"description", @"distribution", @"host", @"key", @"label", @"name", @"origin", @"trusted", @"type", @"uri", @"version", nil];
+}
- uri_ = [[NSString stringWithUTF8String:index->GetURI().c_str()] retain];
- distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain];
- type_ = [[NSString stringWithUTF8String:index->GetType()] retain];
+- (NSArray *) attributeKeys {
+ return [[self class] _attributeKeys];
+}
- description_ = nil;
- label_ = nil;
- origin_ = nil;
- version_ = nil;
- defaultIcon_ = nil;
-
- debReleaseIndex *dindex(dynamic_cast<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;
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+ return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
- std::string name(line.substr(0, colon));
- std::string value(line.substr(colon + 1));
- while (!value.empty() && value[0] == ' ')
- value = value.substr(1);
-
- if (name == "Default-Icon")
- defaultIcon_ = [[NSString stringWithUTF8String:value.c_str()] retain];
- else if (name == "Description")
- description_ = [[NSString stringWithUTF8String:value.c_str()] retain];
- else if (name == "Label")
- label_ = [[NSString stringWithUTF8String:value.c_str()] retain];
- else if (name == "Origin")
- origin_ = [[NSString stringWithUTF8String:value.c_str()] retain];
- else if (name == "Version")
- version_ = [[NSString stringWithUTF8String:value.c_str()] retain];
- }
+- (void) setMetaIndex:(metaIndex *)index {
+ [self _clear];
+
+ trusted_ = index->IsTrusted();
+
+ uri_ = [[NSString stringWithUTF8String:index->GetURI().c_str()] retain];
+ distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain];
+ type_ = [[NSString stringWithUTF8String:index->GetType()] retain];
+
+ debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
+ if (dindex != NULL) {
+ std::ifstream release(dindex->MetaIndexFile("Release").c_str());
+ std::string line;
+ while (std::getline(release, line)) {
+ std::string::size_type colon(line.find(':'));
+ if (colon == std::string::npos)
+ continue;
+
+ std::string name(line.substr(0, colon));
+ std::string value(line.substr(colon + 1));
+ while (!value.empty() && value[0] == ' ')
+ value = value.substr(1);
+
+ if (name == "Default-Icon")
+ defaultIcon_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+ else if (name == "Description")
+ description_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+ else if (name == "Label")
+ label_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+ else if (name == "Origin")
+ origin_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+ else if (name == "Support")
+ support_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+ else if (name == "Version")
+ version_ = [[NSString stringWithUTF8String:value.c_str()] retain];
}
+ }
+
+ record_ = [Sources_ objectForKey:[self key]];
+ if (record_ != nil)
+ record_ = [record_ retain];
+}
- record_ = [Sources_ objectForKey:[self key]];
- if (record_ != nil)
- record_ = [record_ retain];
+- (Source *) initWithMetaIndex:(metaIndex *)index {
+ if ((self = [super init]) != nil) {
+ [self setMetaIndex:index];
} return self;
}
return NSOrderedDescending;
}
- return [lhs caseInsensitiveCompare:rhs];
+ return [lhs compare:rhs options:LaxCompareOptions_];
+}
+
+- (NSString *) supportForPackage:(NSString *)package {
+ return support_ == nil ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package];
}
- (NSDictionary *) record {
@end
/* }}} */
/* Package Class {{{ */
-NSString *Scour(const char *field, const char *begin, const char *end) {
- size_t i(0), l(strlen(field));
-
- for (;;) {
- const char *name = begin + i;
- const char *colon = name + l;
- const char *value = colon + 1;
-
- if (
- value < end &&
- *colon == ':' &&
- memcmp(name, field, l) == 0
- ) {
- while (value != end && value[0] == ' ')
- ++value;
- const char *line = std::find(value, end, '\n');
- while (line != value && line[-1] == ' ')
- --line;
-
- return [NSString stringWithUTF8Bytes:value length:(line - value)];
- } else {
- begin = std::find(begin, end, '\n');
- if (begin == end)
- return nil;
- ++begin;
- }
- }
-}
-
@interface Package : NSObject {
+ unsigned era_;
+
pkgCache::PkgIterator iterator_;
_transient Database *database_;
pkgCache::VerIterator version_;
Source *source_;
bool cached_;
+ CYString section_;
+ NSString *section$_;
+ bool essential_;
+
NSString *latest_;
NSString *installed_;
NSString *id_;
- NSString *name_;
- NSString *tagline_;
- NSString *icon_;
- NSString *website_;
- Address *sponsor_;
- Address *author_;
+ CYString name_;
+ CYString tagline_;
+ CYString icon_;
+ CYString depiction_;
+ CYString homepage_;
+
+ CYString sponsor_;
+ Address *sponsor$_;
+
+ CYString author_;
+ Address *author$_;
+
+ CYString support_;
NSArray *tags_;
NSString *role_;
NSArray *relationships_;
+ NSMutableDictionary *metadata_;
}
-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
-+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;
- (pkgCache::PkgIterator) iterator;
- (NSString *) section;
+- (NSString *) simpleSection;
+
+- (NSString *) longSection;
+- (NSString *) shortSection;
+
+- (NSString *) uri;
+
- (Address *) maintainer;
- (size_t) size;
- (NSString *) description;
-- (NSString *) index;
+- (unichar) index;
+- (NSMutableDictionary *) metadata;
- (NSDate *) seen;
+- (BOOL) subscribed;
+- (BOOL) ignored;
- (NSString *) latest;
- (NSString *) installed;
- (BOOL) upgradableAndEssential:(BOOL)essential;
- (BOOL) essential;
- (BOOL) broken;
+- (BOOL) unfiltered;
- (BOOL) visible;
- (BOOL) half;
- (NSString *) id;
- (NSString *) name;
- (NSString *) tagline;
-- (NSString *) icon;
-- (NSString *) website;
+- (UIImage *) icon;
+- (NSString *) homepage;
+- (NSString *) depiction;
- (Address *) author;
+- (NSString *) support;
+
+- (NSArray *) files;
- (NSArray *) relationships;
+- (NSArray *) warnings;
+- (NSArray *) applications;
- (Source *) source;
- (NSString *) role;
- (bool) hasSupportingRole;
- (BOOL) hasTag:(NSString *)tag;
+- (NSString *) primaryPurpose;
+- (NSArray *) purposes;
+- (bool) isCommercial;
+- (uint32_t) compareByPrefix;
- (NSComparisonResult) compareByName:(Package *)package;
-- (NSComparisonResult) compareBySection:(Package *)package;
-- (NSComparisonResult) compareBySectionAndName:(Package *)package;
-- (NSComparisonResult) compareForChanges:(Package *)package;
+- (uint32_t) compareBySection:(NSArray *)sections;
+
+- (uint32_t) compareForChanges;
- (void) install;
- (void) remove;
-- (NSNumber *) isVisiblySearchedForBy:(NSString *)search;
-- (NSNumber *) isInstalledAndVisible:(NSNumber *)number;
-- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)section;
-- (NSNumber *) isVisibleInSource:(Source *)source;
+- (bool) isUnfilteredAndSearchedForBy:(NSString *)search;
+- (bool) isInstalledAndVisible:(NSNumber *)number;
+- (bool) isVisiblyUninstalledInSection:(NSString *)section;
+- (bool) isVisibleInSource:(Source *)source;
@end
+uint32_t PackageChangesRadix(Package *self, void *) {
+ union {
+ uint32_t key;
+
+ struct {
+ uint32_t timestamp : 30;
+ uint32_t ignored : 1;
+ uint32_t upgradable : 1;
+ } bits;
+ } value;
+
+ bool upgradable([self upgradableAndEssential:YES]);
+ value.bits.upgradable = upgradable ? 1 : 0;
+
+ if (upgradable) {
+ value.bits.timestamp = 0;
+ value.bits.ignored = [self ignored] ? 0 : 1;
+ value.bits.upgradable = 1;
+ } else {
+ value.bits.timestamp = static_cast<uint32_t>([[self seen] timeIntervalSince1970]) >> 2;
+ value.bits.ignored = 0;
+ value.bits.upgradable = 0;
+ }
+
+ return _not(uint32_t) - value.key;
+}
+
@implementation Package
- (void) dealloc {
if (source_ != nil)
[source_ release];
+ if (section$_ != nil)
+ [section$_ release];
[latest_ release];
if (installed_ != nil)
[installed_ release];
[id_ release];
- if (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 (sponsor$_ != nil)
+ [sponsor$_ release];
+ if (author$_ != nil)
+ [author$_ release];
if (tags_ != nil)
[tags_ release];
if (role_ != nil)
if (relationships_ != nil)
[relationships_ release];
+ if (metadata_ != nil)
+ [metadata_ release];
[super dealloc];
}
-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
++ (NSString *) webScriptNameForSelector:(SEL)selector {
+ if (selector == @selector(hasTag:))
+ return @"hasTag";
+ else
+ return nil;
+}
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector {
+ return [self webScriptNameForSelector:selector] == nil;
+}
+
++ (NSArray *) _attributeKeys {
+ return [NSArray arrayWithObjects:@"applications", @"author", @"depiction", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"longSection", @"maintainer", @"mode", @"name", @"purposes", @"section", @"shortSection", @"simpleSection", @"size", @"source", @"sponsor", @"support", @"tagline", @"warnings", nil];
+}
+
+- (NSArray *) attributeKeys {
+ return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+ return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database {
if ((self = [super init]) != nil) {
+ _profile(Package$initWithIterator)
+ @synchronized (database) {
+ era_ = [database era];
+
iterator_ = iterator;
database_ = database;
- version_ = [database_ policy]->GetCandidateVer(iterator_);
- latest_ = version_.end() ? nil : [StripVersion([NSString stringWithUTF8String:version_.VerStr()]) retain];
+ _profile(Package$initWithIterator$Control)
+ _end
- if (!version_.end())
- file_ = version_.FileList();
- else {
- pkgCache &cache([database_ cache]);
- file_ = pkgCache::VerFileIterator(cache, cache.VerFileP);
- }
+ _profile(Package$initWithIterator$Version)
+ version_ = [database_ policy]->GetCandidateVer(iterator_);
+ _end
- pkgCache::VerIterator current = iterator_.CurrentVer();
- installed_ = current.end() ? nil : [StripVersion([NSString stringWithUTF8String:current.VerStr()]) retain];
-
- id_ = [[[NSString stringWithUTF8String:iterator_.Name()] lowercaseString] retain];
-
- if (!file_.end()) {
- pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
-
- const char *begin, *end;
- parser->GetRec(begin, end);
-
- name_ = Scour("Name", begin, end);
- if (name_ != nil)
- name_ = [name_ retain];
- tagline_ = [[NSString stringWithUTF8String:parser->ShortDesc().c_str()] retain];
- icon_ = Scour("Icon", begin, end);
- if (icon_ != nil)
- icon_ = [icon_ retain];
- website_ = Scour("Homepage", begin, end);
- if (website_ == nil)
- website_ = Scour("Website", begin, end);
- if (website_ != nil)
- website_ = [website_ retain];
- NSString *sponsor = Scour("Sponsor", begin, end);
- if (sponsor != nil)
- sponsor_ = [[Address addressWithString:sponsor] retain];
- NSString *author = Scour("Author", begin, end);
- if (author != nil)
- author_ = [[Address addressWithString:author] retain];
- NSString *tags = Scour("Tag", begin, end);
- if (tags != nil)
- tags_ = [[tags componentsSeparatedByString:@", "] retain];
- }
+ NSString *latest = version_.end() ? nil : [NSString stringWithUTF8String:version_.VerStr()];
- if (tags_ != nil)
- for (int i(0), e([tags_ count]); i != e; ++i) {
- NSString *tag = [tags_ objectAtIndex:i];
- if ([tag hasPrefix:@"role::"]) {
- role_ = [[tag substringFromIndex:6] retain];
- break;
+ _profile(Package$initWithIterator$Latest)
+ latest_ = latest == nil ? nil : [StripVersion(latest) retain];
+ _end
+
+ pkgCache::VerIterator current;
+ NSString *installed;
+
+ _profile(Package$initWithIterator$Current)
+ current = iterator_.CurrentVer();
+ installed = current.end() ? nil : [NSString stringWithUTF8String:current.VerStr()];
+ _end
+
+ _profile(Package$initWithIterator$Installed)
+ installed_ = [StripVersion(installed) retain];
+ _end
+
+ _profile(Package$initWithIterator$File)
+ if (!version_.end())
+ file_ = version_.FileList();
+ else {
+ pkgCache &cache([database_ cache]);
+ file_ = pkgCache::VerFileIterator(cache, cache.VerFileP);
+ }
+ _end
+
+ _profile(Package$initWithIterator$Name)
+ id_ = [[NSString stringWithUTF8String:iterator_.Name()] retain];
+ _end
+
+ if (!file_.end())
+ _profile(Package$initWithIterator$Parse)
+ pkgRecords::Parser *parser;
+
+ _profile(Package$initWithIterator$Parse$Lookup)
+ parser = &[database_ records]->Lookup(file_);
+ _end
+
+ const char *begin, *end;
+ parser->GetRec(begin, end);
+
+ CYString website;
+ CYString tag;
+
+ struct {
+ const char *name_;
+ CYString *value_;
+ } names[] = {
+ {"name", &name_},
+ {"icon", &icon_},
+ {"depiction", &depiction_},
+ {"homepage", &homepage_},
+ {"website", &website},
+ {"support", &support_},
+ {"sponsor", &sponsor_},
+ {"author", &author_},
+ {"tag", &tag},
+ };
+
+ while (begin != end)
+ if (*begin == '\n') {
+ ++begin;
+ continue;
+ } else if (isblank(*begin)) next: {
+ begin = static_cast<char *>(memchr(begin + 1, '\n', end - begin - 1));
+ if (begin == NULL)
+ break;
+ } else if (const char *colon = static_cast<char *>(memchr(begin, ':', end - begin))) {
+ const char *name(begin);
+ size_t size(colon - begin);
+
+ begin = static_cast<char *>(memchr(begin, '\n', end - begin));
+
+ {
+ const char *stop(begin == NULL ? end : begin);
+ while (stop[-1] == '\r')
+ --stop;
+ while (++colon != stop && isblank(*colon));
+
+ for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i)
+ if (strncasecmp(names[i].name_, name, size) == 0) {
+ CYString &value(*names[i].value_);
+
+ _profile(Package$initWithIterator$Parse$Value)
+ value.set(pool, colon, stop - colon);
+ _end
+
+ break;
+ }
+ }
+
+ if (begin == NULL)
+ break;
+ ++begin;
+ } else goto next;
+
+ _profile(Package$initWithIterator$Parse$Tagline)
+ tagline_.set(pool, parser->ShortDesc());
+ _end
+
+ _profile(Package$initWithIterator$Parse$Retain)
+ if (!homepage_.empty())
+ homepage_ = website;
+ if (homepage_ == depiction_)
+ homepage_.clear();
+ if (!tag.empty())
+ tags_ = [[tag componentsSeparatedByString:@", "] retain];
+ _end
+ _end
+
+ _profile(Package$initWithIterator$Tags)
+ if (tags_ != nil)
+ for (NSString *tag in tags_)
+ if ([tag hasPrefix:@"role::"]) {
+ role_ = [[tag substringFromIndex:6] retain];
+ break;
+ }
+ _end
+
+ NSString *solid(latest == nil ? installed : latest);
+ bool changed(false);
+
+ NSString *key([id_ lowercaseString]);
+
+ _profile(Package$initWithIterator$Metadata)
+ metadata_ = [Packages_ objectForKey:key];
+ if (metadata_ == nil) {
+ metadata_ = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
+ now_, @"FirstSeen",
+ nil] mutableCopy];
+
+ if (solid != nil)
+ [metadata_ setObject:solid forKey:@"LastVersion"];
+ changed = true;
+ } else {
+ NSDate *first([metadata_ objectForKey:@"FirstSeen"]);
+ NSDate *last([metadata_ objectForKey:@"LastSeen"]);
+ NSString *version([metadata_ objectForKey:@"LastVersion"]);
+
+ if (first == nil) {
+ first = last == nil ? now_ : last;
+ [metadata_ setObject:first forKey:@"FirstSeen"];
+ changed = true;
}
+
+ if (solid != nil)
+ if (version == nil) {
+ [metadata_ setObject:solid forKey:@"LastVersion"];
+ changed = true;
+ } else if (![version isEqualToString:solid]) {
+ [metadata_ setObject:solid forKey:@"LastVersion"];
+ last = now_;
+ [metadata_ setObject:last forKey:@"LastSeen"];
+ changed = true;
+ }
}
- NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
- if (metadata == nil || [metadata count] == 0) {
- metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys:
- now_, @"FirstSeen",
- nil];
+ metadata_ = [metadata_ retain];
- [Packages_ setObject:metadata forKey:id_];
- Changed_ = true;
- }
- } return self;
+ if (changed) {
+ [Packages_ setObject:metadata_ forKey:key];
+ Changed_ = true;
+ }
+ _end
+
+ _profile(Package$initWithIterator$Section)
+ section_.set(pool, iterator_.Section());
+ _end
+
+ essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"];
+ } _end } return self;
}
-+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database {
return [[[Package alloc]
- initWithIterator:iterator
+ initWithIterator:iterator
+ withZone:zone
+ inPool:pool
database:database
] autorelease];
}
}
- (NSString *) section {
- const char *section = iterator_.Section();
- if (section == NULL)
+ if (section$_ == nil) {
+ if (section_.empty())
+ return nil;
+
+ std::replace(section_.data(), section_.data() + section_.size(), ' ', '_');
+ NSString *name(section_);
+
+ lookup:
+ if (NSDictionary *value = [SectionMap_ objectForKey:name])
+ if (NSString *rename = [value objectForKey:@"Rename"]) {
+ name = rename;
+ goto lookup;
+ }
+
+ section$_ = [[name stringByReplacingCharacter:'_' withCharacter:' '] retain];
+ } return section$_;
+}
+
+- (NSString *) simpleSection {
+ if (NSString *section = [self section])
+ return Simplify(section);
+ else
+ return nil;
+}
+
+- (NSString *) longSection {
+ return LocalizeSection(section_);
+}
+
+- (NSString *) shortSection {
+ return [[NSBundle mainBundle] localizedStringForKey:[self simpleSection] value:nil table:@"Sections"];
+}
+
+- (NSString *) uri {
+ return nil;
+#if 0
+ pkgIndexFile *index;
+ pkgCache::PkgFileIterator file(file_.File());
+ if (![database_ list].FindIndex(file, index))
return nil;
- NSString *key = [[NSString stringWithUTF8String:section] stringByReplacingCharacter:' ' withCharacter:'_'];
- NSString *value = [SectionMap_ objectForKey:key];
- if (value == nil)
- value = key;
- return [value stringByReplacingCharacter:'_' withCharacter:' '];
+ return [NSString stringWithUTF8String:iterator_->Path];
+ //return [NSString stringWithUTF8String:file.Site()];
+ //return [NSString stringWithUTF8String:index->ArchiveURI(file.FileName()).c_str()];
+#endif
}
- (Address *) maintainer {
if (file_.end())
return nil;
pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
- return [Address addressWithString:[NSString stringWithUTF8String:parser->Maintainer().c_str()]];
+ const std::string &maintainer(parser->Maintainer());
+ return maintainer.empty() ? nil : [Address addressWithString:[NSString stringWithUTF8String:maintainer.c_str()]];
}
- (size_t) size {
return nil;
NSCharacterSet *whitespace = [NSCharacterSet whitespaceCharacterSet];
- for (size_t i(1); i != [lines count]; ++i) {
+ for (size_t i(1), e([lines count]); i != e; ++i) {
NSString *trim = [[lines objectAtIndex:i] stringByTrimmingCharactersInSet:whitespace];
[trimmed addObject:trim];
}
return [trimmed componentsJoinedByString:@"\n"];
}
-- (NSString *) index {
- NSString *index = [[[self name] substringToIndex:1] uppercaseString];
- return [index length] != 0 && isalpha([index characterAtIndex:0]) ? index : @"123";
+- (unichar) index {
+ _profile(Package$index)
+ NSString *name([self name]);
+ if ([name length] == 0)
+ return '#';
+ unichar character([name characterAtIndex:0]);
+ if (!isalpha(character))
+ return '#';
+ return toupper(character);
+ _end
+}
+
+- (NSMutableDictionary *) metadata {
+ if (metadata_ == nil)
+ metadata_ = [[Packages_ objectForKey:[id_ lowercaseString]] retain];
+ return metadata_;
}
- (NSDate *) seen {
- return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"];
+ NSDictionary *metadata([self metadata]);
+ if ([self subscribed])
+ if (NSDate *last = [metadata objectForKey:@"LastSeen"])
+ return last;
+ return [metadata objectForKey:@"FirstSeen"];
+}
+
+- (BOOL) subscribed {
+ NSDictionary *metadata([self metadata]);
+ if (NSNumber *subscribed = [metadata objectForKey:@"IsSubscribed"])
+ return [subscribed boolValue];
+ else
+ return false;
+}
+
+- (BOOL) ignored {
+ NSDictionary *metadata([self metadata]);
+ if (NSNumber *ignored = [metadata objectForKey:@"IsIgnored"])
+ return [ignored boolValue];
+ else
+ return false;
}
- (NSString *) latest {
- (BOOL) upgradableAndEssential:(BOOL)essential {
pkgCache::VerIterator current = iterator_.CurrentVer();
+ bool value;
if (current.end())
- return essential && [self essential];
- else {
- pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_);
- return !candidate.end() && candidate != current;
- }
+ value = essential && [self essential] && [self visible];
+ else
+ value = !version_.end() && version_ != current;// && (!essential || ![database_ cache][iterator_].Keep());
+ return value;
}
- (BOOL) essential {
- return (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES;
+ return essential_;
}
- (BOOL) broken {
return [database_ cache][iterator_].InstBroken();
}
-- (BOOL) visible {
+- (BOOL) unfiltered {
NSString *section = [self section];
- return [self hasSupportingRole] && (section == nil || isSectionVisible(section));
+ return section == nil || isSectionVisible(section);
+}
+
+- (BOOL) visible {
+ return [self hasSupportingRole] && [self unfiltered];
}
- (BOOL) half {
switch (state.Mode) {
case pkgDepCache::ModeDelete:
if ((state.iFlags & pkgDepCache::Purge) != 0)
- return @"Purge";
+ return @"PURGE";
else
- return @"Remove";
- _assert(false);
+ return @"REMOVE";
case pkgDepCache::ModeKeep:
- if ((state.iFlags & pkgDepCache::AutoKept) != 0)
- return nil;
+ if ((state.iFlags & pkgDepCache::ReInstall) != 0)
+ return @"REINSTALL";
+ /*else if ((state.iFlags & pkgDepCache::AutoKept) != 0)
+ return nil;*/
else
return nil;
- _assert(false);
case pkgDepCache::ModeInstall:
- if ((state.iFlags & pkgDepCache::ReInstall) != 0)
- return @"Reinstall";
- else switch (state.Status) {
+ /*if ((state.iFlags & pkgDepCache::ReInstall) != 0)
+ return @"REINSTALL";
+ else*/ switch (state.Status) {
case -1:
- return @"Downgrade";
+ return @"DOWNGRADE";
case 0:
- return @"Install";
+ return @"INSTALL";
case 1:
- return @"Upgrade";
+ return @"UPGRADE";
case 2:
- return @"New Install";
+ return @"NEW_INSTALL";
default:
_assert(false);
}
return tagline_;
}
-- (NSString *) icon {
- return icon_;
+- (UIImage *) icon {
+ NSString *section = [self simpleSection];
+
+ UIImage *icon(nil);
+ if (icon_ != nil)
+ if ([icon_ hasPrefix:@"file:///"])
+ icon = [UIImage imageAtPath:[icon_ substringFromIndex:7]];
+ if (icon == nil) if (section != nil)
+ icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]];
+ if (icon == nil) if (source_ != nil) if (NSString *dicon = [source_ defaultIcon])
+ if ([dicon hasPrefix:@"file:///"])
+ icon = [UIImage imageAtPath:[dicon substringFromIndex:7]];
+ if (icon == nil)
+ icon = [UIImage applicationImageNamed:@"unknown.png"];
+ return icon;
+}
+
+- (NSString *) homepage {
+ return homepage_;
}
-- (NSString *) website {
- return website_;
+- (NSString *) depiction {
+ return depiction_;
}
- (Address *) sponsor {
- return sponsor_;
+ if (sponsor$_ == nil) {
+ if (sponsor_.empty())
+ return nil;
+ sponsor$_ = [[Address addressWithString:sponsor_] retain];
+ } return sponsor$_;
}
- (Address *) author {
- return author_;
+ if (author$_ == nil) {
+ if (author_.empty())
+ return nil;
+ author$_ = [[Address addressWithString:author_] retain];
+ } return author$_;
+}
+
+- (NSString *) support {
+ return support_ != nil ? support_ : [[self source] supportForPackage:id_];
+}
+
+- (NSArray *) files {
+ NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", id_];
+ NSMutableArray *files = [NSMutableArray arrayWithCapacity:128];
+
+ std::ifstream fin;
+ fin.open([path UTF8String]);
+ if (!fin.is_open())
+ return nil;
+
+ std::string line;
+ while (std::getline(fin, line))
+ [files addObject:[NSString stringWithUTF8String:line.c_str()]];
+
+ return files;
}
- (NSArray *) relationships {
return relationships_;
}
+- (NSArray *) warnings {
+ NSMutableArray *warnings([NSMutableArray arrayWithCapacity:4]);
+ const char *name(iterator_.Name());
+
+ size_t length(strlen(name));
+ if (length < 2) invalid:
+ [warnings addObject:CYLocalize("ILLEGAL_PACKAGE_IDENTIFIER")];
+ else for (size_t i(0); i != length; ++i)
+ if (
+ /* XXX: technically this is not allowed */
+ (name[i] < 'A' || name[i] > 'Z') &&
+ (name[i] < 'a' || name[i] > 'z') &&
+ (name[i] < '0' || name[i] > '9') &&
+ (i == 0 || name[i] != '+' && name[i] != '-' && name[i] != '.')
+ ) goto invalid;
+
+ if (strcmp(name, "cydia") != 0) {
+ bool cydia = false;
+ bool _private = false;
+ bool stash = false;
+
+ bool repository = [[self section] isEqualToString:@"Repositories"];
+
+ if (NSArray *files = [self files])
+ for (NSString *file in files)
+ if (!cydia && [file isEqualToString:@"/Applications/Cydia.app"])
+ cydia = true;
+ else if (!_private && [file isEqualToString:@"/private"])
+ _private = true;
+ else if (!stash && [file isEqualToString:@"/var/stash"])
+ stash = true;
+
+ /* XXX: this is not sensitive enough. only some folders are valid. */
+ if (cydia && !repository)
+ [warnings addObject:[NSString stringWithFormat:CYLocalize("FILES_INSTALLED_TO"), @"Cydia.app"]];
+ if (_private)
+ [warnings addObject:[NSString stringWithFormat:CYLocalize("FILES_INSTALLED_TO"), @"/private"]];
+ if (stash)
+ [warnings addObject:[NSString stringWithFormat:CYLocalize("FILES_INSTALLED_TO"), @"/var/stash"]];
+ }
+
+ return [warnings count] == 0 ? nil : warnings;
+}
+
+- (NSArray *) applications {
+ NSString *me([[NSBundle mainBundle] bundleIdentifier]);
+
+ NSMutableArray *applications([NSMutableArray arrayWithCapacity:2]);
+
+ static Pcre application_r("^/Applications/(.*)\\.app/Info.plist$");
+ if (NSArray *files = [self files])
+ for (NSString *file in files)
+ if (application_r(file)) {
+ NSDictionary *info([NSDictionary dictionaryWithContentsOfFile:file]);
+ NSString *id([info objectForKey:@"CFBundleIdentifier"]);
+ if ([id isEqualToString:me])
+ continue;
+
+ NSString *display([info objectForKey:@"CFBundleDisplayName"]);
+ if (display == nil)
+ display = application_r[1];
+
+ NSString *bundle([file stringByDeletingLastPathComponent]);
+ NSString *icon([info objectForKey:@"CFBundleIconFile"]);
+ if (icon == nil || [icon length] == 0)
+ icon = @"icon.png";
+ NSURL *url([NSURL fileURLWithPath:[bundle stringByAppendingPathComponent:icon]]);
+
+ NSMutableArray *application([NSMutableArray arrayWithCapacity:2]);
+ [applications addObject:application];
+
+ [application addObject:id];
+ [application addObject:display];
+ [application addObject:url];
+ }
+
+ return [applications count] == 0 ? nil : applications;
+}
+
- (Source *) source {
if (!cached_) {
- source_ = file_.end() ? nil : [[database_ getSource:file_.File()] retain];
- cached_ = true;
+ @synchronized (database_) {
+ if ([database_ era] != era_ || file_.end())
+ source_ = nil;
+ else {
+ source_ = [database_ getSource:file_.File()];
+ if (source_ != nil)
+ [source_ retain];
+ }
+
+ cached_ = true;
+ }
}
return source_;
NSRange range;
- range = [[self id] rangeOfString:text options:NSCaseInsensitiveSearch];
+ range = [[self id] rangeOfString:text options:MatchCompareOptions_];
if (range.location != NSNotFound)
return YES;
- range = [[self name] rangeOfString:text options:NSCaseInsensitiveSearch];
+ range = [[self name] rangeOfString:text options:MatchCompareOptions_];
if (range.location != NSNotFound)
return YES;
- range = [[self tagline] rangeOfString:text options:NSCaseInsensitiveSearch];
+ range = [[self tagline] rangeOfString:text options:MatchCompareOptions_];
if (range.location != NSNotFound)
return YES;
return tags_ == nil ? NO : [tags_ containsObject:tag];
}
+- (NSString *) primaryPurpose {
+ for (NSString *tag in tags_)
+ if ([tag hasPrefix:@"purpose::"])
+ return [tag substringFromIndex:9];
+ return nil;
+}
+
+- (NSArray *) purposes {
+ NSMutableArray *purposes([NSMutableArray arrayWithCapacity:2]);
+ for (NSString *tag in tags_)
+ if ([tag hasPrefix:@"purpose::"])
+ [purposes addObject:[tag substringFromIndex:9]];
+ return [purposes count] == 0 ? nil : purposes;
+}
+
+- (bool) isCommercial {
+ return [self hasTag:@"cydia::commercial"];
+}
+
+- (uint32_t) compareByPrefix {
+ return 0;
+}
+
- (NSComparisonResult) compareByName:(Package *)package {
NSString *lhs = [self name];
NSString *rhs = [package name];
- if ([lhs length] != 0 && [rhs length] != 0) {
+ /*if ([lhs length] != 0 && [rhs length] != 0) {
unichar lhc = [lhs characterAtIndex:0];
unichar rhc = [rhs characterAtIndex:0];
return NSOrderedDescending;
}
- return [lhs caseInsensitiveCompare:rhs];
-}
+ return [lhs compare:rhs options:LaxCompareOptions_];*/
-- (NSComparisonResult) compareBySection:(Package *)package {
- NSString *lhs = [self section];
- NSString *rhs = [package section];
+ return [lhs compare:rhs];
+}
- if (lhs == NULL && rhs != NULL)
- return NSOrderedAscending;
- else if (lhs != NULL && rhs == NULL)
- return NSOrderedDescending;
- else if (lhs != NULL && rhs != NULL) {
- NSComparisonResult result = [lhs caseInsensitiveCompare:rhs];
- if (result != NSOrderedSame)
- return result;
+- (uint32_t) compareBySection:(NSArray *)sections {
+ NSString *section([self section]);
+ for (size_t i(0), e([sections count]); i != e; ++i) {
+ if ([section isEqualToString:[[sections objectAtIndex:i] name]])
+ return i;
}
- return NSOrderedSame;
+ return _not(uint32_t);
}
-- (NSComparisonResult) compareBySectionAndName:(Package *)package {
- NSString *lhs = [self section];
- NSString *rhs = [package section];
-
- if (lhs == NULL && rhs != NULL)
- return NSOrderedAscending;
- else if (lhs != NULL && rhs == NULL)
- return NSOrderedDescending;
- else if (lhs != NULL && rhs != NULL) {
- NSComparisonResult result = [lhs compare:rhs];
- if (result != NSOrderedSame)
- return result;
- }
+- (uint32_t) compareForChanges {
+ union {
+ uint32_t key;
- return [self compareByName:package];
-}
+ struct {
+ uint32_t timestamp : 30;
+ uint32_t ignored : 1;
+ uint32_t upgradable : 1;
+ } bits;
+ } value;
-- (NSComparisonResult) compareForChanges:(Package *)package {
- BOOL lhs = [self upgradableAndEssential:YES];
- BOOL rhs = [package upgradableAndEssential:YES];
+ bool upgradable([self upgradableAndEssential:YES]);
+ value.bits.upgradable = upgradable ? 1 : 0;
- if (lhs != rhs)
- return lhs ? NSOrderedAscending : NSOrderedDescending;
- else if (!lhs) {
- switch ([[self seen] compare:[package seen]]) {
- case NSOrderedAscending:
- return NSOrderedDescending;
- case NSOrderedSame:
- break;
- case NSOrderedDescending:
- return NSOrderedAscending;
- default:
- _assert(false);
- }
+ if (upgradable) {
+ value.bits.timestamp = 0;
+ value.bits.ignored = [self ignored] ? 0 : 1;
+ value.bits.upgradable = 1;
+ } else {
+ value.bits.timestamp = static_cast<uint32_t>([[self seen] timeIntervalSince1970]) >> 2;
+ value.bits.ignored = 0;
+ value.bits.upgradable = 0;
}
- return [self compareByName:package];
+ return _not(uint32_t) - value.key;
+}
+
+- (void) clear {
+ pkgProblemResolver *resolver = [database_ resolver];
+ resolver->Clear(iterator_);
+ resolver->Protect(iterator_);
}
- (void) install {
[database_ cache]->MarkDelete(iterator_, true);
}
-- (NSNumber *) isVisiblySearchedForBy:(NSString *)search {
- return [NSNumber numberWithBool:(
- [self valid] && [self visible] && [self matches:search]
- )];
+- (bool) isUnfilteredAndSearchedForBy:(NSString *)search {
+ _profile(Package$isUnfilteredAndSearchedForBy)
+ bool value(true);
+
+ _profile(Package$isUnfilteredAndSearchedForBy$Unfiltered)
+ value &= [self unfiltered];
+ _end
+
+ _profile(Package$isUnfilteredAndSearchedForBy$Match)
+ value &= [self matches:search];
+ _end
+
+ return value;
+ _end
}
-- (NSNumber *) isInstalledAndVisible:(NSNumber *)number {
- return [NSNumber numberWithBool:(
- (![number boolValue] || [self visible]) && [self installed] != nil
- )];
+- (bool) isInstalledAndVisible:(NSNumber *)number {
+ return (![number boolValue] || [self visible]) && [self installed] != nil;
}
-- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)name {
+- (bool) isVisiblyUninstalledInSection:(NSString *)name {
NSString *section = [self section];
- return [NSNumber numberWithBool:(
- [self valid] && [self visible] &&
+ return
+ [self visible] &&
[self installed] == nil && (
name == nil ||
section == nil && [name length] == 0 ||
[name isEqualToString:section]
- )
- )];
+ );
}
-- (NSNumber *) isVisibleInSource:(Source *)source {
- return [NSNumber numberWithBool:([self source] == source && [self visible])];
+- (bool) isVisibleInSource:(Source *)source {
+ return [self source] == source && [self visible];
}
@end
/* Section Class {{{ */
@interface Section : NSObject {
NSString *name_;
+ unichar index_;
size_t row_;
size_t count_;
+ NSString *localized_;
}
- (NSComparisonResult) compareByName:(Section *)section;
- (Section *) initWithName:(NSString *)name;
- (Section *) initWithName:(NSString *)name row:(size_t)row;
+- (Section *) initWithIndex:(unichar)index row:(size_t)row;
- (NSString *) name;
+- (unichar) index;
+
- (size_t) row;
- (size_t) count;
+
+- (void) addToRow;
- (void) addToCount;
+- (void) setCount:(size_t)count;
+
@end
@implementation Section
- (void) dealloc {
[name_ release];
+ if (localized_ != nil)
+ [localized_ release];
[super dealloc];
}
return NSOrderedDescending;
}
- return [lhs caseInsensitiveCompare:rhs];
+ return [lhs compare:rhs options:LaxCompareOptions_];
}
- (Section *) initWithName:(NSString *)name {
- (Section *) initWithName:(NSString *)name row:(size_t)row {
if ((self = [super init]) != nil) {
name_ = [name retain];
+ index_ = '\0';
+ row_ = row;
+ localized_ = LocalizeSection(name_);
+ } return self;
+}
+
+/* XXX: localize the index thingees */
+- (Section *) initWithIndex:(unichar)index row:(size_t)row {
+ if ((self = [super init]) != nil) {
+ name_ = [(index == '#' ? @"123" : [NSString stringWithCharacters:&index length:1]) retain];
+ index_ = index;
row_ = row;
} return self;
}
return name_;
}
+- (unichar) index {
+ return index_;
+}
+
- (size_t) row {
return row_;
}
return count_;
}
+- (void) addToRow {
+ ++row_;
+}
+
- (void) addToCount {
++count_;
}
+- (void) setCount:(size_t)count {
+ count_ = count;
+}
+
+- (NSString *) localized {
+ return localized_;
+}
+
@end
/* }}} */
+static int Finish_;
+static NSArray *Finishes_;
+
/* Database Implementation {{{ */
@implementation Database
++ (Database *) sharedInstance {
+ static Database *instance;
+ if (instance == nil)
+ instance = [[Database alloc] init];
+ return instance;
+}
+
+- (unsigned) era {
+ return era_;
+}
+
- (void) dealloc {
_assert(false);
+ NSRecycleZone(zone_);
+ // XXX: malloc_destroy_zone(zone_);
+ apr_pool_destroy(pool_);
[super dealloc];
}
-- (void) _readCydia:(NSNumber *)fd {
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+- (void) _readCydia:(NSNumber *)fd { _pooled
__gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
std::istream is(&ib);
std::string line;
+ static Pcre finish_r("^finish:([^:]*)$");
+
while (std::getline(is, line)) {
const char *data(line.c_str());
- //size_t size = line.size();
- fprintf(stderr, "C:%s\n", data);
+ size_t size = line.size();
+ lprintf("C:%s\n", data);
+
+ if (finish_r(data, size)) {
+ NSString *finish = finish_r[1];
+ int index = [Finishes_ indexOfObject:finish];
+ if (index != INT_MAX && index > Finish_)
+ Finish_ = index;
+ }
}
- [pool release];
_assert(false);
}
-- (void) _readStatus:(NSNumber *)fd {
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+- (void) _readStatus:(NSNumber *)fd { _pooled
__gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
std::istream is(&ib);
std::string line;
while (std::getline(is, line)) {
const char *data(line.c_str());
size_t size = line.size();
- fprintf(stderr, "S:%s\n", data);
+ lprintf("S:%s\n", data);
if (conffile_r(data, size)) {
[delegate_ setConfigurationData:conffile_r[1]];
withObject:[NSArray arrayWithObjects:string, id, nil]
waitUntilDone:YES
];
- else if (type == "pmstatus")
+ else if (type == "pmstatus") {
[delegate_ setProgressTitle:string];
- else if (type == "pmconffile")
+ } else if (type == "pmconffile")
[delegate_ setConfigurationData:string];
else _assert(false);
} else _assert(false);
}
- [pool release];
_assert(false);
}
-- (void) _readOutput:(NSNumber *)fd {
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+- (void) _readOutput:(NSNumber *)fd { _pooled
__gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
std::istream is(&ib);
std::string line;
while (std::getline(is, line)) {
- fprintf(stderr, "O:%s\n", line.c_str());
+ lprintf("O:%s\n", line.c_str());
[delegate_ addProgressOutput:[NSString stringWithUTF8String:line.c_str()]];
}
- [pool release];
_assert(false);
}
if (static_cast<pkgDepCache *>(cache_) == NULL)
return nil;
pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String]));
- return iterator.end() ? nil : [Package packageWithIterator:iterator database:self];
+ return iterator.end() ? nil : [Package packageWithIterator:iterator withZone:NULL inPool:pool_ database:self];
}
- (Database *) init {
fetcher_ = NULL;
lock_ = NULL;
+ zone_ = NSCreateZone(1024 * 1024, 256 * 1024, NO);
+ apr_pool_create(&pool_, NULL);
+
sources_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
cydiafd_ = fds[1];
_config->Set("APT::Keep-Fds::", cydiafd_);
- setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 0"] UTF8String], _not(int));
+ setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 1"] UTF8String], _not(int));
[NSThread
detachNewThreadSelector:@selector(_readCydia:)
return *fetcher_;
}
+- (pkgSourceList &) list {
+ return *list_;
+}
+
- (NSArray *) packages {
return packages_;
}
return [sources_ allValues];
}
-- (void) reloadData {
+- (NSArray *) issues {
+ if (cache_->BrokenCount() == 0)
+ return nil;
+
+ NSMutableArray *issues([NSMutableArray arrayWithCapacity:4]);
+
+ for (Package *package in packages_) {
+ if (![package broken])
+ continue;
+ pkgCache::PkgIterator pkg([package iterator]);
+
+ NSMutableArray *entry([NSMutableArray arrayWithCapacity:4]);
+ [entry addObject:[package name]];
+ [issues addObject:entry];
+
+ pkgCache::VerIterator ver(cache_[pkg].InstVerIter(cache_));
+ if (ver.end())
+ continue;
+
+ for (pkgCache::DepIterator dep(ver.DependsList()); !dep.end(); ) {
+ pkgCache::DepIterator start;
+ pkgCache::DepIterator end;
+ dep.GlobOr(start, end); // ++dep
+
+ if (!cache_->IsImportantDep(end))
+ continue;
+ if ((cache_[end] & pkgDepCache::DepGInstall) != 0)
+ continue;
+
+ NSMutableArray *failure([NSMutableArray arrayWithCapacity:4]);
+ [entry addObject:failure];
+ [failure addObject:[NSString stringWithUTF8String:start.DepType()]];
+
+ Package *package([self packageWithName:[NSString stringWithUTF8String:start.TargetPkg().Name()]]);
+ [failure addObject:[package name]];
+
+ pkgCache::PkgIterator target(start.TargetPkg());
+ if (target->ProvidesList != 0)
+ [failure addObject:@"?"];
+ else {
+ pkgCache::VerIterator ver(cache_[target].InstVerIter(cache_));
+ if (!ver.end())
+ [failure addObject:[NSString stringWithUTF8String:ver.VerStr()]];
+ else if (!cache_[target].CandidateVerIter(cache_).end())
+ [failure addObject:@"-"];
+ else if (target->ProvidesList == 0)
+ [failure addObject:@"!"];
+ else
+ [failure addObject:@"%"];
+ }
+
+ _forever {
+ if (start.TargetVer() != 0)
+ [failure addObject:[NSString stringWithFormat:@"%s %s", start.CompType(), start.TargetVer()]];
+ if (start == end)
+ break;
+ ++start;
+ }
+ }
+ }
+
+ return issues;
+}
+
+- (void) reloadData { _pooled
+ @synchronized (self) {
+ ++era_;
+ }
+
_error->Discard();
delete list_;
cache_.Close();
+ apr_pool_clear(pool_);
+ NSRecycleZone(zone_);
+
+ _trace();
if (!cache_.Open(progress_, true)) {
std::string error;
if (!_error->PopMessage(error))
_assert(false);
_error->Discard();
- fprintf(stderr, "cache_.Open():[%s]\n", error.c_str());
+ lprintf("cache_.Open():[%s]\n", error.c_str());
if (error == "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct the problem. ")
[delegate_ repairWithSelector:@selector(configure)];
return;
}
+ _trace();
now_ = [[NSDate date] retain];
}
[packages_ removeAllObjects];
+ _trace();
for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
- if (Package *package = [Package packageWithIterator:iterator database:self])
+ if (Package *package = [Package packageWithIterator:iterator withZone:zone_ inPool:pool_ database:self])
[packages_ addObject:package];
-
+ _trace();
[packages_ sortUsingSelector:@selector(compareByName:)];
+ _trace();
+
+ _config->Set("Acquire::http::Timeout", 15);
+ _config->Set("Acquire::http::MaxParallel", 4);
}
- (void) configure {
if (!cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)) {
std::string error;
while (_error->PopMessage(error))
- fprintf(stderr, "ArchiveCleaner: %s\n", error.c_str());
+ lprintf("ArchiveCleaner: %s\n", error.c_str());
}
}
std::string uri = (*item)->DescURI();
std::string error = (*item)->ErrorText;
- fprintf(stderr, "pAf:%s:%s\n", uri.c_str(), error.c_str());
+ lprintf("pAf:%s:%s\n", uri.c_str(), error.c_str());
failed = true;
[delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
- withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:error.c_str()], nil]
+ withObject:[NSArray arrayWithObjects:
+ [NSString stringWithUTF8String:error.c_str()],
+ nil]
waitUntilDone:YES
];
}
@end
/* }}} */
-/* Confirmation View {{{ */
-void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString *key) {
- if ([packages count] == 0)
- return;
-
- UITextView *text = GetTextView([packages count] == 0 ? @"n/a" : [packages componentsJoinedByString:@", "], 120, false);
- [fields setObject:text forKey:key];
-
- CGColor blue(space_, 0, 0, 0.4, 1);
- [text setTextColor:blue];
-}
-
-@protocol ConfirmationViewDelegate
-- (void) cancel;
-- (void) confirm;
-@end
-
-@interface ConfirmationView : UIView {
- Database *database_;
- id delegate_;
+/* PopUp Windows {{{ */
+@interface PopUpView : UIView {
+ _transient id delegate_;
UITransitionView *transition_;
UIView *overlay_;
- UINavigationBar *navbar_;
- UIPreferencesTable *table_;
- NSMutableDictionary *fields_;
- UIAlertSheet *essential_;
}
- (void) cancel;
-
-- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate;
+- (id) initWithView:(UIView *)view delegate:(id)delegate;
@end
-@implementation ConfirmationView
+@implementation PopUpView
- (void) dealloc {
- [navbar_ setDelegate:nil];
[transition_ setDelegate:nil];
- [table_ setDataSource:nil];
-
[transition_ release];
[overlay_ release];
- [navbar_ release];
- [table_ release];
- [fields_ release];
- if (essential_ != nil)
- [essential_ release];
[super dealloc];
}
- (void) cancel {
- [transition_ transition:7 toView:nil];
- [delegate_ cancel];
+ [transition_ transition:UITransitionPushFromTop toView:nil];
}
- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
[self removeFromSuperview];
}
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
- switch (button) {
- case 0:
- if (essential_ != nil)
- [essential_ popupAlertAnimated:YES];
- else
- [delegate_ confirm];
- break;
+- (id) initWithView:(UIView *)view delegate:(id)delegate {
+ if ((self = [super initWithFrame:[view bounds]]) != nil) {
+ delegate_ = delegate;
- case 1:
- [self cancel];
- break;
- }
+ transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
+ [self addSubview:transition_];
+
+ overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+
+ [view addSubview:self];
+
+ [transition_ setDelegate:self];
+
+ UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease];
+ [transition_ transition:UITransitionNone toView:blank];
+ [transition_ transition:UITransitionPushFromBottom toView:overlay_];
+ } return self;
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
- NSString *context = [sheet context];
+@end
+/* }}} */
- 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];
+#if 0
+/* Mail Composition {{{ */
+@interface MailToView : PopUpView {
+ MailComposeController *controller_;
+}
- [sheet dismiss];
+- (id) initWithView:(UIView *)view delegate:(id)delegate url:(NSURL *)url;
+
+@end
+
+@implementation MailToView
+
+- (void) dealloc {
+ [controller_ release];
+ [super dealloc];
}
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
- return 2;
+- (void) mailComposeControllerWillAttemptToSend:(MailComposeController *)controller {
+ NSLog(@"will");
}
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
- switch (group) {
- case 0: return @"Statistics";
- case 1: return @"Modifications";
+- (void) mailComposeControllerDidAttemptToSend:(MailComposeController *)controller mailDelivery:(id)delivery {
+ NSLog(@"did:%@", delivery);
+// [UIApp setStatusBarShowsProgress:NO];
+if ([controller error]){
+NSArray *buttons = [NSArray arrayWithObjects:CYLocalize("OK"), nil];
+UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:CYLocalize("ERROR") buttons:buttons defaultButtonIndex:0 delegate:self context:self];
+[mailAlertSheet setBodyText:[controller error]];
+[mailAlertSheet popupAlertAnimated:YES];
+}
+}
- default: _assert(false);
- }
+- (void) showError {
+ NSLog(@"%@", [controller_ error]);
+ NSArray *buttons = [NSArray arrayWithObjects:CYLocalize("OK"), nil];
+ UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:CYLocalize("ERROR") buttons:buttons defaultButtonIndex:0 delegate:self context:self];
+ [mailAlertSheet setBodyText:[controller_ error]];
+ [mailAlertSheet popupAlertAnimated:YES];
}
-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
- switch (group) {
- case 0: return 3;
- case 1: return [fields_ count];
+- (void) deliverMessage { _pooled
+ setuid(501);
+ setgid(501);
- default: _assert(false);
- }
+ if (![controller_ deliverMessage])
+ [self performSelectorOnMainThread:@selector(showError) withObject:nil waitUntilDone:NO];
}
-- (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) mailComposeControllerCompositionFinished:(MailComposeController *)controller {
+ if ([controller_ needsDelivery])
+ [NSThread detachNewThreadSelector:@selector(deliverMessage) toTarget:self withObject:nil];
+ else
+ [self cancel];
}
-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
- UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
- [cell setShowSelection:NO];
+- (id) initWithView:(UIView *)view delegate:(id)delegate url:(NSURL *)url {
+ if ((self = [super initWithView:view delegate:delegate]) != nil) {
+ controller_ = [[MailComposeController alloc] initForContentSize:[overlay_ bounds].size];
+ [controller_ setDelegate:self];
+ [controller_ initializeUI];
+ [controller_ setupForURL:url];
- switch (group) {
- case 0: switch (row) {
- case 0: {
- [cell setTitle:@"Downloading"];
- [cell setValue:SizeString([database_ fetcher].FetchNeeded())];
- } break;
+ UIView *view([controller_ view]);
+ [overlay_ addSubview:view];
+ } return self;
+}
- case 1: {
- [cell setTitle:@"Resuming At"];
- [cell setValue:SizeString([database_ fetcher].PartialPresent())];
- } break;
+@end
+/* }}} */
+#endif
+
+/* Confirmation View {{{ */
+bool DepSubstrate(const pkgCache::VerIterator &iterator) {
+ if (!iterator.end())
+ for (pkgCache::DepIterator dep(iterator.DependsList()); !dep.end(); ++dep) {
+ if (dep->Type != pkgCache::Dep::Depends && dep->Type != pkgCache::Dep::PreDepends)
+ continue;
+ pkgCache::PkgIterator package(dep.TargetPkg());
+ if (package.end())
+ continue;
+ if (strcmp(package.Name(), "mobilesubstrate") == 0)
+ return true;
+ }
+
+ return false;
+}
- case 2: {
- double size([database_ cache]->UsrSize());
+@protocol ConfirmationViewDelegate
+- (void) cancel;
+- (void) confirm;
+- (void) queue;
+@end
- if (size < 0) {
- [cell setTitle:@"Disk Freeing"];
- [cell setValue:SizeString(-size)];
- } else {
- [cell setTitle:@"Disk Using"];
- [cell setValue:SizeString(size)];
- }
- } break;
+@interface ConfirmationView : BrowserView {
+ _transient Database *database_;
+ UIActionSheet *essential_;
+ NSArray *changes_;
+ NSArray *issues_;
+ NSArray *sizes_;
+ BOOL substrate_;
+}
- default: _assert(false);
- } break;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
- case 1:
- _assert(size_t(row) < [fields_ count]);
- [cell setTitle:[[fields_ allKeys] objectAtIndex:row]];
- [cell addSubview:[[fields_ allValues] objectAtIndex:row]];
- break;
+@end
- default: _assert(false);
- }
+@implementation ConfirmationView
- return cell;
+- (void) dealloc {
+ [changes_ release];
+ if (issues_ != nil)
+ [issues_ release];
+ [sizes_ release];
+ if (essential_ != nil)
+ [essential_ release];
+ [super dealloc];
}
-- (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_];
+- (void) cancel {
+ [delegate_ cancel];
+ [book_ popFromSuperviewAnimated:YES];
+}
- overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+ NSString *context([sheet context]);
- CGSize navsize = [UINavigationBar defaultSize];
- CGRect navrect = {{0, 0}, navsize};
- CGRect bounds = [overlay_ bounds];
+ if ([context isEqualToString:@"remove"]) {
+ switch (button) {
+ case 1:
+ [self cancel];
+ break;
+ case 2:
+ if (substrate_)
+ Finish_ = 2;
+ [delegate_ confirm];
+ break;
+ default:
+ _assert(false);
+ }
- navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
- if (Advanced_)
- [navbar_ setBarStyle:1];
- [navbar_ setDelegate:self];
+ [sheet dismiss];
+ } else if ([context isEqualToString:@"unable"]) {
+ [self cancel];
+ [sheet dismiss];
+ } else
+ [super alertSheet:sheet buttonClicked:button];
+}
- UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease];
- [navbar_ pushNavigationItem:navitem];
- [navbar_ showButtonsWithLeftTitle:@"Cancel" rightTitle:@"Confirm"];
+- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+ [super webView:sender didClearWindowObject:window forFrame:frame];
+ [window setValue:changes_ forKey:@"changes"];
+ [window setValue:issues_ forKey:@"issues"];
+ [window setValue:sizes_ forKey:@"sizes"];
+}
- fields_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+ if ((self = [super initWithBook:book]) != nil) {
+ database_ = database;
NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16];
NSMutableArray *reinstalling = [NSMutableArray arrayWithCapacity:16];
bool remove(false);
+ pkgDepCache::Policy *policy([database_ policy]);
+
pkgCacheFile &cache([database_ cache]);
NSArray *packages = [database_ packages];
- for (size_t i(0), e = [packages count]; i != e; ++i) {
- Package *package = [packages objectAtIndex:i];
+ for (Package *package in packages) {
pkgCache::PkgIterator iterator = [package iterator];
pkgDepCache::StateCache &state(cache[iterator]);
if ([package essential])
remove = true;
[removing addObject:name];
- }
+ } else continue;
+
+ substrate_ |= DepSubstrate(policy->GetCandidateVer(iterator));
+ substrate_ |= DepSubstrate(iterator.CurrentVer());
}
if (!remove)
essential_ = nil;
else if (Advanced_ || true) {
- essential_ = [[UIAlertSheet alloc]
- initWithTitle:@"Removing Essentials"
+ NSString *parenthetical(CYLocalize("PARENTHETICAL"));
+
+ essential_ = [[UIActionSheet alloc]
+ initWithTitle:CYLocalize("REMOVING_ESSENTIALS")
buttons:[NSArray arrayWithObjects:
- @"Cancel Operation (Safe)",
- @"Force Removal (Unsafe)",
+ [NSString stringWithFormat:parenthetical, CYLocalize("CANCEL_OPERATION"), CYLocalize("SAFE")],
+ [NSString stringWithFormat:parenthetical, CYLocalize("FORCE_REMOVAL"), CYLocalize("UNSAFE")],
nil]
defaultButtonIndex:0
delegate:self
#ifndef __OBJC2__
[essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]];
#endif
- [essential_ setBodyText:@"This operation involves the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. If you continue, you may not be able to use Cydia to repair any damage."];
+ [essential_ setBodyText:CYLocalize("REMOVING_ESSENTIALS_EX")];
} else {
- essential_ = [[UIAlertSheet alloc]
- initWithTitle:@"Unable to Comply"
- buttons:[NSArray arrayWithObjects:@"Okay", nil]
+ essential_ = [[UIActionSheet alloc]
+ initWithTitle:CYLocalize("UNABLE_TO_COMPLY")
+ buttons:[NSArray arrayWithObjects:CYLocalize("OKAY"), nil]
defaultButtonIndex:0
delegate:self
context:@"unable"
];
- [essential_ setBodyText:@"This operation requires the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. In order to continue and force this operation you will need to be activate the Advanced mode under to continue and force this operation you will need to be activate the Advanced mode under Settings."];
+ [essential_ setBodyText:CYLocalize("UNABLE_TO_COMPLY_EX")];
}
- AddTextView(fields_, installing, @"Installing");
- AddTextView(fields_, reinstalling, @"Reinstalling");
- AddTextView(fields_, upgrading, @"Upgrading");
- AddTextView(fields_, downgrading, @"Downgrading");
- AddTextView(fields_, removing, @"Removing");
+ changes_ = [[NSArray alloc] initWithObjects:
+ installing,
+ reinstalling,
+ upgrading,
+ downgrading,
+ removing,
+ nil];
- table_ = [[UIPreferencesTable alloc] initWithFrame:CGRectMake(
- 0, navsize.height, bounds.size.width, bounds.size.height - navsize.height
- )];
+ issues_ = [database_ issues];
+ if (issues_ != nil)
+ issues_ = [issues_ retain];
- [table_ setReusesTableCells:YES];
- [table_ setDataSource:self];
- [table_ reloadData];
+ sizes_ = [[NSArray alloc] initWithObjects:
+ SizeString([database_ fetcher].FetchNeeded()),
+ SizeString([database_ fetcher].PartialPresent()),
+ SizeString([database_ cache]->UsrSize()),
+ nil];
- [overlay_ addSubview:navbar_];
- [overlay_ addSubview:table_];
+ [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"confirm" ofType:@"html"]]];
+ } return self;
+}
- [view addSubview:self];
+- (NSString *) backButtonTitle {
+ return CYLocalize("CONFIRM");
+}
- [transition_ setDelegate:self];
+- (NSString *) leftButtonTitle {
+ return [NSString stringWithFormat:CYLocalize("SLASH_DELIMITED"), CYLocalize("CANCEL"), CYLocalize("QUEUE")];
+}
- UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease];
- [transition_ transition:0 toView:blank];
- [transition_ transition:3 toView:overlay_];
- } return self;
+- (id) rightButtonTitle {
+ return issues_ != nil ? nil : [super rightButtonTitle];
+}
+
+- (id) _rightButtonTitle {
+#if AlwaysReload || IgnoreInstall
+ return [super _rightButtonTitle];
+#else
+ return CYLocalize("CONFIRM");
+#endif
+}
+
+- (void) _leftButtonClicked {
+ [self cancel];
+}
+
+#if !AlwaysReload
+- (void) _rightButtonClicked {
+#if IgnoreInstall
+ return [super _rightButtonClicked];
+#endif
+ if (essential_ != nil)
+ [essential_ popupAlertAnimated:YES];
+ else {
+ if (substrate_)
+ Finish_ = 2;
+ [delegate_ confirm];
+ }
}
+#endif
@end
/* }}} */
UIPushButton *close_;
id delegate_;
BOOL running_;
+ SHA1SumValue springlist_;
+ SHA1SumValue notifyconf_;
+ SHA1SumValue sandplate_;
}
- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
if (bootstrap_)
- [overlay_ setBackgroundColor:Black_];
+ [overlay_ setBackgroundColor:[UIColor blackColor]];
else {
background_ = [[UIView alloc] initWithFrame:[self bounds]];
- [background_ setBackgroundColor:Black_];
+ [background_ setBackgroundColor:[UIColor blackColor]];
[self addSubview:background_];
}
24
)];
- [status_ setColor:White_];
- [status_ setBackgroundColor:Clear_];
+ [status_ setColor:[UIColor whiteColor]];
+ [status_ setBackgroundColor:[UIColor clearColor]];
[status_ setCentersHorizontally:YES];
//[status_ setFont:font];
+ _trace();
output_ = [[UITextView alloc] initWithFrame:CGRectMake(
10,
bounds.size.width - 20,
bounds.size.height - navsize.height - 62 - navrect.size.height
)];
+ _trace();
//[output_ setTextFont:@"Courier New"];
[output_ setTextSize:12];
- [output_ setTextColor:White_];
- [output_ setBackgroundColor:Clear_];
+ [output_ setTextColor:[UIColor whiteColor]];
+ [output_ setBackgroundColor:[UIColor clearColor]];
[output_ setMarginTop:0];
[output_ setAllowsRubberBanding:YES];
[close_ setAutosizesToFit:NO];
[close_ setDrawsShadow:YES];
[close_ setStretchBackground:YES];
- [close_ setTitle:@"Return to Cydia"];
[close_ setEnabled:YES];
- GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+ UIFont *bold = [UIFont boldSystemFontOfSize:22];
[close_ setTitleFont:bold];
- CFRelease(bold);
[close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside];
[close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0];
[transition_ transition:6 toView:view_];
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
- NSString *context = [sheet context];
- if ([context isEqualToString:@"conffile"]) {
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+ NSString *context([sheet context]);
+
+ if ([context isEqualToString:@"error"])
+ [sheet dismiss];
+ else if ([context isEqualToString:@"conffile"]) {
FILE *input = [database_ input];
switch (button) {
default:
_assert(false);
}
- }
- [sheet dismiss];
+ [sheet dismiss];
+ }
}
- (void) closeButtonPushed {
- [delegate_ progressViewIsComplete:self];
- [self resetView];
+ running_ = NO;
+
+ switch (Finish_) {
+ case 0:
+ [self resetView];
+ break;
+
+ case 1:
+ [delegate_ suspendWithAnimation:YES];
+ break;
+
+ case 2:
+ system("launchctl stop com.apple.SpringBoard");
+ break;
+
+ case 3:
+ system("launchctl unload "SpringBoard_"; launchctl load "SpringBoard_);
+ break;
+
+ case 4:
+ system("reboot");
+ break;
+ }
}
- (void) _retachThread {
UINavigationItem *item = [navbar_ topItem];
- [item setTitle:@"Complete"];
+ [item setTitle:CYLocalize("COMPLETE")];
[overlay_ addSubview:close_];
[progress_ removeFromSuperview];
[status_ removeFromSuperview];
-#ifdef __OBJC2__
+ [delegate_ progressViewIsComplete:self];
+
+ if (Finish_ < 4) {
+ FileFd file(SandboxTemplate_, FileFd::ReadOnly);
+ MMap mmap(file, MMap::ReadOnly);
+ SHA1Summation sha1;
+ sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+ if (!(sandplate_ == sha1.Result()))
+ Finish_ = 4;
+ }
+
+ if (Finish_ < 4) {
+ FileFd file(NotifyConfig_, FileFd::ReadOnly);
+ MMap mmap(file, MMap::ReadOnly);
+ SHA1Summation sha1;
+ sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+ if (!(notifyconf_ == sha1.Result()))
+ Finish_ = 4;
+ }
+
+ if (Finish_ < 3) {
+ FileFd file(SpringBoard_, FileFd::ReadOnly);
+ MMap mmap(file, MMap::ReadOnly);
+ SHA1Summation sha1;
+ sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+ if (!(springlist_ == sha1.Result()))
+ Finish_ = 3;
+ }
+
+ switch (Finish_) {
+ case 0: [close_ setTitle:CYLocalize("RETURN_TO_CYDIA")]; break;
+ case 1: [close_ setTitle:CYLocalize("CLOSE_CYDIA")]; break;
+ case 2: [close_ setTitle:CYLocalize("RESTART_SPRINGBOARD")]; break;
+ case 3: [close_ setTitle:CYLocalize("RELOAD_SPRINGBOARD")]; break;
+ case 4: [close_ setTitle:CYLocalize("REBOOT_DEVICE")]; break;
+ }
+
+#define Cache_ "/User/Library/Caches/com.apple.mobile.installation.plist"
+
+ if (NSMutableDictionary *cache = [[NSMutableDictionary alloc] initWithContentsOfFile:@ Cache_]) {
+ [cache autorelease];
+
+ NSFileManager *manager = [NSFileManager defaultManager];
+ NSError *error = nil;
+
+ id system = [cache objectForKey:@"System"];
+ if (system == nil)
+ goto error;
+
+ struct stat info;
+ if (stat(Cache_, &info) == -1)
+ goto error;
+
+ [system removeAllObjects];
+
+ if (NSArray *apps = [manager contentsOfDirectoryAtPath:@"/Applications" error:&error]) {
+ for (NSString *app in apps)
+ if ([app hasSuffix:@".app"]) {
+ NSString *path = [@"/Applications" stringByAppendingPathComponent:app];
+ NSString *plist = [path stringByAppendingPathComponent:@"Info.plist"];
+ if (NSMutableDictionary *info = [[NSMutableDictionary alloc] initWithContentsOfFile:plist]) {
+ [info autorelease];
+ if ([info objectForKey:@"CFBundleIdentifier"] != nil) {
+ [info setObject:path forKey:@"Path"];
+ [info setObject:@"System" forKey:@"ApplicationType"];
+ [system addInfoDictionary:info];
+ }
+ }
+ }
+ } else goto error;
+
+ [cache writeToFile:@Cache_ atomically:YES];
+
+ if (chown(Cache_, info.st_uid, info.st_gid) == -1)
+ goto error;
+ if (chmod(Cache_, info.st_mode) == -1)
+ goto error;
+
+ if (false) error:
+ lprintf("%s\n", error == nil ? strerror(errno) : [[error localizedDescription] UTF8String]);
+ }
+
notify_post("com.apple.mobile.application_installed");
-#endif
[delegate_ setStatusBarShowsProgress:NO];
-
- running_ = NO;
}
-- (void) _detachNewThreadData:(ProgressData *)data {
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+- (void) _detachNewThreadData:(ProgressData *)data { _pooled
[[data target] performSelector:[data selector] withObject:[data object]];
[data release];
[self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES];
-
- [pool release];
}
- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title {
[delegate_ setStatusBarShowsProgress:YES];
running_ = YES;
+ {
+ FileFd file(SandboxTemplate_, FileFd::ReadOnly);
+ MMap mmap(file, MMap::ReadOnly);
+ SHA1Summation sha1;
+ sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+ sandplate_ = sha1.Result();
+ }
+
+ {
+ FileFd file(NotifyConfig_, FileFd::ReadOnly);
+ MMap mmap(file, MMap::ReadOnly);
+ SHA1Summation sha1;
+ sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+ notifyconf_ = sha1.Result();
+ }
+
+ {
+ FileFd file(SpringBoard_, FileFd::ReadOnly);
+ MMap mmap(file, MMap::ReadOnly);
+ SHA1Summation sha1;
+ sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+ springlist_ = sha1.Result();
+ }
+
[transition_ transition:6 toView:overlay_];
[NSThread
detachNewThreadSelector:selector
toTarget:database_
withObject:nil
- title:@"Repairing..."
+ title:CYLocalize("REPAIRING")
];
}
- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
Package *package = id == nil ? nil : [database_ packageWithName:id];
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:(package == nil ? @"Source Error" : [package name])
- buttons:[NSArray arrayWithObjects:@"Okay", nil]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:(package == nil ? id : [package name])
+ buttons:[NSArray arrayWithObjects:CYLocalize("OKAY"), nil]
defaultButtonIndex:0
delegate:self
context:@"error"
];
}
+- (void) startProgress {
+}
+
- (void) addProgressOutput:(NSString *)output {
[self
performSelectorOnMainThread:@selector(_addProgressOutput:)
];
}
+- (bool) isCancelling:(size_t)received {
+ return false;
+}
+
- (void) _setConfigurationData:(NSString *)data {
static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
NSString *ofile = conffile_r[1];
//NSString *nfile = conffile_r[2];
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:@"Configuration Upgrade"
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:CYLocalize("CONFIGURATION_UPGRADE")
buttons:[NSArray arrayWithObjects:
- @"Keep My Old Copy",
- @"Accept The New Copy",
- // XXX: @"See What Changed",
+ CYLocalize("KEEP_OLD_COPY"),
+ CYLocalize("ACCEPT_NEW_COPY"),
+ // XXX: CYLocalize("SEE_WHAT_CHANGED"),
nil]
defaultButtonIndex:0
delegate:self
context:@"conffile"
] autorelease];
- [sheet setBodyText:[NSString stringWithFormat:
- @"The following file has been changed by both the package maintainer and by you (or for you by a script).\n\n%@"
- , ofile]];
-
+ [sheet setBodyText:[NSString stringWithFormat:@"%@\n\n%@", CYLocalize("CONFIGURATION_UPGRADE_EX"), ofile]];
[sheet popupAlertAnimated:YES];
}
- (void) _setProgressTitle:(NSString *)title {
- [status_ setText:[title stringByAppendingString:@"..."]];
+ NSMutableArray *words([[title componentsSeparatedByString:@" "] mutableCopy]);
+ for (size_t i(0), e([words count]); i != e; ++i) {
+ NSString *word([words objectAtIndex:i]);
+ if (Package *package = [database_ packageWithName:word])
+ [words replaceObjectAtIndex:i withObject:[package name]];
+ }
+
+ [status_ setText:[words componentsJoinedByString:@" "]];
}
- (void) _setProgressPercent:(NSNumber *)percent {
/* }}} */
/* Package Cell {{{ */
-@interface PackageCell : UISimpleTableCell {
+@interface PackageCell : UITableCell {
UIImage *icon_;
NSString *name_;
NSString *description_;
+ bool commercial_;
NSString *source_;
- //UIImageView *trusted_;
+ UIImage *badge_;
+ bool cached_;
+ Package *package_;
#ifdef USE_BADGES
- UIImageView *badge_;
UITextLabel *status_;
#endif
- BOOL setup_;
}
- (PackageCell *) init;
[source_ release];
source_ = nil;
}
+
+ if (badge_ != nil) {
+ [badge_ release];
+ badge_ = nil;
+ }
+
+ [package_ release];
+ package_ = nil;
}
- (void) dealloc {
[self clearPackage];
#ifdef USE_BADGES
- [badge_ release];
[status_ release];
#endif
- //[trusted_ release];
[super dealloc];
}
- (PackageCell *) init {
if ((self = [super init]) != nil) {
#ifdef USE_BADGES
- badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
-
status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];
- [status_ setBackgroundColor:Clear_];
+ [status_ setBackgroundColor:[UIColor clearColor]];
[status_ setFont:small];
#endif
} return self;
}
- (void) setPackage:(Package *)package {
- /*if (setup_)
- return;
- else
- setup_ = YES;*/
+ [self clearPackage];
Source *source = [package source];
- icon_ = nil;
- if (NSString *icon = [package icon])
- icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];
- if (icon_ == nil) if (NSString *section = [package section])
- icon_ = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sections/%@.png", Simplify(section)]];
- /*if (icon_ == nil) if (NSString *icon = [source defaultIcon])
- icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];*/
- if (icon_ == nil)
- icon_ = [UIImage applicationImageNamed:@"unknown.png"];
-
- icon_ = [icon_ retain];
-
+ icon_ = [[package icon] retain];
name_ = [[package name] retain];
description_ = [[package tagline] retain];
+ commercial_ = [package isCommercial];
+
+ package_ = [package retain];
NSString *label = nil;
bool trusted = false;
label = [source label];
trusted = [source trusted];
} else if ([[package id] isEqualToString:@"firmware"])
- label = @"Apple";
+ label = CYLocalize("APPLE");
else
- label = @"Unknown/Local";
+ label = [NSString stringWithFormat:CYLocalize("SLASH_DELIMITED"), CYLocalize("UNKNOWN"), CYLocalize("LOCAL")];
- NSString *from = [NSString stringWithFormat:@"from %@", label];
+ NSString *from(label);
- NSString *section = Simplify([package section]);
- if (section != nil && ![section isEqualToString:label])
- from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]];
+ NSString *section = [package simpleSection];
+ if (section != nil && ![section isEqualToString:label]) {
+ section = [[NSBundle mainBundle] localizedStringForKey:section value:nil table:@"Sections"];
+ from = [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), from, section];
+ }
+ from = [NSString stringWithFormat:CYLocalize("FROM"), label];
source_ = [from retain];
-#ifdef USE_BADGES
- [badge_ removeFromSuperview];
- [status_ removeFromSuperview];
+ if (NSString *purpose = [package primaryPurpose])
+ if ((badge_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Purposes/%@.png", App_, purpose]]) != nil)
+ badge_ = [badge_ retain];
+#ifdef USE_BADGES
if (NSString *mode = [package mode]) {
[badge_ setImage:[UIImage applicationImageNamed:
- [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png"
+ [mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"] ? @"removing.png" : @"installing.png"
]];
- [status_ setText:[NSString stringWithFormat:@"Queued for %@", mode]];
- [status_ setColor:Blueish_];
+ [status_ setText:[NSString stringWithFormat:CYLocalize("QUEUED_FOR"), CYLocalize(mode)]];
+ [status_ setColor:[UIColor colorWithCGColor:Blueish_]];
} else if ([package half]) {
[badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
- [status_ setText:@"Package Damaged"];
- [status_ setColor:Red_];
+ [status_ setText:CYLocalize("PACKAGE_DAMAGED")];
+ [status_ setColor:[UIColor redColor]];
} else {
[badge_ setImage:nil];
[status_ setText:nil];
- goto done;
}
-
- [self addSubview:badge_];
- [self addSubview:status_];
- done:;
#endif
+
+ cached_ = false;
+}
+
+- (void) drawRect:(CGRect)rect {
+ if (!cached_) {
+ UIColor *color;
+
+ if (NSString *mode = [package_ mode]) {
+ bool remove([mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"]);
+ color = remove ? RemovingColor_ : InstallingColor_;
+ } else
+ color = [UIColor whiteColor];
+
+ [self setBackgroundColor:color];
+ cached_ = true;
+ }
+
+ [super drawRect:rect];
+}
+
+- (void) drawBackgroundInRect:(CGRect)rect withFade:(float)fade {
+ if (fade == 0) {
+ CGContextRef context(UIGraphicsGetCurrentContext());
+ [[self backgroundColor] set];
+ CGRect back(rect);
+ back.size.height -= 1;
+ CGContextFillRect(context, back);
+ }
+
+ [super drawBackgroundInRect:rect withFade:fade];
}
- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
- if (icon_ != nil)
- [icon_ drawInRect:CGRectMake(10, 10, 30, 30)];
+ if (icon_ != nil) {
+ CGRect rect;
+ rect.size = [icon_ size];
+
+ rect.size.width /= 2;
+ rect.size.height /= 2;
+
+ rect.origin.x = 25 - rect.size.width / 2;
+ rect.origin.y = 25 - rect.size.height / 2;
+
+ [icon_ drawInRect:rect];
+ }
+
+ if (badge_ != nil) {
+ CGSize size = [badge_ size];
+
+ [badge_ drawAtPoint:CGPointMake(
+ 36 - size.width / 2,
+ 36 - size.height / 2
+ )];
+ }
if (selected)
UISetColor(White_);
if (!selected)
- UISetColor(Black_);
+ UISetColor(commercial_ ? Purple_ : Black_);
[name_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2];
[source_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2];
if (!selected)
- UISetColor(Gray_);
+ UISetColor(commercial_ ? Purplish_ : Gray_);
[description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
[super drawContentInRect:rect selected:selected];
}
+- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
+ cached_ = false;
+ [super setSelected:selected withFade:fade];
+}
+
+ (int) heightForPackage:(Package *)package {
NSString *tagline([package tagline]);
int height = tagline == nil || [tagline length] == 0 ? -17 : 0;
NSString *name_;
NSString *count_;
UIImage *icon_;
- UISwitchControl *switch_;
+ _UISwitchSlider *switch_;
BOOL editing_;
}
if ((self = [super init]) != nil) {
icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain];
- switch_ = [[UISwitchControl alloc] initWithFrame:CGRectMake(218, 9, 60, 25)];
+ switch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(218, 9, 60, 25)];
[switch_ addTarget:self action:@selector(onSwitch:) forEvents:kUIControlEventMouseUpInside];
} return self;
}
[self clearSection];
if (section == nil) {
- name_ = [@"All Packages" retain];
+ name_ = [CYLocalize("ALL_PACKAGES") retain];
count_ = nil;
} else {
section_ = [section name];
if (section_ != nil)
section_ = [section_ retain];
- name_ = [(section_ == nil ? @"(No Section)" : section_) retain];
+ name_ = [(section_ == nil ? CYLocalize("NO_SECTION") : section_) retain];
count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
if (editing_)
- [switch_ setValue:isSectionVisible(section_) animated:NO];
+ [switch_ setValue:(isSectionVisible(section_) ? 1 : 0) animated:NO];
}
}
UISetColor(White_);
if (count_ != nil)
- [count_ drawAtPoint:CGPointMake(12 + (29 - size.width) / 2, 15) withFont:Font12Bold_];
+ [count_ drawAtPoint:CGPointMake(13 + (29 - size.width) / 2, 16) withFont:Font12Bold_];
[super drawContentInRect:rect selected:selected];
}
- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
if (reusing == nil) {
reusing = [[[UIImageAndTextTableCell alloc] init] autorelease];
- GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+ UIFont *font = [UIFont systemFontOfSize:16];
[[(UIImageAndTextTableCell *)reusing titleTextLabel] setFont:font];
- CFRelease(font);
}
[(UIImageAndTextTableCell *)reusing setTitle:[files_ objectAtIndex:row]];
return reusing;
[self addSubview:list_];
UITableColumn *column = [[[UITableColumn alloc]
- initWithTitle:@"Name"
+ initWithTitle:CYLocalize("NAME")
identifier:@"name"
width:[self frame].size.width
] autorelease];
package_ = [package retain];
name_ = [[package id] retain];
- NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_];
-
- {
- std::ifstream fin([path UTF8String]);
- std::string line;
- while (std::getline(fin, line))
- [files_ addObject:[NSString stringWithUTF8String:line.c_str()]];
- }
+ if (NSArray *files = [package files])
+ [files_ addObjectsFromArray:files];
if ([files_ count] != 0) {
if ([[files_ objectAtIndex:0] isEqualToString:@"/."])
}
- (NSString *) title {
- return @"Installed Files";
+ return CYLocalize("INSTALLED_FILES");
}
- (NSString *) backButtonTitle {
- return @"Files";
+ return CYLocalize("FILES");
}
@end
/* }}} */
/* Package View {{{ */
-@protocol PackageViewDelegate
-- (void) performPackage:(Package *)package;
-@end
-
-@interface PackageView : RVPage {
+@interface PackageView : BrowserView {
_transient Database *database_;
- UIPreferencesTable *table_;
Package *package_;
NSString *name_;
- UITextView *description_;
+ bool commercial_;
NSMutableArray *buttons_;
}
@implementation PackageView
- (void) dealloc {
- [table_ setDataSource:nil];
- [table_ setDelegate:nil];
-
if (package_ != nil)
[package_ release];
if (name_ != nil)
[name_ release];
- if (description_ != nil)
- [description_ release];
- [table_ release];
[buttons_ release];
[super dealloc];
}
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
- int number = 2;
- if ([package_ installed] != nil)
- ++number;
- if ([package_ source] != nil)
- ++number;
- return number;
-}
+/*- (void) release {
+ if ([self retainCount] == 1)
+ [delegate_ setPackageView:self];
+ [super release];
+}*/
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
- if (group-- == 0)
- return nil;
- else if ([package_ installed] != nil && group-- == 0)
- return @"Installed Package";
- else if (group-- == 0)
- return @"Package Details";
- else if ([package_ source] != nil && group-- == 0)
- return @"Source Information";
+/* XXX: this is not safe at all... localization of /fail/ */
+- (void) _clickButtonWithName:(NSString *)name {
+ if ([name isEqualToString:CYLocalize("CLEAR")])
+ [delegate_ clearPackage:package_];
+ else if ([name isEqualToString:CYLocalize("INSTALL")])
+ [delegate_ installPackage:package_];
+ else if ([name isEqualToString:CYLocalize("REINSTALL")])
+ [delegate_ installPackage:package_];
+ else if ([name isEqualToString:CYLocalize("REMOVE")])
+ [delegate_ removePackage:package_];
+ else if ([name isEqualToString:CYLocalize("UPGRADE")])
+ [delegate_ installPackage:package_];
else _assert(false);
}
-- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
- if (description_ == nil || group != 0 || row != ([package_ author] == nil ? 1 : 2))
- return proposed;
- else
- return [description_ visibleTextRect].size.height + TextViewOffset_;
-}
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+ NSString *context([sheet context]);
-- (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);
-}
-
-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
- UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
- [cell setShowSelection:NO];
-
- if (group-- == 0) {
- if (false) {
- } else if (row-- == 0) {
- [cell setTitle:[package_ name]];
- [cell setValue:[package_ latest]];
- } else if ([package_ author] != nil && row-- == 0) {
- [cell setTitle:@"Author"];
- [cell setValue:[[package_ author] name]];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- } else if (description_ != nil && row-- == 0) {
- [cell addSubview:description_];
- } else if ([package_ website] != nil && row-- == 0) {
- [cell setTitle:@"More Information"];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- } else _assert(false);
- } else if ([package_ installed] != nil && group-- == 0) {
- if (false) {
- } else if (row-- == 0) {
- [cell setTitle:@"Version"];
- NSString *installed([package_ installed]);
- [cell setValue:(installed == nil ? @"n/a" : installed)];
- } else if (row-- == 0) {
- [cell setTitle:@"Filesystem Content"];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- } else _assert(false);
- } else if (group-- == 0) {
- if (false) {
- } else if (row-- == 0) {
- [cell setTitle:@"Identifier"];
- [cell setValue:[package_ id]];
- } else if (row-- == 0) {
- [cell setTitle:@"Section"];
- NSString *section([package_ section]);
- [cell setValue:(section == nil ? @"n/a" : section)];
- } else if ([package_ size] != 0 && row-- == 0) {
- [cell setTitle:@"Expanded Size"];
- [cell setValue:SizeString([package_ size])];
- } else if ([package_ maintainer] != nil && row-- == 0) {
- [cell setTitle:@"Maintainer"];
- [cell setValue:[[package_ maintainer] name]];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- } else if ([package_ 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);
+ if ([context isEqualToString:@"modify"]) {
+ int count = [buttons_ count];
+ _assert(count != 0);
+ _assert(button <= count + 1);
- return cell;
-}
+ if (count != button - 1)
+ [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];
-- (BOOL) canSelectRow:(int)row {
- return YES;
+ [sheet dismiss];
+ } else
+ [super alertSheet:sheet buttonClicked:button];
}
-- (void) tableRowSelected:(NSNotification *)notification {
- int row = [table_ selectedRow];
- if (row == INT_MAX)
- return;
-
- #define _else else goto _label; return; } _label:
-
- if (true) {
- if (row-- == 0) {
- } else if (row-- == 0) {
- } else if ([package_ author] != nil && row-- == 0) {
- [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
- [[package_ author] email],
- [[NSString stringWithFormat:@"regarding apt package \"%@\"",
- [package_ name]
- ] stringByAddingPercentEscapes]
- ]]];
- } else if (description_ != nil && row-- == 0) {
- } else if ([package_ website] != nil && row-- == 0) {
- NSURL *url = [NSURL URLWithString:[package_ website]];
- BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
- [browser setDelegate:delegate_];
- [book_ pushPage:browser];
- [browser loadURL:url];
- } _else if ([package_ installed] != nil) {
- if (row-- == 0) {
- } else if (row-- == 0) {
- } else if (row-- == 0) {
- FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
- [files setDelegate:delegate_];
- [files setPackage:package_];
- [book_ pushPage:files];
- } _else if (true) {
- if (row-- == 0) {
- } else if (row-- == 0) {
- } else if (row-- == 0) {
- } else if ([package_ size] != 0 && row-- == 0) {
- } else if ([package_ maintainer] != nil && row-- == 0) {
- [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
- [[package_ maintainer] email],
- [[NSString stringWithFormat:@"regarding apt package \"%@\"",
- [package_ name]
- ] stringByAddingPercentEscapes]
- ]]];
- } else if ([package_ 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) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
+ return [super webView:sender didFinishLoadForFrame:frame];
}
-- (void) _clickButtonWithName:(NSString *)name {
- if ([name isEqualToString:@"Install"])
- [delegate_ installPackage:package_];
- else if ([name isEqualToString:@"Reinstall"])
- [delegate_ installPackage:package_];
- else if ([name isEqualToString:@"Remove"])
- [delegate_ removePackage:package_];
- else if ([name isEqualToString:@"Upgrade"])
- [delegate_ installPackage:package_];
- else _assert(false);
+- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+ [super webView:sender didClearWindowObject:window forFrame:frame];
+ [window setValue:package_ forKey:@"package"];
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
- int count = [buttons_ count];
- _assert(count != 0);
- _assert(button <= count + 1);
-
- if (count != button - 1)
- [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];
-
- [sheet dismiss];
+- (bool) _allowJavaScriptPanel {
+ return commercial_;
}
-- (void) _rightButtonClicked {
+#if !AlwaysReload
+- (void) __rightButtonClicked {
int count = [buttons_ count];
_assert(count != 0);
else {
NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)];
[buttons addObjectsFromArray:buttons_];
- [buttons addObject:@"Cancel"];
+ [buttons addObject:CYLocalize("CANCEL")];
- [delegate_ slideUp:[[[UIAlertSheet alloc]
+ [delegate_ slideUp:[[[UIActionSheet alloc]
initWithTitle:nil
buttons:buttons
- defaultButtonIndex:2
+ defaultButtonIndex:([buttons count] - 1)
delegate:self
- context:@"manage"
+ context:@"modify"
] autorelease]];
}
}
-- (NSString *) rightButtonTitle {
+- (void) _rightButtonClicked {
+ if (commercial_)
+ [super _rightButtonClicked];
+ else
+ [self __rightButtonClicked];
+}
+#endif
+
+- (id) _rightButtonTitle {
int count = [buttons_ count];
- return count == 0 ? nil : count != 1 ? @"Modify" : [buttons_ objectAtIndex:0];
+ return count == 0 ? nil : count != 1 ? CYLocalize("MODIFY") : [buttons_ objectAtIndex:0];
}
-- (NSString *) title {
+- (NSString *) backButtonTitle {
return @"Details";
}
- (id) initWithBook:(RVBook *)book database:(Database *)database {
if ((self = [super initWithBook:book]) != nil) {
database_ = database;
-
- table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]];
- [self addSubview:table_];
-
- [table_ setDataSource:self];
- [table_ setDelegate:self];
-
buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
+ [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]];
} return self;
}
name_ = nil;
}
- if (description_ != nil) {
- [description_ release];
- description_ = nil;
- }
-
[buttons_ removeAllObjects];
if (package != nil) {
package_ = [package retain];
name_ = [[package id] retain];
+ commercial_ = [package isCommercial];
- NSString *description([package description]);
- if (description == nil)
- description = [package tagline];
- if (description != nil) {
- description_ = [GetTextView(description, 12, true) retain];
- [description_ setTextColor:Black_];
- }
-
- [table_ reloadData];
-
+ if ([package_ mode] != nil)
+ [buttons_ addObject:CYLocalize("CLEAR")];
if ([package_ source] == nil);
else if ([package_ upgradableAndEssential:NO])
- [buttons_ addObject:@"Upgrade"];
+ [buttons_ addObject:CYLocalize("UPGRADE")];
else if ([package_ installed] == nil)
- [buttons_ addObject:@"Install"];
+ [buttons_ addObject:CYLocalize("INSTALL")];
else
- [buttons_ addObject:@"Reinstall"];
+ [buttons_ addObject:CYLocalize("REINSTALL")];
if ([package_ installed] != nil)
- [buttons_ addObject:@"Remove"];
+ [buttons_ addObject:CYLocalize("REMOVE")];
+
+ if (special_ != NULL) {
+ CGRect frame([webview_ frame]);
+ frame.size.width = 320;
+ frame.size.height = 0;
+ [webview_ setFrame:frame];
+
+ [scroller_ scrollPointVisibleAtTopLeft:CGPointZero];
+
+ WebThreadLock();
+ [[[webview_ webView] windowScriptObject] setValue:package_ forKey:@"package"];
+
+ [self setButtonTitle:nil withStyle:nil toFunction:nil];
+
+ [self setFinishHook:nil];
+ [self setPopupHook:nil];
+ WebThreadUnlock();
+
+ [super callFunction:special_];
+ }
}
+
+ [self reloadButtons];
}
-- (void) resetViewAnimated:(BOOL)animated {
- [table_ resetViewAnimated:animated];
+- (bool) isLoading {
+ return commercial_ ? [super isLoading] : false;
}
- (void) reloadData {
[self setPackage:[database_ packageWithName:name_]];
- [self reloadButtons];
}
@end
@interface PackageTable : RVPage {
_transient Database *database_;
NSString *title_;
- SEL filter_;
- id object_;
NSMutableArray *packages_;
NSMutableArray *sections_;
UISectionList *list_;
}
-- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object;
+- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title;
- (void) setDelegate:(id)delegate;
-- (void) setObject:(id)object;
- (void) reloadData;
- (void) resetCursor;
[list_ setDataSource:nil];
[title_ release];
- if (object_ != nil)
- [object_ release];
[packages_ release];
[sections_ release];
[list_ release];
return;
Package *package = [packages_ objectAtIndex:row];
- PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
- [view setDelegate:delegate_];
+ package = [database_ packageWithName:[package id]];
+ PackageView *view([delegate_ packageView]);
[view setPackage:package];
+ [view setDelegate:delegate_];
[book_ pushPage:view];
}
-- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
+- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title {
if ((self = [super initWithBook:book]) != nil) {
database_ = database;
title_ = [title retain];
- filter_ = filter;
- object_ = object == nil ? nil : [object retain];
packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
[list_ setDataSource:self];
UITableColumn *column = [[[UITableColumn alloc]
- initWithTitle:@"Name"
+ initWithTitle:CYLocalize("NAME")
identifier:@"name"
width:[self frame].size.width
] autorelease];
[table setReusesTableCells:YES];
[self addSubview:list_];
- [self reloadData];
+
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
delegate_ = delegate;
}
-- (void) setObject:(id)object {
- if (object_ != nil)
- [object_ release];
- if (object == nil)
- object_ = nil;
- else
- object_ = [object retain];
+- (bool) hasPackage:(Package *)package {
+ return true;
}
- (void) reloadData {
[packages_ removeAllObjects];
[sections_ removeAllObjects];
- for (size_t i(0); i != [packages count]; ++i) {
- Package *package([packages objectAtIndex:i]);
- if ([[package performSelector:filter_ withObject:object_] boolValue])
- [packages_ addObject:package];
- }
+ _profile(PackageTable$reloadData$Filter)
+ for (Package *package in packages)
+ if ([self hasPackage:package])
+ [packages_ addObject:package];
+ _end
Section *section = nil;
- for (size_t offset(0); offset != [packages_ count]; ++offset) {
- Package *package = [packages_ objectAtIndex:offset];
- NSString *name = [package index];
+ _profile(PackageTable$reloadData$Section)
+ for (size_t offset(0), end([packages_ count]); offset != end; ++offset) {
+ Package *package;
+ unichar index;
- if (section == nil || ![[section name] isEqualToString:name]) {
- section = [[[Section alloc] initWithName:name row:offset] autorelease];
- [sections_ addObject:section];
- }
+ _profile(PackageTable$reloadData$Section$Package)
+ package = [packages_ objectAtIndex:offset];
+ index = [package index];
+ _end
- [section addToCount];
- }
+ if (section == nil || [section index] != index) {
+ _profile(PackageTable$reloadData$Section$Allocate)
+ section = [[[Section alloc] initWithIndex:index row:offset] autorelease];
+ _end
- [list_ reloadData];
+ _profile(PackageTable$reloadData$Section$Add)
+ [sections_ addObject:section];
+ _end
+ }
+
+ [section addToCount];
+ }
+ _end
+
+ _profile(PackageTable$reloadData$List)
+ [list_ reloadData];
+ _end
}
- (NSString *) title {
[list_ setShouldHideHeaderInShortLists:hide];
}
+@end
+/* }}} */
+/* Filtered Package Table {{{ */
+@interface FilteredPackageTable : PackageTable {
+ SEL filter_;
+ IMP imp_;
+ id object_;
+}
+
+- (void) setObject:(id)object;
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object;
+
+@end
+
+@implementation FilteredPackageTable
+
+- (void) dealloc {
+ if (object_ != nil)
+ [object_ release];
+ [super dealloc];
+}
+
+- (void) setObject:(id)object {
+ if (object_ != nil)
+ [object_ release];
+ if (object == nil)
+ object_ = nil;
+ else
+ object_ = [object retain];
+}
+
+- (bool) hasPackage:(Package *)package {
+ _profile(FilteredPackageTable$hasPackage)
+ return [package valid] && (*reinterpret_cast<bool (*)(id, SEL, id)>(imp_))(package, filter_, object_);
+ _end
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
+ if ((self = [super initWithBook:book database:database title:title]) != nil) {
+ filter_ = filter;
+ object_ = object == nil ? nil : [object retain];
+
+ /* XXX: this is an unsafe optimization of doomy hell */
+ Method method = class_getInstanceMethod([Package class], filter);
+ imp_ = method_getImplementation(method);
+ _assert(imp_ != NULL);
+
+ [self reloadData];
+ } return self;
+}
+
@end
/* }}} */
_transient Database *database_;
UISectionList *list_;
NSMutableArray *sources_;
- UIAlertSheet *alert_;
+ UIActionSheet *alert_;
int offset_;
NSString *href_;
- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
switch (section + (offset_ == 0 ? 1 : 0)) {
- case 0: return @"Entered by User";
- case 1: return @"Installed by Packages";
+ case 0: return CYLocalize("ENTERED_BY_USER");
+ case 1: return CYLocalize("INSTALLED_BY_PACKAGE");
default:
_assert(false);
Source *source = [sources_ objectAtIndex:row];
- PackageTable *packages = [[[PackageTable alloc]
+ PackageTable *packages = [[[FilteredPackageTable alloc]
initWithBook:book_
database:database_
title:[source label]
[delegate_ syncData];
}
+- (void) complete {
+ [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys:
+ @"deb", @"Type",
+ href_, @"URI",
+ @"./", @"Distribution",
+ nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]];
+
+ [delegate_ syncData];
+}
+
+- (NSString *) getWarning {
+ NSString *href(href_);
+ NSRange colon([href rangeOfString:@"://"]);
+ if (colon.location != NSNotFound)
+ href = [href substringFromIndex:(colon.location + 3)];
+ href = [href stringByAddingPercentEscapes];
+ href = [@"http://cydia.saurik.com/api/repotag/" stringByAppendingString:href];
+ href = [href stringByCachingURLWithCurrentCDN];
+
+ NSURL *url([NSURL URLWithString:href]);
+
+ NSStringEncoding encoding;
+ NSError *error(nil);
+
+ if (NSString *warning = [NSString stringWithContentsOfURL:url usedEncoding:&encoding error:&error])
+ return [warning length] == 0 ? nil : warning;
+ return nil;
+}
+
- (void) _endConnection:(NSURLConnection *)connection {
NSURLConnection **field = NULL;
if (connection == trivial_bz2_)
trivial_bz2_ == nil &&
trivial_gz_ == nil
) {
- [delegate_ setStatusBarShowsProgress:NO];
-
- [hud_ show:NO];
- [hud_ removeFromSuperview];
- [hud_ autorelease];
- hud_ = nil;
+ bool defer(false);
if (trivial_) {
- [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys:
- @"deb", @"Type",
- href_, @"URI",
- @"./", @"Distribution",
- nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]];
-
- [delegate_ syncData];
+ if (NSString *warning = [self yieldToSelector:@selector(getWarning)]) {
+ defer = true;
+
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:CYLocalize("SOURCE_WARNING")
+ buttons:[NSArray arrayWithObjects:CYLocalize("ADD_ANYWAY"), CYLocalize("CANCEL"), nil]
+ defaultButtonIndex:0
+ delegate:self
+ context:@"warning"
+ ] autorelease];
+
+ [sheet setNumberOfRows:1];
+
+ [sheet setBodyText:warning];
+ [sheet popupAlertAnimated:YES];
+ } else
+ [self complete];
} else if (error_ != nil) {
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:@"Verification Error"
- buttons:[NSArray arrayWithObjects:@"OK", nil]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:CYLocalize("VERIFICATION_ERROR")
+ buttons:[NSArray arrayWithObjects:CYLocalize("OK"), nil]
defaultButtonIndex:0
delegate:self
context:@"urlerror"
[sheet setBodyText:[error_ localizedDescription]];
[sheet popupAlertAnimated:YES];
} else {
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:@"Did not Find Repository"
- buttons:[NSArray arrayWithObjects:@"OK", nil]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:CYLocalize("NOT_REPOSITORY")
+ buttons:[NSArray arrayWithObjects:CYLocalize("OK"), nil]
defaultButtonIndex:0
delegate:self
context:@"trivial"
] autorelease];
- [sheet setBodyText:@"The indicated repository could not be found. This could be because you are trying to add a legacy Installer repository (these are not supported). Also, this interface is only capable of working with exact repository URLs. If you host a repository and are having issues please contact the author of Cydia with any questions you have."];
+ [sheet setBodyText:CYLocalize("NOT_REPOSITORY_EX")];
[sheet popupAlertAnimated:YES];
}
- [href_ release];
- href_ = nil;
+ [delegate_ setStatusBarShowsProgress:NO];
+ [delegate_ removeProgressHUD:hud_];
+
+ [hud_ autorelease];
+ hud_ = nil;
+
+ if (!defer) {
+ [href_ release];
+ href_ = nil;
+ }
if (error_ != nil) {
[error_ release];
}
- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
- fprintf(stderr, "connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]);
+ lprintf("connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]);
if (error_ != nil)
error_ = [error retain];
[self _endConnection:connection];
[request setHTTPMethod:method];
+ if (Machine_ != NULL)
+ [request setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
+ if (UniqueID_ != nil)
+ [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"];
+
+ if (Role_ != nil)
+ [request setValue:Role_ forHTTPHeaderField:@"X-Role"];
+
return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
- NSString *context = [sheet context];
- if ([context isEqualToString:@"source"])
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+ NSString *context([sheet context]);
+
+ if ([context isEqualToString:@"source"]) {
switch (button) {
case 1: {
NSString *href = [[sheet textField] text];
trivial_ = false;
- hud_ = [delegate_ addProgressHUD];
- [hud_ setText:@"Verifying URL"];
+ hud_ = [[delegate_ addProgressHUD] retain];
+ [hud_ setText:CYLocalize("VERIFYING_URL")];
} break;
case 2:
_assert(false);
}
- [sheet dismiss];
+ [sheet dismiss];
+ } else if ([context isEqualToString:@"trivial"])
+ [sheet dismiss];
+ else if ([context isEqualToString:@"urlerror"])
+ [sheet dismiss];
+ else if ([context isEqualToString:@"warning"]) {
+ switch (button) {
+ case 1:
+ [self complete];
+ break;
+
+ case 2:
+ break;
+
+ default:
+ _assert(false);
+ }
+
+ [href_ release];
+ href_ = nil;
+
+ [sheet dismiss];
+ }
}
- (id) initWithBook:(RVBook *)book database:(Database *)database {
[list_ setDataSource:self];
UITableColumn *column = [[UITableColumn alloc]
- initWithTitle:@"Name"
+ initWithTitle:CYLocalize("NAME")
identifier:@"name"
width:[self frame].size.width
];
[table setDelegate:self];
[self reloadData];
+
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
[sources_ removeAllObjects];
[sources_ addObjectsFromArray:[database_ sources]];
+ _trace();
[sources_ sortUsingSelector:@selector(compareByNameAndType:)];
+ _trace();
int count = [sources_ count];
for (offset_ = 0; offset_ != count; ++offset_) {
database:database_
] autorelease]];*/
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:@"Enter Cydia/APT URL"
- buttons:[NSArray arrayWithObjects:@"Add Source", @"Cancel", nil]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:CYLocalize("ENTER_APT_URL")
+ buttons:[NSArray arrayWithObjects:CYLocalize("ADD_SOURCE"), CYLocalize("CANCEL"), nil]
defaultButtonIndex:0
delegate:self
context:@"source"
] autorelease];
+ [sheet setNumberOfRows:1];
+
[sheet addTextFieldWithValue:@"http://" label:@""];
- UITextTraits *traits = [[sheet textField] textTraits];
- [traits setAutoCapsType:0];
- [traits setPreferredKeyboardType:3];
- [traits setAutoCorrectionType:1];
+ UITextInputTraits *traits = [[sheet textField] textInputTraits];
+ [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+ [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
+ [traits setKeyboardType:UIKeyboardTypeURL];
+ // XXX: UIReturnKeyDone
+ [traits setReturnKeyType:UIReturnKeyNext];
[sheet popupAlertAnimated:YES];
}
}
- (NSString *) title {
- return @"Sources";
-}
-
-- (NSString *) backButtonTitle {
- return @"Sources";
+ return CYLocalize("SOURCES");
}
- (NSString *) leftButtonTitle {
- return [[list_ table] isRowDeletionEnabled] ? @"Add" : nil;
+ return [[list_ table] isRowDeletionEnabled] ? CYLocalize("ADD") : nil;
}
-- (NSString *) rightButtonTitle {
- return [[list_ table] isRowDeletionEnabled] ? @"Done" : @"Edit";
+- (id) rightButtonTitle {
+ return [[list_ table] isRowDeletionEnabled] ? CYLocalize("DONE") : CYLocalize("EDIT");
}
-- (RVUINavBarButtonStyle) rightButtonStyle {
- return [[list_ table] isRowDeletionEnabled] ? RVUINavBarButtonStyleHighlighted : RVUINavBarButtonStyleNormal;
+- (UINavigationButtonStyle) rightButtonStyle {
+ return [[list_ table] isRowDeletionEnabled] ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
}
@end
/* Installed View {{{ */
@interface InstalledView : RVPage {
_transient Database *database_;
- PackageTable *packages_;
+ FilteredPackageTable *packages_;
BOOL expert_;
}
if ((self = [super initWithBook:book]) != nil) {
database_ = database;
- packages_ = [[PackageTable alloc]
+ packages_ = [[FilteredPackageTable alloc]
initWithBook:book
database:database
title:nil
];
[self addSubview:packages_];
+
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
}
- (NSString *) title {
- return @"Installed";
+ return CYLocalize("INSTALLED");
}
- (NSString *) backButtonTitle {
- return @"Packages";
+ return CYLocalize("PACKAGES");
}
-- (NSString *) rightButtonTitle {
- return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? @"Expert" : @"Simple";
+- (id) rightButtonTitle {
+ return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? CYLocalize("EXPERT") : CYLocalize("SIMPLE");
}
-- (RVUINavBarButtonStyle) rightButtonStyle {
- return expert_ ? RVUINavBarButtonStyleHighlighted : RVUINavBarButtonStyleNormal;
+- (UINavigationButtonStyle) rightButtonStyle {
+ return expert_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
}
- (void) setDelegate:(id)delegate {
@end
/* }}} */
+/* Home View {{{ */
@interface HomeView : BrowserView {
}
@implementation HomeView
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
- [sheet dismiss];
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+ NSString *context([sheet context]);
+
+ if ([context isEqualToString:@"about"])
+ [sheet dismiss];
+ else
+ [super alertSheet:sheet buttonClicked:button];
}
- (void) _leftButtonClicked {
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:@"About Cydia Installer"
- buttons:[NSArray arrayWithObjects:@"Close", nil]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:CYLocalize("ABOUT_CYDIA")
+ buttons:[NSArray arrayWithObjects:CYLocalize("CLOSE"), nil]
defaultButtonIndex:0
delegate:self
context:@"about"
] autorelease];
[sheet setBodyText:
- @"Copyright (C) 2008\n"
+ @"Copyright (C) 2008-2009\n"
"Jay Freeman (saurik)\n"
"saurik@saurik.com\n"
"http://www.saurik.com/\n"
}
- (NSString *) leftButtonTitle {
- return @"About";
+ return CYLocalize("ABOUT");
}
@end
-
+/* }}} */
+/* Manage View {{{ */
@interface ManageView : BrowserView {
}
@implementation ManageView
- (NSString *) title {
- return @"Manage";
+ return CYLocalize("MANAGE");
}
- (void) _leftButtonClicked {
}
- (NSString *) leftButtonTitle {
- return @"Settings";
+ return CYLocalize("SETTINGS");
}
-- (NSString *) rightButtonTitle {
- return nil;
+#if !AlwaysReload
+- (id) _rightButtonTitle {
+ return Queuing_ ? CYLocalize("QUEUE") : nil;
}
-@end
-
-/* 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];
+- (UINavigationButtonStyle) rightButtonStyle {
+ return Queuing_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
}
-- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
- [self loadRequest:[NSURLRequest
- requestWithURL:url
- cachePolicy:policy
- timeoutInterval:30.0
- ]];
+- (void) _rightButtonClicked {
+ [delegate_ queue];
}
+#endif
-- (void) loadURL:(NSURL *)url {
- [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy];
+- (bool) isLoading {
+ return false;
}
-- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request {
- NSMutableURLRequest *copy = [request mutableCopy];
-
- [copy addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"];
- [copy addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
- [copy addValue:[NSString stringWithUTF8String:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];
+@end
+/* }}} */
- if (Role_ != nil)
- [copy addValue:Role_ forHTTPHeaderField:@"X-Role"];
+#include <BrowserView.m>
- return copy;
+/* Cydia Book {{{ */
+@interface CYBook : RVBook <
+ ProgressDelegate
+> {
+ _transient Database *database_;
+ UINavigationBar *overlay_;
+ UINavigationBar *underlay_;
+ UIProgressIndicator *indicator_;
+ UITextLabel *prompt_;
+ UIProgressBar *progress_;
+ UINavigationButton *cancel_;
+ bool updating_;
}
-- (void) loadRequest:(NSURLRequest *)request {
- pushed_ = true;
- [webview_ loadRequest:request];
-}
+- (id) initWithFrame:(CGRect)frame database:(Database *)database;
+- (void) update;
+- (BOOL) updating;
-- (void) reloadURL {
- NSURL *url = [[[urls_ lastObject] retain] autorelease];
- [urls_ removeLastObject];
- [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData];
-}
+@end
-- (WebView *) webView {
- return [webview_ webView];
-}
+@implementation CYBook
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame {
- [scroller_ setContentSize:frame.size];
+- (void) dealloc {
+ [overlay_ release];
+ [indicator_ release];
+ [prompt_ release];
+ [progress_ release];
+ [cancel_ release];
+ [super dealloc];
}
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
- [self view:sender didSetFrame:frame];
+- (NSString *) getTitleForPage:(RVPage *)page {
+ return [super getTitleForPage:page];
}
-- (void) pushPage:(RVPage *)page {
- [self setBackButtonTitle:title_];
- [page setDelegate:delegate_];
- [book_ pushPage:page];
+- (BOOL) updating {
+ return updating_;
}
-- (void) getSpecial:(NSString *)href {
- RVPage *page = nil;
+- (void) update {
+ [UIView beginAnimations:nil context:NULL];
- if ([href hasPrefix:@"mailto:"])
- [delegate_ openURL:[NSURL URLWithString:href]];
- else if ([href isEqualToString:@"cydia://add-source"])
- page = [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease];
- else if ([href isEqualToString:@"cydia://sources"])
- page = [[[SourceTable alloc] initWithBook:book_ database:database_] autorelease];
- else if ([href isEqualToString:@"cydia://packages"])
- page = [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease];
- else if ([href hasPrefix:@"apptapp://package/"]) {
- NSString *name = [href substringFromIndex:18];
+ CGRect ovrframe = [overlay_ frame];
+ ovrframe.origin.y = 0;
+ [overlay_ setFrame:ovrframe];
- if (Package *package = [database_ packageWithName:name]) {
- PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
- [view setPackage:package];
- page = view;
- } else {
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:@"Cannot Locate Package"
- buttons:[NSArray arrayWithObjects:@"Close", nil]
- defaultButtonIndex:0
- delegate:self
- context:@"missing"
- ] autorelease];
+ CGRect barframe = [navbar_ frame];
+ barframe.origin.y += ovrframe.size.height;
+ [navbar_ setFrame:barframe];
- [sheet setBodyText:[NSString stringWithFormat:
- @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
- , name]];
+ CGRect trnframe = [transition_ frame];
+ trnframe.origin.y += ovrframe.size.height;
+ trnframe.size.height -= ovrframe.size.height;
+ [transition_ setFrame:trnframe];
- [sheet popupAlertAnimated:YES];
- }
- }
+ [UIView endAnimations];
- if (page != nil)
- [self pushPage:page];
-}
+ [indicator_ startAnimation];
+ [prompt_ setText:CYLocalize("UPDATING_DATABASE")];
+ [progress_ setProgress:0];
-- (void) webView:(WebView *)sender willClickElement:(id)element {
- if ([[element localName] isEqualToString:@"img"])
- do if ((element = [element parentNode]) == nil)
- return;
- while (![[element localName] isEqualToString:@"a"]);
- if (![element respondsToSelector:@selector(href)])
- return;
- NSString *href = [element href];
- if (href == nil)
- return;
- [self getSpecial:href];
-}
+ updating_ = true;
+ [overlay_ addSubview:cancel_];
-- (BOOL) isSpecialScheme:(NSString *)scheme {
- return
- [scheme isEqualToString:@"apptapp"] ||
- [scheme isEqualToString:@"cydia"] ||
- [scheme isEqualToString:@"mailto"];
+ [NSThread
+ detachNewThreadSelector:@selector(_update)
+ toTarget:self
+ withObject:nil
+ ];
}
-- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
- NSURL *url = [request URL];
- if ([self isSpecialScheme:[url scheme]]) {
- [self getSpecial:[url absoluteString]];
- return nil;
- }
+- (void) _update_ {
+ updating_ = false;
- if (!pushed_) {
- pushed_ = true;
- [book_ pushPage:self];
- }
+ [indicator_ stopAnimation];
- return [self _addHeadersToRequest:request];
-}
+ [UIView beginAnimations:nil context:NULL];
-- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
- if (request != nil) {
- NSString *scheme = [[request URL] scheme];
- if ([self isSpecialScheme:scheme])
- return nil;
- }
+ CGRect ovrframe = [overlay_ frame];
+ ovrframe.origin.y = -ovrframe.size.height;
+ [overlay_ setFrame:ovrframe];
- [self setBackButtonTitle:title_];
+ CGRect barframe = [navbar_ frame];
+ barframe.origin.y -= ovrframe.size.height;
+ [navbar_ setFrame:barframe];
- BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
- [browser setDelegate:delegate_];
+ CGRect trnframe = [transition_ frame];
+ trnframe.origin.y -= ovrframe.size.height;
+ trnframe.size.height += ovrframe.size.height;
+ [transition_ setFrame:trnframe];
- if (request != nil) {
- [browser loadRequest:[self _addHeadersToRequest:request]];
- [book_ pushPage:browser];
- }
+ [UIView commitAnimations];
- return [browser webView];
+ [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0];
}
-- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
- title_ = [title retain];
- [self setTitle:title];
-}
+- (id) initWithFrame:(CGRect)frame database:(Database *)database {
+ if ((self = [super initWithFrame:frame]) != nil) {
+ database_ = database;
-- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
- if ([frame parentFrame] != nil)
- return;
+ CGRect ovrrect = [navbar_ bounds];
+ ovrrect.size.height = [UINavigationBar defaultSize].height;
+ ovrrect.origin.y = -ovrrect.size.height;
- reloading_ = false;
- loading_ = true;
- [indicator_ startAnimation];
- [self reloadButtons];
+ overlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect];
+ [self addSubview:overlay_];
- if (title_ != nil) {
- [title_ release];
- title_ = nil;
- }
+ ovrrect.origin.y = frame.size.height;
+ underlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect];
+ [underlay_ setTintColor:[UIColor colorWithRed:0.23 green:0.23 blue:0.23 alpha:1]];
+ [self addSubview:underlay_];
- [self setTitle:@"Loading..."];
+ [overlay_ setBarStyle:1];
+ [underlay_ setBarStyle:1];
- WebView *webview = [webview_ webView];
- NSString *href = [webview mainFrameURL];
- [urls_ addObject:[NSURL URLWithString:href]];
+ int barstyle = [overlay_ _barStyle:NO];
+ bool ugly = barstyle == 0;
- CGRect webrect = [scroller_ frame];
- webrect.size.height = 0;
- [webview_ setFrame:webrect];
-}
+ UIProgressIndicatorStyle style = ugly ?
+ UIProgressIndicatorStyleMediumBrown :
+ UIProgressIndicatorStyleMediumWhite;
-- (void) _finishLoading {
- if (!reloading_) {
- loading_ = false;
- [indicator_ stopAnimation];
- [self reloadButtons];
- }
-}
+ CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
+ unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
+ CGRect indrect = {{indoffset, indoffset}, indsize};
-- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
- if ([frame parentFrame] != nil)
- return;
- [self _finishLoading];
-}
+ indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
+ [indicator_ setStyle:style];
+ [overlay_ addSubview:indicator_];
-- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
- if ([frame parentFrame] != nil)
- return;
- [self _finishLoading];
+ CGSize prmsize = {215, indsize.height + 4};
- [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",
- [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString],
- [[error localizedDescription] stringByAddingPercentEscapes]
- ]]];
-}
+ CGRect prmrect = {{
+ indoffset * 2 + indsize.width,
+#ifdef __OBJC2__
+ -1 +
+#endif
+ unsigned(ovrrect.size.height - prmsize.height) / 2
+ }, prmsize};
-- (id) initWithBook:(RVBook *)book database:(Database *)database {
- if ((self = [super initWithBook:book]) != nil) {
- database_ = database;
- loading_ = false;
+ UIFont *font = [UIFont systemFontOfSize:15];
- struct CGRect bounds = [self bounds];
+ prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
+
+ [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
+ [prompt_ setBackgroundColor:[UIColor clearColor]];
+ [prompt_ setFont:font];
+
+ [overlay_ addSubview:prompt_];
+
+ CGSize prgsize = {75, 100};
+
+ CGRect prgrect = {{
+ ovrrect.size.width - prgsize.width - 10,
+ (ovrrect.size.height - prgsize.height) / 2
+ } , prgsize};
+
+ progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
+ [progress_ setStyle:0];
+ [overlay_ addSubview:progress_];
- UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:bounds] autorelease];
- [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
- [self addSubview:pinstripe];
+ cancel_ = [[UINavigationButton alloc] initWithTitle:CYLocalize("CANCEL") style:UINavigationButtonStyleHighlighted];
+ [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside];
- scroller_ = [[UIScroller alloc] initWithFrame:bounds];
- [self addSubview:scroller_];
+ CGRect frame = [cancel_ frame];
+ frame.size.width = 65;
+ frame.origin.x = ovrrect.size.width - frame.size.width - 5;
+ frame.origin.y = (ovrrect.size.height - frame.size.height) / 2;
+ [cancel_ setFrame:frame];
- [scroller_ setScrollingEnabled:YES];
- [scroller_ setAdjustForContentSizeChange:YES];
- [scroller_ setClipsSubviews:YES];
- [scroller_ setAllowsRubberBanding:YES];
- [scroller_ setScrollDecelerationFactor:0.99];
- [scroller_ setDelegate:self];
+ [cancel_ setBarStyle:barstyle];
+ } return self;
+}
- CGRect webrect = [scroller_ bounds];
- webrect.size.height = 0;
+- (void) _onCancel {
+ updating_ = false;
+ [cancel_ removeFromSuperview];
+}
- webview_ = [[UIWebView alloc] initWithFrame:webrect];
- [scroller_ addSubview:webview_];
+- (void) _update { _pooled
+ Status status;
+ status.setDelegate(self);
- [webview_ setTilingEnabled:YES];
- [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
- [webview_ setAutoresizes:YES];
- [webview_ setDelegate:self];
- //[webview_ setEnabledGestures:2];
+ [database_ updateWithStatus:status];
- CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite];
- indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 42, indsize.width, indsize.height)];
- [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite];
+ [self
+ performSelectorOnMainThread:@selector(_update_)
+ withObject:nil
+ waitUntilDone:NO
+ ];
+}
- Package *package([database_ packageWithName:@"cydia"]);
- NSString *application = package == nil ? @"Cydia" : [NSString
- stringWithFormat:@"Cydia/%@",
- [package installed]
- ];
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+ [prompt_ setText:[NSString stringWithFormat:CYLocalize("ERROR_MESSAGE"), error]];
+}
- WebView *webview = [webview_ webView];
- [webview setApplicationNameForUserAgent:application];
- [webview setFrameLoadDelegate:self];
- [webview setResourceLoadDelegate:self];
- [webview setUIDelegate:self];
+- (void) setProgressTitle:(NSString *)title {
+ [self
+ performSelectorOnMainThread:@selector(_setProgressTitle:)
+ withObject:title
+ waitUntilDone:YES
+ ];
+}
- urls_ = [[NSMutableArray alloc] initWithCapacity:16];
- } return self;
+- (void) setProgressPercent:(float)percent {
+ [self
+ performSelectorOnMainThread:@selector(_setProgressPercent:)
+ withObject:[NSNumber numberWithFloat:percent]
+ waitUntilDone:YES
+ ];
}
-- (void) _rightButtonClicked {
- reloading_ = true;
- [self reloadURL];
+- (void) startProgress {
}
-- (NSString *) rightButtonTitle {
- return loading_ ? @"" : @"Reload";
+- (void) addProgressOutput:(NSString *)output {
+ [self
+ performSelectorOnMainThread:@selector(_addProgressOutput:)
+ withObject:output
+ waitUntilDone:YES
+ ];
}
-- (NSString *) title {
- return nil;
+- (bool) isCancelling:(size_t)received {
+ return !updating_;
}
-- (NSString *) backButtonTitle {
- return @"Browser";
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+ [sheet dismiss];
}
-- (void) setPageActive:(BOOL)active {
- if (active)
- [book_ addSubview:indicator_];
- else
- [indicator_ removeFromSuperview];
+- (void) _setProgressTitle:(NSString *)title {
+ [prompt_ setText:title];
}
-- (void) resetViewAnimated:(BOOL)animated {
+- (void) _setProgressPercent:(NSNumber *)percent {
+ [progress_ setProgress:[percent floatValue]];
}
-- (void) setPushed:(bool)pushed {
- pushed_ = pushed;
+- (void) _addProgressOutput:(NSString *)output {
}
@end
/* }}} */
+/* Cydia:// Protocol {{{ */
+@interface CydiaURLProtocol : NSURLProtocol {
+}
-@interface CYBook : RVBook <
- ProgressDelegate
-> {
- _transient Database *database_;
- UIView *overlay_;
- UIProgressIndicator *indicator_;
- UITextLabel *prompt_;
- UIProgressBar *progress_;
- bool updating_;
+@end
+
+@implementation CydiaURLProtocol
+
++ (BOOL) canInitWithRequest:(NSURLRequest *)request {
+ NSURL *url([request URL]);
+ if (url == nil)
+ return NO;
+ NSString *scheme([[url scheme] lowercaseString]);
+ if (scheme == nil || ![scheme isEqualToString:@"cydia"])
+ return NO;
+ return YES;
}
-- (id) initWithFrame:(CGRect)frame database:(Database *)database;
-- (void) update;
-- (BOOL) updating;
++ (NSURLRequest *) canonicalRequestForRequest:(NSURLRequest *)request {
+ return request;
+}
+
+- (void) _returnPNGWithImage:(UIImage *)icon forRequest:(NSURLRequest *)request {
+ id<NSURLProtocolClient> client([self client]);
+ if (icon == nil)
+ [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist userInfo:nil]];
+ else {
+ NSData *data(UIImagePNGRepresentation(icon));
+
+ NSURLResponse *response([[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:@"image/png" expectedContentLength:-1 textEncodingName:nil] autorelease]);
+ [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+ [client URLProtocol:self didLoadData:data];
+ [client URLProtocolDidFinishLoading:self];
+ }
+}
+
+- (void) startLoading {
+ id<NSURLProtocolClient> client([self client]);
+ NSURLRequest *request([self request]);
+
+ NSURL *url([request URL]);
+ NSString *href([url absoluteString]);
+
+ NSString *path([href substringFromIndex:8]);
+ NSRange slash([path rangeOfString:@"/"]);
+
+ NSString *command;
+ if (slash.location == NSNotFound) {
+ command = path;
+ path = nil;
+ } else {
+ command = [path substringToIndex:slash.location];
+ path = [path substringFromIndex:(slash.location + 1)];
+ }
+
+ Database *database([Database sharedInstance]);
+
+ if ([command isEqualToString:@"package-icon"]) {
+ if (path == nil)
+ goto fail;
+ path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+ Package *package([database packageWithName:path]);
+ if (package == nil)
+ goto fail;
+ UIImage *icon([package icon]);
+ [self _returnPNGWithImage:icon forRequest:request];
+ } else if ([command isEqualToString:@"source-icon"]) {
+ if (path == nil)
+ goto fail;
+ path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+ NSString *source(Simplify(path));
+ UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sources/%@.png", App_, source]]);
+ if (icon == nil)
+ icon = [UIImage applicationImageNamed:@"unknown.png"];
+ [self _returnPNGWithImage:icon forRequest:request];
+ } else if ([command isEqualToString:@"uikit-image"]) {
+ if (path == nil)
+ goto fail;
+ path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+ UIImage *icon(_UIImageWithName(path));
+ [self _returnPNGWithImage:icon forRequest:request];
+ } else if ([command isEqualToString:@"section-icon"]) {
+ if (path == nil)
+ goto fail;
+ path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+ NSString *section(Simplify(path));
+ UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]]);
+ if (icon == nil)
+ icon = [UIImage applicationImageNamed:@"unknown.png"];
+ [self _returnPNGWithImage:icon forRequest:request];
+ } else fail: {
+ [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorResourceUnavailable userInfo:nil]];
+ }
+}
+
+- (void) stopLoading {
+}
@end
+/* }}} */
-/* Install View {{{ */
-@interface InstallView : RVPage {
+/* Sections View {{{ */
+@interface SectionsView : RVPage {
_transient Database *database_;
NSMutableArray *sections_;
NSMutableArray *filtered_;
@end
-@implementation InstallView
+@implementation SectionsView
- (void) dealloc {
[list_ setDataSource:nil];
if (row == 0) {
section = nil;
name = nil;
- title = @"All Packages";
+ title = CYLocalize("ALL_PACKAGES");
} else {
section = [filtered_ objectAtIndex:(row - 1)];
name = [section name];
if (name != nil)
- title = name;
+ title = [[NSBundle mainBundle] localizedStringForKey:Simplify(name) value:nil table:@"Sections"];
else {
name = @"";
- title = @"(No Section)";
+ title = CYLocalize("NO_SECTION");
}
}
- PackageTable *table = [[[PackageTable alloc]
+ PackageTable *table = [[[FilteredPackageTable alloc]
initWithBook:book_
database:database_
title:title
[transition_ transition:0 toView:list_];
UITableColumn *column = [[[UITableColumn alloc]
- initWithTitle:@"Name"
+ initWithTitle:CYLocalize("NAME")
identifier:@"name"
width:[self frame].size.width
] autorelease];
[list_ setReusesTableCells:YES];
[self reloadData];
+
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
[sections_ removeAllObjects];
[filtered_ removeAllObjects];
- NSMutableArray *filtered = [NSMutableArray arrayWithCapacity:[packages count]];
- NSMutableDictionary *sections = [NSMutableDictionary dictionaryWithCapacity:32];
+#if 0
+ typedef __gnu_cxx::hash_map<NSString *, Section *, NSStringMapHash, NSStringMapEqual> SectionMap;
+ SectionMap sections;
+ sections.resize(64);
+#else
+ NSMutableDictionary *sections([NSMutableDictionary dictionaryWithCapacity:32]);
+#endif
- for (size_t i(0); i != [packages count]; ++i) {
- Package *package([packages objectAtIndex:i]);
+ _trace();
+ for (Package *package in packages) {
NSString *name([package section]);
+ NSString *key(name == nil ? @"" : name);
+
+#if 0
+ Section **section;
+
+ _profile(SectionsView$reloadData$Section)
+ section = §ions[key];
+ if (*section == nil) {
+ _profile(SectionsView$reloadData$Section$Allocate)
+ *section = [[[Section alloc] initWithName:name] autorelease];
+ _end
+ }
+ _end
+
+ [*section addToCount];
+
+ _profile(SectionsView$reloadData$Filter)
+ if (![package valid] || [package installed] != nil || ![package visible])
+ continue;
+ _end
- if (name != nil) {
- Section *section([sections objectForKey:name]);
+ [*section addToRow];
+#else
+ Section *section;
+
+ _profile(SectionsView$reloadData$Section)
+ section = [sections objectForKey:key];
if (section == nil) {
- section = [[[Section alloc] initWithName:name] autorelease];
- [sections setObject:section forKey:name];
+ _profile(SectionsView$reloadData$Section$Allocate)
+ section = [[[Section alloc] initWithName:name] autorelease];
+ [sections setObject:section forKey:key];
+ _end
}
- }
+ _end
+
+ [section addToCount];
+
+ _profile(SectionsView$reloadData$Filter)
+ if (![package valid] || [package installed] != nil || ![package visible])
+ continue;
+ _end
- if ([package valid] && [package installed] == nil && [package visible])
- [filtered addObject:package];
+ [section addToRow];
+#endif
}
+ _trace();
+#if 0
+ for (SectionMap::const_iterator i(sections.begin()), e(sections.end()); i != e; ++i)
+ [sections_ addObject:i->second];
+#else
[sections_ addObjectsFromArray:[sections allValues]];
- [sections_ sortUsingSelector:@selector(compareByName:)];
+#endif
- [filtered sortUsingSelector:@selector(compareBySection:)];
+ [sections_ sortUsingSelector:@selector(compareByName:)];
- Section *section = nil;
- for (size_t offset = 0, count = [filtered count]; offset != count; ++offset) {
- Package *package = [filtered objectAtIndex:offset];
- NSString *name = [package section];
-
- if (section == nil || name != nil && ![[section name] isEqualToString:name]) {
- section = name == nil ?
- [[[Section alloc] initWithName:nil] autorelease] :
- [sections objectForKey:name];
- [filtered_ addObject:section];
- }
+ for (Section *section in sections_) {
+ size_t count([section row]);
+ if ([section row] == 0)
+ continue;
- [section addToCount];
+ section = [[[Section alloc] initWithName:[section name]] autorelease];
+ [section setCount:count];
+ [filtered_ addObject:section];
}
[list_ reloadData];
+ _trace();
}
- (void) resetView {
- (void) _rightButtonClicked {
if ((editing_ = !editing_))
[list_ reloadData];
- else {
+ else
[delegate_ updateData];
- }
-
- [book_ setTitle:[self title] forPage:self];
+ [book_ reloadTitleForPage:self];
[book_ reloadButtonsForPage:self];
}
- (NSString *) title {
- return editing_ ? @"Section Visibility" : @"Install by Section";
+ return editing_ ? CYLocalize("SECTION_VISIBILITY") : CYLocalize("INSTALL_BY_SECTION");
}
- (NSString *) backButtonTitle {
- return @"Sections";
+ return CYLocalize("SECTIONS");
}
-- (NSString *) rightButtonTitle {
- return [sections_ count] == 0 ? nil : editing_ ? @"Done" : @"Edit";
+- (id) rightButtonTitle {
+ return [sections_ count] == 0 ? nil : editing_ ? CYLocalize("DONE") : CYLocalize("EDIT");
+}
+
+- (UINavigationButtonStyle) rightButtonStyle {
+ return editing_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
}
- (UIView *) accessoryView {
}
- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
+ NSLog(@"titleForSection:%u", section);
return [[sections_ objectAtIndex:section] name];
}
if (row == INT_MAX)
return;
Package *package = [packages_ objectAtIndex:row];
- PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+ PackageView *view([delegate_ packageView]);
[view setDelegate:delegate_];
[view setPackage:package];
[book_ pushPage:view];
//[list_ setSectionListStyle:1];
UITableColumn *column = [[[UITableColumn alloc]
- initWithTitle:@"Name"
+ initWithTitle:CYLocalize("NAME")
identifier:@"name"
width:[self frame].size.width
] autorelease];
[table setReusesTableCells:YES];
[self reloadData];
+
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
[packages_ removeAllObjects];
[sections_ removeAllObjects];
- for (size_t i(0); i != [packages count]; ++i) {
- Package *package([packages objectAtIndex:i]);
-
+ _trace();
+ for (Package *package in packages)
if (
[package installed] == nil && [package valid] && [package visible] ||
- [package upgradableAndEssential:NO]
+ [package upgradableAndEssential:YES]
)
[packages_ addObject:package];
- }
- [packages_ sortUsingSelector:@selector(compareForChanges:)];
+ _trace();
+ [packages_ radixSortUsingFunction:reinterpret_cast<uint32_t (*)(id, void *)>(&PackageChangesRadix) withArgument:NULL];
+ _trace();
- Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades"] autorelease];
+ Section *upgradable = [[[Section alloc] initWithName:CYLocalize("AVAILABLE_UPGRADES")] autorelease];
+ Section *ignored = [[[Section alloc] initWithName:CYLocalize("IGNORED_UPGRADES")] autorelease];
Section *section = nil;
+ NSDate *last = nil;
upgrades_ = 0;
bool unseens = false;
CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+ _trace();
for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
Package *package = [packages_ objectAtIndex:offset];
- if ([package upgradableAndEssential:YES]) {
- ++upgrades_;
- [upgradable addToCount];
- } else {
+ BOOL uae;
+ _profile(ChangesView$reloadData$Upgrade)
+ uae = [package upgradableAndEssential:YES];
+ _end
+
+ if (!uae) {
unseens = true;
- NSDate *seen = [package seen];
+ NSDate *seen;
- NSString *name;
+ _profile(ChangesView$reloadData$Remember)
+ seen = [package seen];
+ _end
- if (seen == nil)
- name = [@"n/a ?" retain];
- else {
- name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
- }
+ bool different;
+ _profile(ChangesView$reloadData$Compare)
+ different = section == nil || last != seen && (seen == nil || [seen compare:last] != NSOrderedSame);
+ _end
+
+ if (different) {
+ last = seen;
- if (section == nil || ![[section name] isEqualToString:name]) {
- section = [[[Section alloc] initWithName:name row:offset] autorelease];
- [sections_ addObject:section];
+ NSString *name;
+ if (seen == nil)
+ name = CYLocalize("UNKNOWN");
+ else {
+ _profile(ChangesView$reloadData$Format)
+ name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
+ _end
+
+ [name autorelease];
+ }
+
+ _profile(ChangesView$reloadData$Allocate)
+ name = [NSString stringWithFormat:CYLocalize("NEW_AT"), name];
+ section = [[[Section alloc] initWithName:name row:offset] autorelease];
+ [sections_ addObject:section];
+ _end
}
- [name release];
[section addToCount];
+ } else if ([package ignored])
+ [ignored addToCount];
+ else {
+ ++upgrades_;
+ [upgradable addToCount];
}
}
+ _trace();
CFRelease(formatter);
[sections_ removeLastObject];
}
+ if ([ignored count] != 0)
+ [sections_ insertObject:ignored atIndex:0];
if (upgrades_ != 0)
[sections_ insertObject:upgradable atIndex:0];
}
- (NSString *) leftButtonTitle {
- return [(CYBook *)book_ updating] ? nil : @"Refresh";
+ return [(CYBook *)book_ updating] ? nil : CYLocalize("REFRESH");
}
-- (NSString *) rightButtonTitle {
- return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade (%u)", upgrades_];
+- (id) rightButtonTitle {
+ return upgrades_ == 0 ? nil : [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), CYLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]];
}
- (NSString *) title {
- return @"Changes";
+ return CYLocalize("CHANGES");
}
@end
UIView *accessory_;
UISearchField *field_;
UITransitionView *transition_;
- PackageTable *table_;
+ FilteredPackageTable *table_;
UIPreferencesTable *advanced_;
UIView *dimmed_;
bool flipped_;
@implementation SearchView
- (void) dealloc {
-#ifndef __OBJC2__
- [[field_ textTraits] setEditingDelegate:nil];
-#endif
[field_ setDelegate:nil];
[accessory_ release];
- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
switch (group) {
- case 0: return @"Advanced Search (Coming Soon!)";
+ case 0: return [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), CYLocalize("ADVANCED_SEARCH"), CYLocalize("COMING_SOON")];
default: _assert(false);
}
if (show)
[animator performSelector:@selector(startAnimation:) withObject:animation afterDelay:delay];
-#ifndef __OBJC2__
[delegate_ showKeyboard:show];
-#endif
}
- (void) textFieldDidBecomeFirstResponder:(UITextField *)field {
if ((self = [super initWithBook:book]) != nil) {
CGRect pageBounds = [book_ pageBounds];
- /*UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:pageBounds] autorelease];
- [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
- [self addSubview:pinstripe];*/
-
transition_ = [[UITransitionView alloc] initWithFrame:pageBounds];
[self addSubview:transition_];
dimmed_ = [[UIView alloc] initWithFrame:pageBounds];
CGColor dimmed(space_, 0, 0, 0, 0.5);
- [dimmed_ setBackgroundColor:dimmed];
+ [dimmed_ setBackgroundColor:[UIColor colorWithCGColor:dimmed]];
- table_ = [[PackageTable alloc]
+ table_ = [[FilteredPackageTable alloc]
initWithBook:book
database:database
title:nil
- filter:@selector(isVisiblySearchedForBy:)
+ filter:@selector(isUnfilteredAndSearchedForBy:)
with:nil
];
CGRect area;
area.origin.x = /*cnfrect.origin.x + cnfrect.size.width + 4 +*/ 10;
- area.origin.y = 30;
+ area.origin.y = 1;
area.size.width =
#ifdef __OBJC2__
field_ = [[UISearchField alloc] initWithFrame:area];
- GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+ UIFont *font = [UIFont systemFontOfSize:16];
[field_ setFont:font];
- CFRelease(font);
- [field_ setPlaceholder:@"Package Names & Descriptions"];
+ [field_ setPlaceholder:CYLocalize("SEARCH_EX")];
[field_ setDelegate:self];
-#ifdef __OBJC2__
- [field_ setPaddingTop:3];
-#else
[field_ setPaddingTop:5];
-#endif
- UITextTraits *traits = [field_ textTraits];
- [traits setAutoCapsType:0];
- [traits setAutoCorrectionType:1];
- [traits setReturnKeyType:6];
-
-#ifndef __OBJC2__
- [traits setEditingDelegate:self];
-#endif
+ UITextInputTraits *traits([field_ textInputTraits]);
+ [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+ [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
+ [traits setReturnKeyType:UIReturnKeySearch];
- CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height + 30}};
+ CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height}};
accessory_ = [[UIView alloc] initWithFrame:accrect];
[accessory_ addSubview:field_];
[configure setImage:[UIImage applicationImageNamed:@"advanced.png"]];
[configure addTarget:self action:@selector(configurePushed) forEvents:1];
[accessory_ addSubview:configure];*/
+
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [table_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
[table_ resetViewAnimated:animated];
}
+- (void) _reloadData {
+}
+
- (void) reloadData {
if (flipped_)
[self flipPage];
[table_ setObject:[field_ text]];
- [table_ reloadData];
+ _profile(SearchView$reloadData)
+ [table_ reloadData];
+ _end
+ PrintTimes();
[table_ resetCursor];
}
}
- (NSString *) backButtonTitle {
- return @"Search";
+ return CYLocalize("SEARCH");
}
- (void) setDelegate:(id)delegate {
@end
/* }}} */
-@implementation CYBook
+@interface SettingsView : RVPage {
+ _transient Database *database_;
+ NSString *name_;
+ Package *package_;
+ UIPreferencesTable *table_;
+ _UISwitchSlider *subscribedSwitch_;
+ _UISwitchSlider *ignoredSwitch_;
+ UIPreferencesControlTableCell *subscribedCell_;
+ UIPreferencesControlTableCell *ignoredCell_;
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package;
+
+@end
+
+@implementation SettingsView
- (void) dealloc {
- [overlay_ release];
- [indicator_ release];
- [prompt_ release];
- [progress_ release];
+ [table_ setDataSource:nil];
+
+ [name_ release];
+ if (package_ != nil)
+ [package_ release];
+ [table_ release];
+ [subscribedSwitch_ release];
+ [ignoredSwitch_ release];
+ [subscribedCell_ release];
+ [ignoredCell_ release];
[super dealloc];
}
-- (NSString *) getTitleForPage:(RVPage *)page {
- return Simplify([super getTitleForPage:page]);
-}
+- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
+ if (package_ == nil)
+ return 0;
-- (BOOL) updating {
- return updating_;
+ return 2;
}
-- (void) update {
- [navbar_ setPrompt:@""];
- [navbar_ addSubview:overlay_];
- [indicator_ startAnimation];
- [prompt_ setText:@"Updating Database..."];
- [progress_ setProgress:0];
+- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
+ if (package_ == nil)
+ return nil;
- updating_ = true;
+ switch (group) {
+ case 0: return nil;
+ case 1: return nil;
- [NSThread
- detachNewThreadSelector:@selector(_update)
- toTarget:self
- withObject:nil
- ];
+ default: _assert(false);
+ }
+
+ return nil;
}
-- (void) _update_ {
- updating_ = false;
+- (BOOL) preferencesTable:(UIPreferencesTable *)table isLabelGroup:(int)group {
+ if (package_ == nil)
+ return NO;
- [overlay_ removeFromSuperview];
- [indicator_ stopAnimation];
- [delegate_ reloadData];
+ switch (group) {
+ case 0: return NO;
+ case 1: return YES;
- [self setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
-}
+ default: _assert(false);
+ }
-- (id) initWithFrame:(CGRect)frame database:(Database *)database {
- if ((self = [super initWithFrame:frame]) != nil) {
- database_ = database;
+ return NO;
+}
- if (Advanced_)
- [navbar_ setBarStyle:1];
+- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
+ if (package_ == nil)
+ return 0;
- CGRect ovrrect = [navbar_ bounds];
- ovrrect.size.height = ([UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height);
+ switch (group) {
+ case 0: return 1;
+ case 1: return 1;
- overlay_ = [[UIView alloc] initWithFrame:ovrrect];
+ default: _assert(false);
+ }
- UIProgressIndicatorStyle style = Advanced_ ?
- kUIProgressIndicatorStyleSmallWhite :
- kUIProgressIndicatorStyleSmallBlack;
+ return 0;
+}
- CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
- unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
- CGRect indrect = {{indoffset, indoffset}, indsize};
+- (void) onSomething:(UIPreferencesControlTableCell *)cell withKey:(NSString *)key {
+ if (package_ == nil)
+ return;
- indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
- [indicator_ setStyle:style];
- [overlay_ addSubview:indicator_];
+ _UISwitchSlider *slider([cell control]);
+ BOOL value([slider value] != 0);
+ NSMutableDictionary *metadata([package_ metadata]);
- CGSize prmsize = {200, indsize.width + 4};
+ BOOL before;
+ if (NSNumber *number = [metadata objectForKey:key])
+ before = [number boolValue];
+ else
+ before = NO;
- CGRect prmrect = {{
- indoffset * 2 + indsize.width,
-#ifdef __OBJC2__
- -1 +
-#endif
- (ovrrect.size.height - prmsize.height) / 2
- }, prmsize};
+ if (value != before) {
+ [metadata setObject:[NSNumber numberWithBool:value] forKey:key];
+ Changed_ = true;
+ [delegate_ updateData];
+ }
+}
- GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12);
+- (void) onSubscribed:(UIPreferencesControlTableCell *)cell {
+ [self onSomething:cell withKey:@"IsSubscribed"];
+}
- prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
+- (void) onIgnored:(UIPreferencesControlTableCell *)cell {
+ [self onSomething:cell withKey:@"IsIgnored"];
+}
- [prompt_ setColor:(Advanced_ ? White_ : Blueish_)];
- [prompt_ setBackgroundColor:Clear_];
- [prompt_ setFont:font];
+- (id) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
+ if (package_ == nil)
+ return nil;
- CFRelease(font);
+ switch (group) {
+ case 0: switch (row) {
+ case 0:
+ return subscribedCell_;
+ case 1:
+ return ignoredCell_;
+ default: _assert(false);
+ } break;
- [overlay_ addSubview:prompt_];
+ case 1: switch (row) {
+ case 0: {
+ UIPreferencesControlTableCell *cell([[[UIPreferencesControlTableCell alloc] init] autorelease]);
+ [cell setShowSelection:NO];
+ [cell setTitle:CYLocalize("SHOW_ALL_CHANGES_EX")];
+ return cell;
+ }
- CGSize prgsize = {75, 100};
+ default: _assert(false);
+ } break;
- CGRect prgrect = {{
- ovrrect.size.width - prgsize.width - 10,
- (ovrrect.size.height - prgsize.height) / 2
- } , prgsize};
+ default: _assert(false);
+ }
- progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
- [progress_ setStyle:0];
- [overlay_ addSubview:progress_];
- } return self;
+ return nil;
}
-- (void) _update {
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package {
+ if ((self = [super initWithBook:book])) {
+ database_ = database;
+ name_ = [package retain];
+
+ table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]];
+ [self addSubview:table_];
+
+ subscribedSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)];
+ [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:kUIControlEventMouseUpInside];
+
+ ignoredSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)];
+ [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:kUIControlEventMouseUpInside];
- Status status;
- status.setDelegate(self);
+ subscribedCell_ = [[UIPreferencesControlTableCell alloc] init];
+ [subscribedCell_ setShowSelection:NO];
+ [subscribedCell_ setTitle:CYLocalize("SHOW_ALL_CHANGES")];
+ [subscribedCell_ setControl:subscribedSwitch_];
- [database_ updateWithStatus:status];
+ ignoredCell_ = [[UIPreferencesControlTableCell alloc] init];
+ [ignoredCell_ setShowSelection:NO];
+ [ignoredCell_ setTitle:CYLocalize("IGNORE_UPGRADES")];
+ [ignoredCell_ setControl:ignoredSwitch_];
- [self
- performSelectorOnMainThread:@selector(_update_)
- withObject:nil
- waitUntilDone:NO
- ];
+ [table_ setDataSource:self];
+ [self reloadData];
+ } return self;
+}
- [pool release];
+- (void) resetViewAnimated:(BOOL)animated {
+ [table_ resetViewAnimated:animated];
}
-- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
- [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];
+- (void) reloadData {
+ if (package_ != nil)
+ [package_ autorelease];
+ package_ = [database_ packageWithName:name_];
+ if (package_ != nil) {
+ [package_ retain];
+ [subscribedSwitch_ setValue:([package_ subscribed] ? 1 : 0) animated:NO];
+ [ignoredSwitch_ setValue:([package_ ignored] ? 1 : 0) animated:NO];
+ }
+
+ [table_ reloadData];
}
-- (void) setProgressTitle:(NSString *)title {
- [self
- performSelectorOnMainThread:@selector(_setProgressTitle:)
- withObject:title
- waitUntilDone:YES
- ];
+- (NSString *) title {
+ return CYLocalize("SETTINGS");
}
-- (void) setProgressPercent:(float)percent {
+@end
+
+/* Signature View {{{ */
+@interface SignatureView : BrowserView {
+ _transient Database *database_;
+ NSString *package_;
}
-- (void) addProgressOutput:(NSString *)output {
- [self
- performSelectorOnMainThread:@selector(_addProgressOutput:)
- withObject:output
- waitUntilDone:YES
- ];
+- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package;
+
+@end
+
+@implementation SignatureView
+
+- (void) dealloc {
+ [package_ release];
+ [super dealloc];
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
- [sheet dismiss];
+- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+ // XXX: dude!
+ [super webView:sender didClearWindowObject:window forFrame:frame];
}
-- (void) _setProgressTitle:(NSString *)title {
- [prompt_ setText:[title stringByAppendingString:@"..."]];
+- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package {
+ if ((self = [super initWithBook:book]) != nil) {
+ database_ = database;
+ package_ = [package retain];
+ [self reloadData];
+ } return self;
}
-- (void) _addProgressOutput:(NSString *)output {
+- (void) resetViewAnimated:(BOOL)animated {
+}
+
+- (void) reloadData {
+ [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"signature" ofType:@"html"]]];
}
@end
+/* }}} */
@interface Cydia : UIApplication <
ConfirmationViewDelegate,
UIView *underlay_;
UIView *overlay_;
CYBook *book_;
- UIButtonBar *buttonbar_;
+ UIToolbar *buttonbar_;
- ConfirmationView *confirm_;
+ RVBook *confirm_;
NSMutableArray *essential_;
NSMutableArray *broken_;
UIKeyboard *keyboard_;
UIProgressHUD *hud_;
- InstallView *install_;
+ SectionsView *sections_;
ChangesView *changes_;
ManageView *manage_;
SearchView *search_;
+
+ PackageView *package_;
}
@end
if ([broken_ count] != 0) {
int count = [broken_ count];
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:(count == 1 ? CYLocalize("HALFINSTALLED_PACKAGE") : [NSString stringWithFormat:CYLocalize("HALFINSTALLED_PACKAGES"), count])
buttons:[NSArray arrayWithObjects:
- @"Forcibly Clear",
- @"Ignore (Temporary)",
+ CYLocalize("FORCIBLY_CLEAR"),
+ CYLocalize("TEMPORARY_IGNORE"),
nil]
defaultButtonIndex:0
delegate:self
context:@"fixhalf"
] autorelease];
- [sheet setBodyText:@"When the shell scripts associated with packages fail, they are left in a bad state known as either half-configured or half-installed. These errors don't go away and instead continue to cause issues. These scripts can be deleted and the packages forcibly removed."];
+ [sheet setBodyText:CYLocalize("HALFINSTALLED_PACKAGE_EX")];
[sheet popupAlertAnimated:YES];
} else if (!Ignored_ && [essential_ count] != 0) {
int count = [essential_ count];
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
- buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:(count == 1 ? CYLocalize("ESSENTIAL_UPGRADE") : [NSString stringWithFormat:CYLocalize("ESSENTIAL_UPGRADES"), count])
+ buttons:[NSArray arrayWithObjects:
+ CYLocalize("UPGRADE_ESSENTIAL"),
+ CYLocalize("COMPLETE_UPGRADE"),
+ CYLocalize("TEMPORARY_IGNORE"),
+ nil]
defaultButtonIndex:0
delegate:self
context:@"upgrade"
] autorelease];
- [sheet setBodyText:@"One or more essential packages are currently out of date. If these upgrades are not performed you are likely to encounter errors."];
+ [sheet setBodyText:CYLocalize("ESSENTIAL_UPGRADE_EX")];
[sheet popupAlertAnimated:YES];
}
}
- (void) _reloadData {
- /*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
- [hud setText:@"Reloading Data"];
- [overlay_ addSubview:hud];
- [hud show:YES];*/
+ UIView *block();
+
+ static bool loaded(false);
+ UIProgressHUD *hud([self addProgressHUD]);
+ [hud setText:(loaded ? CYLocalize("RELOADING_DATA") : CYLocalize("LOADING_DATA"))];
+ loaded = true;
- [database_ reloadData];
+ [database_ yieldToSelector:@selector(reloadData) withObject:nil];
+ _trace();
+
+ [self removeProgressHUD:hud];
size_t changes(0);
[broken_ removeAllObjects];
NSArray *packages = [database_ packages];
- for (int i(0), e([packages count]); i != e; ++i) {
- Package *package = [packages objectAtIndex:i];
+ for (Package *package in packages) {
if ([package half])
[broken_ addObject:package];
if ([package upgradableAndEssential:NO]) {
NSString *badge([[NSNumber numberWithInt:changes] stringValue]);
[buttonbar_ setBadgeValue:badge forButton:3];
if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
- [buttonbar_ setBadgeAnimated:YES forButton:3];
- [self setApplicationBadge:badge];
+ [buttonbar_ setBadgeAnimated:([essential_ count] != 0) forButton:3];
+ if ([self respondsToSelector:@selector(setApplicationBadge:)])
+ [self setApplicationBadge:badge];
+ else
+ [self setApplicationBadgeString:badge];
} else {
[buttonbar_ setBadgeValue:nil forButton:3];
if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
[buttonbar_ setBadgeAnimated:NO forButton:3];
- [self removeApplicationBadge];
+ if ([self respondsToSelector:@selector(removeApplicationBadge)])
+ [self removeApplicationBadge];
+ else // XXX: maybe use setApplicationBadgeString also?
+ [self setApplicationIconBadgeNumber:0];
}
+ Queuing_ = false;
+ [buttonbar_ setBadgeValue:nil forButton:4];
+
[self updateData];
- /*if ([packages count] == 0);
- else if (Loaded_)*/
+ // XXX: what is this line of code for?
+ if ([packages count] == 0);
+ else if (Loaded_ || ManualRefresh) loaded:
[self _loaded];
- /*else {
+ else {
Loaded_ = YES;
- [book_ update];
- }*/
- /*[hud show:NO];
- [hud removeFromSuperview];*/
+ if (NSDate *update = [Metadata_ objectForKey:@"LastUpdate"]) {
+ NSTimeInterval interval([update timeIntervalSinceNow]);
+ if (interval <= 0 && interval > -600)
+ goto loaded;
+ }
+
+ [book_ update];
+ }
}
- (void) _saveConfig {
if (Changed_) {
- _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
+ _trace();
+ NSString *error(nil);
+ if (NSData *data = [NSPropertyListSerialization dataFromPropertyList:Metadata_ format:NSPropertyListBinaryFormat_v1_0 errorDescription:&error]) {
+ _trace();
+ NSError *error(nil);
+ if (![data writeToFile:@"/var/lib/cydia/metadata.plist" options:NSAtomicWrite error:&error])
+ NSLog(@"failure to save metadata data: %@", error);
+ _trace();
+ } else {
+ NSLog(@"failure to serialize metadata: %@", error);
+ return;
+ }
+
Changed_ = false;
}
}
[self _saveConfig];
/* XXX: this is just stupid */
- if (tag_ != 2)
- [install_ reloadData];
- if (tag_ != 3)
+ if (tag_ != 2 && sections_ != nil)
+ [sections_ reloadData];
+ if (tag_ != 3 && changes_ != nil)
[changes_ reloadData];
- if (tag_ != 5)
+ if (tag_ != 5 && search_ != nil)
[search_ reloadData];
[book_ reloadData];
NSArray *keys = [Sources_ allKeys];
- for (int i(0), e([keys count]); i != e; ++i) {
- NSString *key = [keys objectAtIndex:i];
+ for (NSString *key in keys) {
NSDictionary *source = [Sources_ objectForKey:key];
fprintf(file, "%s %s %s\n",
detachNewThreadSelector:@selector(update_)
toTarget:self
withObject:nil
- title:@"Updating Sources..."
+ title:CYLocalize("UPDATING_SOURCES")
];
}
_error->Discard();
}
+- (void) popUpBook:(RVBook *)book {
+ [underlay_ popSubview:book];
+}
+
+- (CGRect) popUpBounds {
+ return [underlay_ bounds];
+}
+
- (void) perform {
[database_ prepare];
- if ([database_ cache]->BrokenCount() == 0)
- confirm_ = [[ConfirmationView alloc] initWithView:underlay_ database:database_ delegate:self];
- else {
- NSMutableArray *broken = [NSMutableArray arrayWithCapacity:16];
- NSArray *packages = [database_ packages];
+ confirm_ = [[RVBook alloc] initWithFrame:[self popUpBounds]];
+ [confirm_ setDelegate:self];
- for (size_t i(0); i != [packages count]; ++i) {
- Package *package = [packages objectAtIndex:i];
- if ([package broken])
- [broken addObject:[package name]];
- }
+ ConfirmationView *page([[[ConfirmationView alloc] initWithBook:confirm_ database:database_] autorelease]);
+ [page setDelegate:self];
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:[NSString stringWithFormat:@"%d Broken Packages", [database_ cache]->BrokenCount()]
- buttons:[NSArray arrayWithObjects:@"Okay", nil]
- defaultButtonIndex:0
- delegate:self
- context:@"broken"
- ] autorelease];
+ [confirm_ setPage:page];
+ [self popUpBook:confirm_];
+}
- [sheet setBodyText:[NSString stringWithFormat:@"The following packages have unmet dependencies:\n\n%@", [broken componentsJoinedByString:@"\n"]]];
- [sheet popupAlertAnimated:YES];
+- (void) queue {
+ @synchronized (self) {
+ [self perform];
+ }
+}
- [self _reloadData];
+- (void) clearPackage:(Package *)package {
+ @synchronized (self) {
+ [package clear];
+ [self resolve];
+ [self perform];
}
}
}
- (void) cancel {
+ [self slideUp:[[[UIActionSheet alloc]
+ initWithTitle:nil
+ buttons:[NSArray arrayWithObjects:CYLocalize("CONTINUE_QUEUING"), CYLocalize("CANCEL_CLEAR"), nil]
+ defaultButtonIndex:1
+ delegate:self
+ context:@"cancel"
+ ] autorelease]];
+}
+
+- (void) complete {
@synchronized (self) {
- [confirm_ release];
- confirm_ = nil;
[self _reloadData];
+
+ if (confirm_ != nil) {
+ [confirm_ release];
+ confirm_ = nil;
+ }
}
}
detachNewThreadSelector:@selector(perform)
toTarget:database_
withObject:nil
- title:@"Running..."
+ title:CYLocalize("RUNNING")
];
}
[database_ perform];
}
+/* XXX: replace and localize */
- (void) bootstrap {
[progress_
detachNewThreadSelector:@selector(bootstrap_)
toTarget:self
withObject:nil
- title:@"Bootstrap Install..."
+ title:@"Bootstrap Install"
];
}
- (void) progressViewIsComplete:(ProgressView *)progress {
- @synchronized (self) {
- [self _reloadData];
-
- if (confirm_ != nil) {
- [underlay_ addSubview:overlay_];
- [confirm_ removeFromSuperview];
- [confirm_ release];
- confirm_ = nil;
- }
+ if (confirm_ != nil) {
+ [underlay_ addSubview:overlay_];
+ [confirm_ popFromSuperviewAnimated:NO];
}
+
+ [self complete];
}
- (void) setPage:(RVPage *)page {
}
- (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class {
- BrowserView *browser = [[[_class alloc] initWithBook:book_ database:database_] autorelease];
+ BrowserView *browser = [[[_class alloc] initWithBook:book_] autorelease];
[browser loadURL:url];
return browser;
}
[self setPage:[self _pageForURL:[NSURL URLWithString:@"http://cydia.saurik.com/"] withClass:[HomeView class]]];
}
+- (SectionsView *) sectionsView {
+ if (sections_ == nil)
+ sections_ = [[SectionsView alloc] initWithBook:book_ database:database_];
+ return sections_;
+}
+
- (void) buttonBarItemTapped:(id)sender {
unsigned tag = [sender tag];
if (tag == tag_) {
[book_ resetViewAnimated:YES];
return;
} else if (tag_ == 2 && tag != 2)
- [install_ resetView];
+ [[self sectionsView] resetView];
switch (tag) {
case 1: [self _setHomePage]; break;
- case 2: [self setPage:install_]; break;
+ case 2: [self setPage:[self sectionsView]]; break;
case 3: [self setPage:changes_]; break;
case 4: [self setPage:manage_]; break;
case 5: [self setPage:search_]; break;
tag_ = tag;
}
-- (void) fixSpringBoard {
- 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);
- perror("launchctl unload");
- exit(0);
- }
-
- execlp("launchctl", "launchctl", "load", SpringBoard_, NULL);
- perror("launchctl load");
- exit(0);
- }
-}
-
- (void) applicationWillSuspend {
[database_ clean];
-
- if (reload_) {
-#ifndef __OBJC2__
- [self fixSpringBoard];
-#endif
-}
-
[super applicationWillSuspend];
}
- (void) askForSettings {
- UIAlertSheet *role = [[[UIAlertSheet alloc]
- initWithTitle:@"Who Are You?"
+ NSString *parenthetical(CYLocalize("PARENTHETICAL"));
+
+ UIActionSheet *role = [[[UIActionSheet alloc]
+ initWithTitle:CYLocalize("WHO_ARE_YOU")
buttons:[NSArray arrayWithObjects:
- @"User (Graphical Only)",
- @"Hacker (+ Command Line)",
- @"Developer (No Filters)",
+ [NSString stringWithFormat:parenthetical, CYLocalize("USER"), CYLocalize("USER_EX")],
+ [NSString stringWithFormat:parenthetical, CYLocalize("HACKER"), CYLocalize("HACKER_EX")],
+ [NSString stringWithFormat:parenthetical, CYLocalize("DEVELOPER"), CYLocalize("DEVELOPER_EX")],
nil]
defaultButtonIndex:-1
delegate:self
context:@"role"
] autorelease];
- [role setBodyText:@"Not all of the packages available via Cydia are designed to be used by all users. Please categorize yourself so that Cydia can apply helpful filters.\n\nThis choice can be changed from \"Settings\" under the \"Manage\" tab."];
+ [role setBodyText:CYLocalize("ROLE_EX")];
[role popupAlertAnimated:YES];
}
+- (void) setPackageView:(PackageView *)view {
+ if (package_ == nil)
+ package_ = [view retain];
+ NSLog(@"packageView: %@", package_);
+}
+
+- (PackageView *) packageView {
+ PackageView *view;
+
+ if (package_ == nil)
+ view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+ else {
+ return package_;
+ view = [package_ autorelease];
+ package_ = nil;
+ }
+
+ return view;
+}
+
- (void) finish {
if (hud_ != nil) {
[self setStatusBarShowsProgress:NO];
+ [self removeProgressHUD:hud_];
- [hud_ show:NO];
- [hud_ removeFromSuperview];
[hud_ autorelease];
hud_ = nil;
return;
}
+ _trace();
overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];
CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
@"home-dn.png", kUIButtonBarButtonSelectedInfo,
[NSNumber numberWithInt:1], kUIButtonBarButtonTag,
self, kUIButtonBarButtonTarget,
- @"Home", kUIButtonBarButtonTitle,
+ CYLocalize("HOME"), kUIButtonBarButtonTitle,
@"0", kUIButtonBarButtonType,
nil],
@"install-dn.png", kUIButtonBarButtonSelectedInfo,
[NSNumber numberWithInt:2], kUIButtonBarButtonTag,
self, kUIButtonBarButtonTarget,
- @"Sections", kUIButtonBarButtonTitle,
+ CYLocalize("SECTIONS"), kUIButtonBarButtonTitle,
@"0", kUIButtonBarButtonType,
nil],
@"changes-dn.png", kUIButtonBarButtonSelectedInfo,
[NSNumber numberWithInt:3], kUIButtonBarButtonTag,
self, kUIButtonBarButtonTarget,
- @"Changes", kUIButtonBarButtonTitle,
+ CYLocalize("CHANGES"), kUIButtonBarButtonTitle,
@"0", kUIButtonBarButtonType,
nil],
@"manage-dn.png", kUIButtonBarButtonSelectedInfo,
[NSNumber numberWithInt:4], kUIButtonBarButtonTag,
self, kUIButtonBarButtonTarget,
- @"Manage", kUIButtonBarButtonTitle,
+ CYLocalize("MANAGE"), kUIButtonBarButtonTitle,
@"0", kUIButtonBarButtonType,
nil],
@"search-dn.png", kUIButtonBarButtonSelectedInfo,
[NSNumber numberWithInt:5], kUIButtonBarButtonTag,
self, kUIButtonBarButtonTarget,
- @"Search", kUIButtonBarButtonTitle,
+ CYLocalize("SEARCH"), kUIButtonBarButtonTitle,
@"0", kUIButtonBarButtonType,
nil],
nil];
- buttonbar_ = [[UIButtonBar alloc]
+ buttonbar_ = [[UIToolbar alloc]
initInView:overlay_
withFrame:CGRectMake(
0, screenrect.size.height - ButtonBarHeight_,
CGSize keysize = [UIKeyboard defaultSize];
CGRect keyrect = {{0, [overlay_ bounds].size.height}, keysize};
keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect];
- [[UIKeyboardImpl sharedInstance] setSoundsEnabled:(Sounds_Keyboard_ ? YES : NO)];
+ //[[UIKeyboardImpl sharedInstance] setSoundsEnabled:(Sounds_Keyboard_ ? YES : NO)];
[overlay_ addSubview:keyboard_];
- install_ = [[InstallView alloc] initWithBook:book_ database:database_];
+ if (!bootstrap_)
+ [underlay_ addSubview:overlay_];
+
+ [self reloadData];
+
+ [self sectionsView];
changes_ = [[ChangesView alloc] initWithBook:book_ database:database_];
search_ = [[SearchView alloc] initWithBook:book_ database:database_];
withClass:[ManageView class]
] retain];
- if (!bootstrap_)
- [underlay_ addSubview:overlay_];
+ [self setPackageView:[self packageView]];
- [self reloadData];
+ PrintTimes();
if (bootstrap_)
[self bootstrap];
[self _setHomePage];
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
- NSString *context = [sheet context];
- if ([context isEqualToString:@"fixhalf"])
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+ NSString *context([sheet context]);
+
+ if ([context isEqualToString:@"missing"])
+ [sheet dismiss];
+ else if ([context isEqualToString:@"cancel"]) {
+ bool clear;
+
+ switch (button) {
+ case 1:
+ clear = false;
+ break;
+
+ case 2:
+ clear = true;
+ break;
+
+ default:
+ _assert(false);
+ }
+
+ [sheet dismiss];
+
+ @synchronized (self) {
+ if (clear)
+ [self _reloadData];
+ else {
+ Queuing_ = true;
+ [buttonbar_ setBadgeValue:CYLocalize("Q_D") forButton:4];
+ [book_ reloadData];
+ }
+
+ if (confirm_ != nil) {
+ [confirm_ release];
+ confirm_ = nil;
+ }
+ }
+ } else if ([context isEqualToString:@"fixhalf"]) {
switch (button) {
case 1:
@synchronized (self) {
- for (int i = 0, e = [broken_ count]; i != e; ++i) {
- Package *broken = [broken_ objectAtIndex:i];
+ for (Package *broken in broken_) {
[broken remove];
NSString *id = [broken id];
default:
_assert(false);
}
- else if ([context isEqualToString:@"role"]) {
+
+ [sheet dismiss];
+ } else if ([context isEqualToString:@"role"]) {
switch (button) {
case 1: Role_ = @"User"; break;
case 2: Role_ = @"Hacker"; break;
[self updateData];
else
[self finish];
- } else if ([context isEqualToString:@"upgrade"])
+
+ [sheet dismiss];
+ } else if ([context isEqualToString:@"upgrade"]) {
switch (button) {
case 1:
@synchronized (self) {
- for (int i = 0, e = [essential_ count]; i != e; ++i) {
- Package *essential = [essential_ objectAtIndex:i];
+ for (Package *essential in essential_)
[essential install];
- }
[self resolve];
[self perform];
break;
case 2:
+ [self distUpgrade];
+ break;
+
+ case 3:
Ignored_ = YES;
break;
_assert(false);
}
- [sheet dismiss];
+ [sheet dismiss];
+ }
}
-- (void) reorganize {
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (void) reorganize { _pooled
system("/usr/libexec/cydia/free.sh");
[self performSelectorOnMainThread:@selector(finish) withObject:nil waitUntilDone:NO];
- [pool release];
}
- (void) applicationSuspend:(__GSEvent *)event {
}
- (UIProgressHUD *) addProgressHUD {
- UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
+ UIProgressHUD *hud([[[UIProgressHUD alloc] initWithWindow:window_] autorelease]);
+ [window_ setUserInteractionEnabled:NO];
[hud show:YES];
- [underlay_ addSubview:hud];
+ [progress_ addSubview:hud];
return hud;
}
+- (void) removeProgressHUD:(UIProgressHUD *)hud {
+ [hud show:NO];
+ [hud removeFromSuperview];
+ [window_ setUserInteractionEnabled:YES];
+}
+
+- (void) openMailToURL:(NSURL *)url {
+// XXX: this makes me sad
+#if 0
+ [[[MailToView alloc] initWithView:underlay_ delegate:self url:url] autorelease];
+#else
+ [UIApp openURL:url];// asPanel:YES];
+#endif
+}
+
+- (void) clearFirstResponder {
+ if (id responder = [window_ firstResponder])
+ [responder resignFirstResponder];
+}
+
+- (RVPage *) pageForPackage:(NSString *)name {
+ if (Package *package = [database_ packageWithName:name]) {
+ PackageView *view([self packageView]);
+ [view setPackage:package];
+ return view;
+ } else {
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:CYLocalize("CANNOT_LOCATE_PACKAGE")
+ buttons:[NSArray arrayWithObjects:CYLocalize("CLOSE"), nil]
+ defaultButtonIndex:0
+ delegate:self
+ context:@"missing"
+ ] autorelease];
+
+ [sheet setBodyText:[NSString stringWithFormat:CYLocalize("PACKAGE_CANNOT_BE_FOUND"), name]];
+
+ [sheet popupAlertAnimated:YES];
+ return nil;
+ }
+}
+
+- (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag {
+ if (tag != NULL)
+ tag = 0;
+
+ NSString *scheme([[url scheme] lowercaseString]);
+ if (![scheme isEqualToString:@"cydia"])
+ return nil;
+ NSString *path([url absoluteString]);
+ if ([path length] < 8)
+ return nil;
+ path = [path substringFromIndex:8];
+ if (![path hasPrefix:@"/"])
+ path = [@"/" stringByAppendingString:path];
+
+ if ([path isEqualToString:@"/add-source"])
+ return [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease];
+ else if ([path isEqualToString:@"/storage"])
+ return [self _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"storage" ofType:@"html"]] withClass:[BrowserView class]];
+ else if ([path isEqualToString:@"/sources"])
+ return [[[SourceTable alloc] initWithBook:book_ database:database_] autorelease];
+ else if ([path isEqualToString:@"/packages"])
+ return [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease];
+ else if ([path hasPrefix:@"/url/"])
+ return [self _pageForURL:[NSURL URLWithString:[path substringFromIndex:5]] withClass:[BrowserView class]];
+ else if ([path hasPrefix:@"/launch/"])
+ [self launchApplicationWithIdentifier:[path substringFromIndex:8] suspended:NO];
+ else if ([path hasPrefix:@"/package-settings/"])
+ return [[[SettingsView alloc] initWithBook:book_ database:database_ package:[path substringFromIndex:18]] autorelease];
+ else if ([path hasPrefix:@"/package-signature/"])
+ return [[[SignatureView alloc] initWithBook:book_ database:database_ package:[path substringFromIndex:19]] autorelease];
+ else if ([path hasPrefix:@"/package/"])
+ return [self pageForPackage:[path substringFromIndex:9]];
+ else if ([path hasPrefix:@"/files/"]) {
+ NSString *name = [path substringFromIndex:7];
+
+ if (Package *package = [database_ packageWithName:name]) {
+ FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
+ [files setPackage:package];
+ return files;
+ }
+ }
+
+ return nil;
+}
+
+- (void) applicationOpenURL:(NSURL *)url {
+ [super applicationOpenURL:url];
+ int tag;
+ if (RVPage *page = [self pageForURL:url hasTag:&tag]) {
+ [self setPage:page];
+ [buttonbar_ showSelectionForButton:tag];
+ tag_ = tag;
+ }
+}
+
- (void) applicationDidFinishLaunching:(id)unused {
+ _trace();
Font12_ = [[UIFont systemFontOfSize:12] retain];
Font12Bold_ = [[UIFont boldSystemFontOfSize:12] retain];
Font14_ = [[UIFont systemFontOfSize:14] retain];
_assert(pkgInitConfig(*_config));
_assert(pkgInitSystem(*_config, _system));
- confirm_ = nil;
tag_ = 1;
essential_ = [[NSMutableArray alloc] initWithCapacity:4];
broken_ = [[NSMutableArray alloc] initWithCapacity:4];
+ [NSURLProtocol registerClass:[CydiaURLProtocol class]];
+
CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
window_ = [[UIWindow alloc] initWithContentRect:screenrect];
[window_ orderFront:self];
[window_ makeKey:self];
- [window_ _setHidden:NO];
+ [window_ setHidden:NO];
- database_ = [[Database alloc] init];
+ database_ = [Database sharedInstance];
progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
[database_ setDelegate:progress_];
[window_ setContentView:progress_];
readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL ||
readlink("/usr/include", NULL, 0) == -1 && errno == EINVAL ||
readlink("/usr/libexec", NULL, 0) == -1 && errno == EINVAL ||
- readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL
+ readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL /*||
+ readlink("/var/lib", NULL, 0) == -1 && errno == EINVAL*/
) {
[self setIdleTimerDisabled:YES];
- hud_ = [self addProgressHUD];
- [hud_ setText:@"Reorganizing\n\nWill Automatically\nRestart When Done"];
+ hud_ = [[self addProgressHUD] retain];
+ [hud_ setText:@"Reorganizing\n\nWill Automatically\nClose When Done"];
[self setStatusBarShowsProgress:YES];
];
}
-- (void) slideUp:(UIAlertSheet *)alert {
+- (void) slideUp:(UIActionSheet *)alert {
if (Advanced_)
[alert presentSheetFromButtonBar:buttonbar_];
else
@end
-void AddPreferences(NSString *plist) {
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+void AddPreferences(NSString *plist) { _pooled
NSMutableDictionary *settings = [[[NSMutableDictionary alloc] initWithContentsOfFile:plist] autorelease];
_assert(settings != NULL);
NSMutableArray *items = [settings objectForKey:@"items"];
bool cydia(false);
- for (size_t i(0); i != [items count]; ++i) {
- NSMutableDictionary *item([items objectAtIndex:i]);
+ for (NSMutableDictionary *item in items) {
NSString *label = [item objectForKey:@"label"];
if (label != nil && [label isEqualToString:@"Cydia"]) {
cydia = true;
_assert([settings writeToFile:plist atomically:YES] == YES);
}
-
- [pool release];
}
/*IMP alloc_;
id Alloc_(id self, SEL selector) {
id object = alloc_(self, selector);
- fprintf(stderr, "[%s]A-%p\n", self->isa->name, object);
+ lprintf("[%s]A-%p\n", self->isa->name, object);
return object;
}*/
/*IMP dealloc_;
id Dealloc_(id self, SEL selector) {
id object = dealloc_(self, selector);
- fprintf(stderr, "[%s]D-%p\n", self->isa->name, object);
+ lprintf("[%s]D-%p\n", self->isa->name, object);
return object;
}*/
-int main(int argc, char *argv[]) {
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+Class $WebDefaultUIKitDelegate;
+
+void (*_UIWebDocumentView$_setUIKitDelegate$)(UIWebDocumentView *, SEL, id);
+
+void $UIWebDocumentView$_setUIKitDelegate$(UIWebDocumentView *self, SEL sel, id delegate) {
+ if (delegate == nil && $WebDefaultUIKitDelegate != nil)
+ delegate = [$WebDefaultUIKitDelegate sharedUIKitDelegate];
+ return _UIWebDocumentView$_setUIKitDelegate$(self, sel, delegate);
+}
+
+int main(int argc, char *argv[]) { _pooled
+ _trace();
+
+ Locale_ = CFLocaleCopyCurrent();
+
+ CFStringRef locale(CFLocaleGetIdentifier(Locale_));
+ setenv("LANG", [(NSString *) locale UTF8String], true);
+
+ // XXX: apr_app_initialize?
+ apr_initialize();
+
+ class_addMethod(objc_getClass("DOMNodeList"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &DOMNodeList$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16");
+
+ bool substrate(false);
+
+ if (argc != 0) {
+ char **args(argv);
+ int arge(1);
+
+ for (int argi(1); argi != argc; ++argi)
+ if (strcmp(argv[argi], "--") == 0) {
+ arge = argi;
+ argv[argi] = argv[0];
+ argv += argi;
+ argc -= argi;
+ break;
+ }
- bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0;
+ for (int argi(1); argi != arge; ++argi)
+ if (strcmp(args[argi], "--bootstrap") == 0)
+ bootstrap_ = true;
+ else if (strcmp(args[argi], "--substrate") == 0)
+ substrate = true;
+ else
+ fprintf(stderr, "unknown argument: %s\n", args[argi]);
+ }
+ App_ = [[NSBundle mainBundle] bundlePath];
Home_ = NSHomeDirectory();
{
setuid(0);
setgid(0);
+#if 1 /* XXX: this costs 1.4s of startup performance */
if (unlink("/var/cache/apt/pkgcache.bin") == -1)
_assert(errno == ENOENT);
if (unlink("/var/cache/apt/srcpkgcache.bin") == -1)
_assert(errno == ENOENT);
+#endif
+
+ $WebDefaultUIKitDelegate = objc_getClass("WebDefaultUIKitDelegate");
+ Method UIWebDocumentView$_setUIKitDelegate$(class_getInstanceMethod([WebView class], @selector(_setUIKitDelegate:)));
+ if (UIWebDocumentView$_setUIKitDelegate$ != NULL) {
+ _UIWebDocumentView$_setUIKitDelegate$ = reinterpret_cast<void (*)(UIWebDocumentView *, SEL, id)>(method_getImplementation(UIWebDocumentView$_setUIKitDelegate$));
+ method_setImplementation(UIWebDocumentView$_setUIKitDelegate$, reinterpret_cast<IMP>(&$UIWebDocumentView$_setUIKitDelegate$));
+ }
/*Method alloc = class_getClassMethod([NSObject class], @selector(alloc));
alloc_ = alloc->method_imp;
dealloc_ = dealloc->method_imp;
dealloc->method_imp = (IMP) &Dealloc_;*/
- if (NSDictionary *sysver = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"]) {
- if (NSString *prover = [sysver valueForKey:@"ProductVersion"]) {
- Firmware_ = strdup([prover UTF8String]);
- NSArray *versions = [prover componentsSeparatedByString:@"."];
- int count = [versions count];
- Major_ = count > 0 ? [[versions objectAtIndex:0] intValue] : 0;
- Minor_ = count > 1 ? [[versions objectAtIndex:1] intValue] : 0;
- BugFix_ = count > 2 ? [[versions objectAtIndex:2] intValue] : 0;
- }
+ size_t size;
+
+ int maxproc;
+ size = sizeof(maxproc);
+ if (sysctlbyname("kern.maxproc", &maxproc, &size, NULL, 0) == -1)
+ perror("sysctlbyname(\"kern.maxproc\", ?)");
+ else if (maxproc < 64) {
+ maxproc = 64;
+ if (sysctlbyname("kern.maxproc", NULL, NULL, &maxproc, sizeof(maxproc)) == -1)
+ perror("sysctlbyname(\"kern.maxproc\", #)");
}
- size_t size;
sysctlbyname("hw.machine", NULL, &size, NULL, 0);
char *machine = new char[size];
- sysctlbyname("hw.machine", machine, &size, NULL, 0);
- Machine_ = machine;
-
- if (CFMutableDictionaryRef dict = IOServiceMatching("IOPlatformExpertDevice"))
- if (io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, dict)) {
- if (CFTypeRef serial = IORegistryEntryCreateCFProperty(service, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault, 0)) {
- SerialNumber_ = strdup(CFStringGetCStringPtr((CFStringRef) serial, CFStringGetSystemEncoding()));
- CFRelease(serial);
- }
+ if (sysctlbyname("hw.machine", machine, &size, NULL, 0) == -1)
+ perror("sysctlbyname(\"hw.machine\", ?)");
+ else
+ Machine_ = machine;
- IOObjectRelease(service);
- }
+ UniqueID_ = [[UIDevice currentDevice] uniqueIdentifier];
+
+ if (NSDictionary *system = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"])
+ Build_ = [system objectForKey:@"ProductBuildVersion"];
+ if (NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:@"/Applications/MobileSafari.app/Info.plist"]) {
+ Product_ = [info objectForKey:@"SafariProductVersion"];
+ Safari_ = [info objectForKey:@"CFBundleVersion"];
+ }
/*AddPreferences(@"/Applications/Preferences.app/Settings-iPhone.plist");
AddPreferences(@"/Applications/Preferences.app/Settings-iPod.plist");*/
- if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL)
- Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2];
+ _trace();
+ Metadata_ = [[[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"] autorelease];
+ _trace();
+ SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease];
+ _trace();
+
+ if (Metadata_ == NULL)
+ Metadata_ = [NSMutableDictionary dictionaryWithCapacity:2];
else {
Settings_ = [Metadata_ objectForKey:@"Settings"];
[Metadata_ setObject:Sources_ forKey:@"Sources"];
}
- if (access("/User", F_OK) != 0)
+#if RecycleWebViews
+ Documents_ = [[[NSMutableArray alloc] initWithCapacity:4] autorelease];
+#endif
+
+ if (substrate && access("/Applications/WinterBoard.app/WinterBoard.dylib", F_OK) == 0)
+ dlopen("/Applications/WinterBoard.app/WinterBoard.dylib", RTLD_LAZY | RTLD_GLOBAL);
+ /*if (substrate && access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0)
+ dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);*/
+
+ if (access("/User", F_OK) != 0) {
+ _trace();
system("/usr/libexec/cydia/firmware.sh");
+ _trace();
+ }
+
+ _assert([[NSFileManager defaultManager]
+ createDirectoryAtPath:@"/var/cache/apt/archives/partial"
+ withIntermediateDirectories:YES
+ attributes:nil
+ error:NULL
+ ]);
- Locale_ = CFLocaleCopyCurrent();
space_ = CGColorSpaceCreateDeviceRGB();
Blue_.Set(space_, 0.2, 0.2, 1.0, 1.0);
Blueish_.Set(space_, 0x19/255.f, 0x32/255.f, 0x50/255.f, 1.0);
Black_.Set(space_, 0.0, 0.0, 0.0, 1.0);
- Clear_.Set(space_, 0.0, 0.0, 0.0, 0.0);
- Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);
+ Off_.Set(space_, 0.9, 0.9, 0.9, 1.0);
White_.Set(space_, 1.0, 1.0, 1.0, 1.0);
Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0);
+ Green_.Set(space_, 0.0, 0.5, 0.0, 1.0);
+ Purple_.Set(space_, 0.0, 0.0, 0.7, 1.0);
+ Purplish_.Set(space_, 0.4, 0.4, 0.8, 1.0);
+ /*Purple_.Set(space_, 1.0, 0.3, 0.0, 1.0);
+ Purplish_.Set(space_, 1.0, 0.6, 0.4, 1.0); ORANGE */
+ /*Purple_.Set(space_, 1.0, 0.5, 0.0, 1.0);
+ Purplish_.Set(space_, 1.0, 0.7, 0.2, 1.0); ORANGISH */
+ /*Purple_.Set(space_, 0.5, 0.0, 0.7, 1.0);
+ Purplish_.Set(space_, 0.7, 0.4, 0.8, 1.0); PURPLE */
- SectionMap_ = [NSMutableDictionary dictionaryWithCapacity:16]; {
- std::ifstream fin([[[NSBundle mainBundle] pathForResource:@"sections" ofType:@"txt"] UTF8String]);
- std::string line;
- while (std::getline(fin, line)) {
- size_t space = line.find_first_of(' ');
- if (space == std::string::npos)
- continue;
- [SectionMap_
- setObject:[NSString stringWithUTF8String:line.substr(space + 1).c_str()]
- forKey:[NSString stringWithUTF8String:line.substr(0, space).c_str()]
- ];
- }
- }
+//.93
+ InstallingColor_ = [UIColor colorWithRed:0.88f green:1.00f blue:0.88f alpha:1.00f];
+ RemovingColor_ = [UIColor colorWithRed:1.00f green:0.88f blue:0.88f alpha:1.00f];
+
+ Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil];
+
+ void (*$GSFontSetUseLegacyFontMetrics)(BOOL)(reinterpret_cast<void (*)(BOOL)>(dlsym(RTLD_DEFAULT, "GSFontSetUseLegacyFontMetrics")));
+ if ($GSFontSetUseLegacyFontMetrics != NULL)
+ $GSFontSetUseLegacyFontMetrics(YES);
+
+ UIKeyboardDisableAutomaticAppearance();
- int value = UIApplicationMain(argc, argv, [Cydia class]);
+ _trace();
+ int value = UIApplicationMain(argc, argv, @"Cydia", @"Cydia");
CGColorSpaceRelease(space_);
CFRelease(Locale_);
- [pool release];
return value;
}
projects / cydia.git / blobdiff