#include <apt-pkg/acquire-item.h>
#include <apt-pkg/algorithms.h>
#include <apt-pkg/cachefile.h>
+#include <apt-pkg/clean.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/debmetaindex.h>
#include <apt-pkg/error.h>
#endif
/* }}} */
+#ifdef __OBJC2__
+typedef enum {
+ kUIProgressIndicatorStyleMediumWhite = 1,
+ kUIProgressIndicatorStyleSmallWhite = 0,
+ kUIProgressIndicatorStyleSmallBlack = 4
+} UIProgressIndicatorStyle;
+#else
+typedef enum {
+ kUIProgressIndicatorStyleMediumWhite = 0,
+ kUIProgressIndicatorStyleSmallWhite = 2,
+ kUIProgressIndicatorStyleSmallBlack = 3
+} UIProgressIndicatorStyle;
+#endif
+
+typedef enum {
+ kUIControlEventMouseDown = 1 << 0,
+ kUIControlEventMouseMovedInside = 1 << 2, // mouse moved inside control target
+ kUIControlEventMouseMovedOutside = 1 << 3, // mouse moved outside control target
+ kUIControlEventMouseUpInside = 1 << 6, // mouse up inside control target
+ kUIControlEventMouseUpOutside = 1 << 7, // mouse up outside control target
+ kUIControlAllEvents = (kUIControlEventMouseDown | kUIControlEventMouseMovedInside | kUIControlEventMouseMovedOutside | kUIControlEventMouseUpInside | kUIControlEventMouseUpOutside)
+} UIControlEventMasks;
+
@interface NSString (UIKit)
- (NSString *) stringByAddingPercentEscapes;
- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;
static const int PulseInterval_ = 50000;
static const int ButtonBarHeight_ = 48;
static const float KeyboardTime_ = 0.4f;
+static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist";
+#ifndef Cydia_
+#define Cydia_ ""
+#endif
+
+static CGColor Blueish_;
static CGColor Black_;
static CGColor Clear_;
static CGColor Red_;
unsigned Minor_;
unsigned BugFix_;
+CFLocaleRef Locale_;
CGColorSpaceRef space_;
#define FW_LEAST(major, minor, bugfix) \
bugfix <= BugFix_))
bool bootstrap_;
-bool restart_;
+bool reload_;
static NSMutableDictionary *Metadata_;
static NSMutableDictionary *Packages_;
if (update == nil)
return @"Never or Unknown";
- CFLocaleRef locale = CFLocaleCopyCurrent();
- CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+ CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);
CFRelease(formatter);
- CFRelease(locale);
return [(NSString *) formatted autorelease];
}
return [NSString stringWithFormat:@"%.1f%s", size, powers_[power]];
}
+NSString *StripVersion(NSString *version) {
+ NSRange colon = [version rangeOfString:@":"];
+ if (colon.location != NSNotFound)
+ version = [version substringFromIndex:(colon.location + 1)];
+ return version;
+}
+
static const float TextViewOffset_ = 22;
UITextView *GetTextView(NSString *value, float left, bool html) {
@class Package;
@class Source;
+@interface NSObject (ProgressDelegate)
+@end
+
+@implementation NSObject(ProgressDelegate)
+
+- (void) _setProgressError:(NSArray *)args {
+ [self performSelector:@selector(setProgressError:forPackage:)
+ withObject:[args objectAtIndex:0]
+ withObject:([args count] == 1 ? nil : [args objectAtIndex:1])
+ ];
+}
+
+@end
+
@protocol ProgressDelegate
-- (void) setProgressError:(NSString *)error;
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id;
- (void) setProgressTitle:(NSString *)title;
- (void) setProgressPercent:(float)percent;
- (void) addProgressOutput:(NSString *)output;
public pkgAcquireStatus
{
private:
- _transient id<ProgressDelegate> delegate_;
+ _transient NSObject<ProgressDelegate> *delegate_;
public:
Status() :
)
return;
- [delegate_ setProgressError:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()]];
+ [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+ withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()], nil]
+ waitUntilDone:YES
+ ];
}
virtual bool Pulse(pkgAcquire *Owner) {
NSMutableDictionary *sources_;
NSMutableArray *packages_;
- _transient id<ConfigurationDelegate, ProgressDelegate> delegate_;
+ _transient NSObject<ConfigurationDelegate, ProgressDelegate> *delegate_;
Status status_;
Progress progress_;
+ int cydiafd_;
int statusfd_;
FILE *input_;
}
+- (void) _readCydia:(NSNumber *)fd;
- (void) _readStatus:(NSNumber *)fd;
- (void) _readOutput:(NSNumber *)fd;
NSString *tagline_;
NSString *icon_;
NSString *website_;
+ Address *sponsor_;
+ Address *author_;
NSArray *relationships_;
}
- (NSString *) installed;
- (BOOL) valid;
-- (BOOL) upgradable;
+- (BOOL) upgradableAndEssential:(BOOL)essential;
- (BOOL) essential;
- (BOOL) broken;
+- (BOOL) half;
+- (BOOL) halfConfigured;
+- (BOOL) halfInstalled;
+- (BOOL) hasMode;
+- (NSString *) mode;
+
- (NSString *) id;
- (NSString *) name;
- (NSString *) tagline;
- (NSString *) icon;
- (NSString *) website;
+- (Address *) author;
- (NSArray *) relationships;
[icon_ release];
if (website_ != nil)
[website_ release];
+ if (sponsor_ != nil)
+ [sponsor_ release];
+ if (author_ != nil)
+ [author_ release];
if (relationships_ != nil)
[relationships_ release];
database_ = database;
version_ = [database_ policy]->GetCandidateVer(iterator_);
- latest_ = version_.end() ? nil : [[NSString stringWithUTF8String:version_.VerStr()] retain];
+ latest_ = version_.end() ? nil : [StripVersion([NSString stringWithUTF8String:version_.VerStr()]) retain];
if (!version_.end())
file_ = version_.FileList();
}
pkgCache::VerIterator current = iterator_.CurrentVer();
- installed_ = current.end() ? nil : [[NSString stringWithUTF8String:current.VerStr()] retain];
+ installed_ = current.end() ? nil : [StripVersion([NSString stringWithUTF8String:current.VerStr()]) retain];
id_ = [[[NSString stringWithUTF8String:iterator_.Name()] lowercaseString] retain];
icon_ = Scour("Icon", begin, end);
if (icon_ != nil)
icon_ = [icon_ retain];
- website_ = Scour("Website", begin, end);
+ 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];
}
NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
return !version_.end();
}
-- (BOOL) upgradable {
+- (BOOL) upgradableAndEssential:(BOOL)essential {
pkgCache::VerIterator current = iterator_.CurrentVer();
if (current.end())
- return [self essential];
+ return essential && [self essential];
else {
pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_);
return !candidate.end() && candidate != current;
}
- (BOOL) broken {
- return (*[database_ cache])[iterator_].InstBroken();
+ return [database_ cache][iterator_].InstBroken();
+}
+
+- (BOOL) half {
+ unsigned char current = iterator_->CurrentState;
+ return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled;
+}
+
+- (BOOL) halfConfigured {
+ return iterator_->CurrentState == pkgCache::State::HalfConfigured;
+}
+
+- (BOOL) halfInstalled {
+ return iterator_->CurrentState == pkgCache::State::HalfInstalled;
+}
+
+- (BOOL) hasMode {
+ pkgDepCache::StateCache &state([database_ cache][iterator_]);
+ return state.Mode != pkgDepCache::ModeKeep;
+}
+
+- (NSString *) mode {
+ pkgDepCache::StateCache &state([database_ cache][iterator_]);
+
+ switch (state.Mode) {
+ case pkgDepCache::ModeDelete:
+ if ((state.iFlags & pkgDepCache::Purge) != 0)
+ return @"Purge";
+ else
+ return @"Remove";
+ _assert(false);
+ case pkgDepCache::ModeKeep:
+ if ((state.iFlags & pkgDepCache::AutoKept) != 0)
+ return nil;
+ else
+ return nil;
+ _assert(false);
+ case pkgDepCache::ModeInstall:
+ if ((state.iFlags & pkgDepCache::ReInstall) != 0)
+ return @"Reinstall";
+ else switch (state.Status) {
+ case -1:
+ return @"Downgrade";
+ case 0:
+ return @"Install";
+ case 1:
+ return @"Upgrade";
+ case 2:
+ return @"New Install";
+ default:
+ _assert(false);
+ }
+ default:
+ _assert(false);
+ }
}
- (NSString *) id {
return website_;
}
+- (Address *) sponsor {
+ return sponsor_;
+}
+
+- (Address *) author {
+ return author_;
+}
+
- (NSArray *) relationships {
return relationships_;
}
}
- (NSComparisonResult) compareForChanges:(Package *)package {
- BOOL lhs = [self upgradable];
- BOOL rhs = [package upgradable];
+ BOOL lhs = [self upgradableAndEssential:YES];
+ BOOL rhs = [package upgradableAndEssential:YES];
if (lhs != rhs)
return lhs ? NSOrderedAscending : NSOrderedDescending;
[super dealloc];
}
+- (void) _readCydia:(NSNumber *)fd {
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+ __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+ std::istream is(&ib);
+ std::string line;
+
+ while (std::getline(is, line)) {
+ const char *data(line.c_str());
+ //size_t size = line.size();
+ fprintf(stderr, "C:%s\n", data);
+ }
+
+ [pool release];
+ _assert(false);
+}
+
- (void) _readStatus:(NSNumber *)fd {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
while (std::getline(is, line)) {
const char *data(line.c_str());
size_t size = line.size();
- fprintf(stderr, "%s\n", data);
+ fprintf(stderr, "S:%s\n", data);
if (conffile_r(data, size)) {
[delegate_ setConfigurationData:conffile_r[1]];
NSString *string = [NSString stringWithUTF8String:(data + 8)];
[delegate_ setProgressTitle:string];
} else if (pmstatus_r(data, size)) {
+ std::string type([pmstatus_r[1] UTF8String]);
+ NSString *id = pmstatus_r[2];
+
float percent([pmstatus_r[3] floatValue]);
[delegate_ setProgressPercent:(percent / 100)];
NSString *string = pmstatus_r[4];
- std::string type([pmstatus_r[1] UTF8String]);
if (type == "pmerror")
- [delegate_ setProgressError:string];
+ [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+ withObject:[NSArray arrayWithObjects:string, id, nil]
+ waitUntilDone:YES
+ ];
else if (type == "pmstatus")
[delegate_ setProgressTitle:string];
else if (type == "pmconffile")
std::string line;
while (std::getline(is, line)) {
- fprintf(stderr, "%s\n", line.c_str());
+ fprintf(stderr, "O:%s\n", line.c_str());
[delegate_ addProgressOutput:[NSString stringWithUTF8String:line.c_str()]];
}
int fds[2];
+ _assert(pipe(fds) != -1);
+ cydiafd_ = fds[1];
+
+ _config->Set("APT::Keep-Fds::", cydiafd_);
+ setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 0"] UTF8String], _not(int));
+
+ [NSThread
+ detachNewThreadSelector:@selector(_readCydia:)
+ toTarget:self
+ withObject:[[NSNumber numberWithInt:fds[0]] retain]
+ ];
+
_assert(pipe(fds) != -1);
statusfd_ = fds[1];
list_ = new pkgSourceList();
_assert(list_->ReadMainList());
+ _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
+ _assert(pkgApplyStatus(cache_));
+
+ if (cache_->BrokenCount() != 0) {
+ _assert(pkgFixBroken(cache_));
+ _assert(cache_->BrokenCount() == 0);
+ _assert(pkgMinimizeUpgrade(cache_));
+ }
+
[sources_ removeAllObjects];
for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) {
std::vector<pkgIndexFile *> *indices = (*source)->GetIndexFiles();
system([dpkg UTF8String]);
}
+- (void) clean {
+ if (lock_ != NULL)
+ return;
+
+ FileFd Lock;
+ Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
+ _assert(!_error->PendingError());
+
+ pkgAcquire fetcher;
+ fetcher.Clean(_config->FindDir("Dir::Cache::Archives"));
+
+ class LogCleaner :
+ public pkgArchiveCleaner
+ {
+ protected:
+ virtual void Erase(const char *File, std::string Pkg, std::string Ver, struct stat &St) {
+ unlink(File);
+ }
+ } cleaner;
+
+ if (!cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)) {
+ std::string error;
+ while (_error->PopMessage(error))
+ fprintf(stderr, "ArchiveCleaner: %s\n", error.c_str());
+ }
+}
+
- (void) prepare {
pkgRecords records(cache_);
}
- (void) upgrade {
- _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
- _assert(pkgApplyStatus(cache_));
-
- if (cache_->BrokenCount() != 0) {
- _assert(pkgFixBroken(cache_));
- _assert(cache_->BrokenCount() == 0);
- _assert(pkgMinimizeUpgrade(cache_));
- }
-
_assert(pkgDistUpgrade(cache_));
}
}
- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
- [essential_ dismiss];
- [self cancel];
+ NSString *context = [sheet context];
+
+ if ([context isEqualToString:@"remove"])
+ switch (button) {
+ case 1:
+ [self cancel];
+ break;
+ case 2:
+ [delegate_ confirm];
+ break;
+ default:
+ _assert(false);
+ }
+ else if ([context isEqualToString:@"unable"])
+ [self cancel];
+
+ [sheet dismiss];
}
- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
if (!remove)
essential_ = nil;
- else {
+ else if (Advanced_ || true) {
+ essential_ = [[UIAlertSheet alloc]
+ initWithTitle:@"Removing Essentials"
+ buttons:[NSArray arrayWithObjects:
+ @"Cancel Operation (Safe)",
+ @"Force Removal (Unsafe)",
+ nil]
+ defaultButtonIndex:0
+ delegate:self
+ context:@"remove"
+ ];
+
+#ifndef __OBJC2__
+ [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]];
+#endif
+ [essential_ setBodyText:@"This operation involves the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. If you continue, you may not be able to use Cydia to repair any damage."];
+ } else {
essential_ = [[UIAlertSheet alloc]
initWithTitle:@"Unable to Comply"
buttons:[NSArray arrayWithObjects:@"Okay", nil]
defaultButtonIndex:0
delegate:self
- context:@"remove"
+ context:@"unable"
];
- [essential_ setBodyText:@"One or more of the packages you are about to remove are marked 'Essential' and cannot be removed by Cydia. Please use apt-get."];
+ [essential_ setBodyText:@"This operation requires the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. In order to continue and force this operation you will need to be activate the Advanced mode under to continue and force this operation you will need to be activate the Advanced mode under Settings."];
}
AddTextView(fields_, installing, @"Installing");
UIProgressBar *progress_;
UITextView *output_;
UITextLabel *status_;
+ UIPushButton *close_;
id delegate_;
+ BOOL running_;
}
- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
- (void) _detachNewThreadData:(ProgressData *)data;
- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title;
+- (BOOL) isRunning;
+
@end
@protocol ProgressViewDelegate
[progress_ release];
[output_ release];
[status_ release];
+ [close_ release];
[super dealloc];
}
}, prgsize};
progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
- [overlay_ addSubview:progress_];
+ [progress_ setStyle:0];
status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(
10,
[output_ setMarginTop:0];
[output_ setAllowsRubberBanding:YES];
+ [output_ setEditable:NO];
[overlay_ addSubview:output_];
- [overlay_ addSubview:status_];
- [progress_ setStyle:0];
+ close_ = [[UIPushButton alloc] initWithFrame:CGRectMake(
+ 10,
+ bounds.size.height - prgsize.height - 50,
+ bounds.size.width - 20,
+ 32 + prgsize.height
+ )];
+
+ [close_ setAutosizesToFit:NO];
+ [close_ setDrawsShadow:YES];
+ [close_ setStretchBackground:YES];
+ [close_ setTitle:@"Close Window"];
+ [close_ setEnabled:YES];
+
+ GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+ [close_ setTitleFont:bold];
+ CFRelease(bold);
+
+ [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside];
+ [close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0];
+ [close_ setBackground:[UIImage applicationImageNamed:@"green-dn.png"] forState:1];
} return self;
}
case 1:
fprintf(input, "N\n");
fflush(input);
- break;
-
+ break;
case 2:
fprintf(input, "Y\n");
fflush(input);
- break;
-
- default: _assert(false);
+ break;
+ default:
+ _assert(false);
}
}
[sheet dismiss];
}
-- (void) _retachThread {
+- (void) closeButtonPushed {
[delegate_ progressViewIsComplete:self];
[self resetView];
}
+- (void) _retachThread {
+ UINavigationItem *item = [navbar_ topItem];
+ [item setTitle:@"Complete"];
+
+ [overlay_ addSubview:close_];
+ [progress_ removeFromSuperview];
+ [status_ removeFromSuperview];
+
+ [delegate_ setStatusBarShowsProgress:NO];
+ running_ = NO;
+}
+
- (void) _detachNewThreadData:(ProgressData *)data {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
[output_ setText:@""];
[progress_ setProgress:0];
+ [close_ removeFromSuperview];
+ [overlay_ addSubview:progress_];
+ [overlay_ addSubview:status_];
+
+ [delegate_ setStatusBarShowsProgress:YES];
+ running_ = YES;
+
[transition_ transition:6 toView:overlay_];
[NSThread
];
}
-- (void) setProgressError:(NSString *)error {
- [self
- performSelectorOnMainThread:@selector(_setProgressError:)
- withObject:error
- waitUntilDone:YES
- ];
+- (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]
+ defaultButtonIndex:0
+ delegate:self
+ context:@"error"
+ ] autorelease];
+
+ [sheet setBodyText:error];
+ [sheet popupAlertAnimated:YES];
}
- (void) setProgressTitle:(NSString *)title {
[sheet popupAlertAnimated:YES];
}
-- (void) _setProgressError:(NSString *)error {
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:@"Package Error"
- buttons:[NSArray arrayWithObjects:@"Okay", nil]
- defaultButtonIndex:0
- delegate:self
- context:@"error"
- ] autorelease];
-
- [sheet setBodyText:error];
- [sheet popupAlertAnimated:YES];
-}
-
- (void) _setProgressTitle:(NSString *)title {
[status_ setText:[title stringByAppendingString:@"..."]];
}
[output_ scrollRectToVisible:rect animated:YES];
}
+- (BOOL) isRunning {
+ return NO;
+}
+
@end
/* }}} */
UITextLabel *name_;
UITextLabel *description_;
UITextLabel *source_;
- UIImageView *trusted_;
+ //UIImageView *trusted_;
+#ifdef USE_BADGES
+ UIImageView *badge_;
+ UITextLabel *status_;
+#endif
+ BOOL setup_;
}
- (PackageCell *) init;
- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
- (void) _setSelectionFadeFraction:(float)fraction;
++ (int) heightForPackage:(Package *)package;
+
@end
@implementation PackageCell
[name_ release];
[description_ release];
[source_ release];
- [trusted_ release];
+#ifdef USE_BADGES
+ [badge_ release];
+ [status_ release];
+#endif
+ //[trusted_ release];
[super dealloc];
}
[description_ setBackgroundColor:Clear_];
[description_ setFont:small];
- trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
- [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];
+ /*trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
+ [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];*/
+
+#ifdef USE_BADGES
+ badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
+
+ status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];
+ [status_ setBackgroundColor:Clear_];
+ [status_ setFont:small];
+#endif
+
+ /*[icon_ setImage:[UIImage applicationImageNamed:@"unknown.png"]];
+ [icon_ zoomToScale:0.5];
+ [icon_ setFrame:CGRectMake(10, 10, 30, 30)];*/
[self addSubview:icon_];
[self addSubview:name_];
}
- (void) setPackage:(Package *)package {
+ /*if (setup_)
+ return;
+ else
+ setup_ = YES;*/
+
Source *source = [package source];
UIImage *image = nil;
image = [UIImage applicationImageNamed:@"unknown.png"];
[icon_ setImage:image];
- if (image != nil) {
+ /*if (image != nil) {
CGSize size = [image size];
float scale = 30 / std::max(size.width, size.height);
[icon_ zoomToScale:scale];
- }
+ }*/
[icon_ setFrame:CGRectMake(10, 10, 30, 30)];
[source_ setText:from];
- if (trusted)
- [self addSubview:trusted_];
- else
- [trusted_ removeFromSuperview];
+#ifdef USE_BADGES
+ [badge_ removeFromSuperview];
+ [status_ removeFromSuperview];
+
+ if (NSString *mode = [package mode]) {
+ [badge_ setImage:[UIImage applicationImageNamed:
+ [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png"
+ ]];
+
+ [status_ setText:[NSString stringWithFormat:@"Queued for %@", mode]];
+ [status_ setColor:Blueish_];
+ } else if ([package half]) {
+ [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
+ [status_ setText:@"Package Damaged"];
+ [status_ setColor:Red_];
+ } else {
+ [badge_ setImage:nil];
+ [status_ setText:nil];
+ goto done;
+ }
+
+ [self addSubview:badge_];
+ [self addSubview:status_];
+ done:;
+#endif
}
- (void) _setSelected:(float)fraction {
[super _setSelectionFadeFraction:fraction];
}
++ (int) heightForPackage:(Package *)package {
+#ifdef USE_BADGES
+ if ([package hasMode] || [package half])
+ return 96;
+ else
+#endif
+ return 73;
+}
+
@end
/* }}} */
/* Section Cell {{{ */
return reusing;
}
-- (BOOL) canSelectRow:(int)row {
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
return NO;
}
- (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;
- if ([[package_ source] trusted])
- ++number;
return number;
} else if ([package_ installed] != nil && group-- == 0)
return 2;
++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];
[cell setShowSelection:NO];
if (group-- == 0) {
- if (row-- == 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 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_ installed] != nil && group-- == 0) {
- if (row-- == 0) {
+ if (false) {
+ } else if (row-- == 0) {
[cell setTitle:@"Version"];
NSString *installed([package_ installed]);
[cell setValue:(installed == nil ? @"n/a" : installed)];
[cell setShowSelection:YES];
} else _assert(false);
} else if (group-- == 0) {
- if (row-- == 0) {
+ if (false) {
+ } else if (row-- == 0) {
[cell setTitle:@"Identifier"];
[cell setValue:[package_ id]];
} else if (row-- == 0) {
[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 (row-- == 0) {
+ if (false) {
+ } else if (row-- == 0) {
NSString *label = [source label];
if (label == nil)
label = [source uri];
- (void) tableRowSelected:(NSNotification *)notification {
int row = [table_ selectedRow];
- NSString *website = [package_ website];
- BOOL trusted = [[package_ source] trusted];
- NSString *installed = [package_ installed];
-
- if (row == 7
- + (website == nil ? 0 : 1)
- + (trusted ? 1 : 0)
- + (installed == nil ? 0 : 3)
- )
- [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
- [[package_ maintainer] email],
- [[NSString stringWithFormat:@"regarding apt package \"%@\"", [package_ name]] stringByAddingPercentEscapes]
- ]]];
- else if (installed && row == 5
- + (website == nil ? 0 : 1)
- + (trusted ? 1 : 0)
- ) {
- FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
- [files setDelegate:delegate_];
- [files setPackage:package_];
- [book_ pushPage:files];
- } else if (website != nil && row == 3) {
- NSURL *url = [NSURL URLWithString:website];
- BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
- [browser setDelegate:delegate_];
- [book_ pushPage:browser];
- [browser loadURL:url];
- }
-}
-
-- (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) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
- int count = [buttons_ count];
- _assert(count != 0);
- _assert(button <= count + 1);
+ if (row == INT_MAX)
+ return;
- if (count != button - 1)
- [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];
+ #define _else else goto _label; return; } _label:
- [sheet dismiss];
-}
+ if (true) {
+ if (row-- == 0) {
+ } else if (row-- == 0) {
+ } else if ([package_ author] != nil && row-- == 0) {
+ [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
+ [[package_ author] email],
+ [[NSString stringWithFormat:@"regarding apt package \"%@\"",
+ [package_ name]
+ ] stringByAddingPercentEscapes]
+ ]]];
+ } else if (description_ != nil && row-- == 0) {
+ } else if ([package_ website] != nil && row-- == 0) {
+ NSURL *url = [NSURL URLWithString:[package_ website]];
+ BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+ [browser setDelegate:delegate_];
+ [book_ pushPage:browser];
+ [browser loadURL:url];
+ } _else if ([package_ installed] != nil) {
+ if (row-- == 0) {
+ } else if (row-- == 0) {
+ } else if (row-- == 0) {
+ FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
+ [files setDelegate:delegate_];
+ [files setPackage:package_];
+ [book_ pushPage:files];
+ } _else if (true) {
+ if (row-- == 0) {
+ } else if (row-- == 0) {
+ } else if (row-- == 0) {
+ } else if ([package_ size] != 0 && row-- == 0) {
+ } else if ([package_ maintainer] != nil && row-- == 0) {
+ [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
+ [[package_ maintainer] email],
+ [[NSString stringWithFormat:@"regarding apt package \"%@\"",
+ [package_ name]
+ ] stringByAddingPercentEscapes]
+ ]]];
+ } else if ([package_ sponsor] != nil && row-- == 0) {
+ NSURL *url = [NSURL URLWithString:[[package_ sponsor] email]];
+ BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+ [browser setDelegate:delegate_];
+ [book_ pushPage:browser];
+ [browser loadURL:url];
+ } else if ([package_ relationships] != nil && row-- == 0) {
+ } else if ([[package_ source] trusted] && row-- == 0) {
+ } _else if ([package_ source] != nil) {
+ Source *source = [package_ source];
+ NSString *description = [source description];
+
+ if (row-- == 0) {
+ } else if (row-- == 0) {
+ } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) {
+ } else if ([source origin] != nil && row-- == 0) {
+ } _else _assert(false);
+
+ #undef _else
+}
+
+- (void) _clickButtonWithName:(NSString *)name {
+ if ([name isEqualToString:@"Install"])
+ [delegate_ installPackage:package_];
+ else if ([name isEqualToString:@"Reinstall"])
+ [delegate_ installPackage:package_];
+ else if ([name isEqualToString:@"Remove"])
+ [delegate_ removePackage:package_];
+ else if ([name isEqualToString:@"Upgrade"])
+ [delegate_ installPackage:package_];
+ else _assert(false);
+}
+
+- (void) 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];
+}
- (void) _rightButtonClicked {
int count = [buttons_ count];
[table_ reloadData];
if ([package_ source] == nil);
+ else if ([package_ upgradableAndEssential:NO])
+ [buttons_ addObject:@"Upgrade"];
else if ([package_ installed] == nil)
[buttons_ addObject:@"Install"];
- else if ([package_ upgradable])
- [buttons_ addObject:@"Upgrade"];
else
[buttons_ addObject:@"Reinstall"];
if ([package_ installed] != nil)
}
- (float) table:(UITable *)table heightForRow:(int)row {
- return 73;
+ return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];
}
- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
}
- (void) loadRequest:(NSURLRequest *)request {
+ pushed_ = true;
[webview_ loadRequest:request];
}
[self view:sender didSetFrame:frame];
}
-- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
- return [self _addHeadersToRequest:request];
-}
-
-- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
- if ([[[request URL] scheme] isEqualToString:@"apptapp"])
- return nil;
- [self setBackButtonTitle:title_];
- BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
- [browser setDelegate:delegate_];
- [book_ pushPage:browser];
- [browser loadRequest:[self _addHeadersToRequest:request]];
- return [browser webView];
-}
-
-- (void) webView:(WebView *)sender willClickElement:(id)element {
- if (![element respondsToSelector:@selector(href)])
- return;
- NSString *href = [element href];
- if (href == nil)
- return;
+- (void) getAppTapp:(NSString *)href {
if ([href hasPrefix:@"apptapp://package/"]) {
NSString *name = [href substringFromIndex:18];
Package *package = [database_ packageWithName:name];
}
}
+- (void) webView:(WebView *)sender willClickElement:(id)element {
+ if (![element respondsToSelector:@selector(href)])
+ return;
+ NSString *href = [element href];
+ if (href == nil)
+ return;
+ if ([href hasPrefix:@"apptapp://package/"])
+ [self getAppTapp:href];
+}
+
+- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
+ if ([[[request URL] scheme] isEqualToString:@"apptapp"]) {
+ [self getAppTapp:[[request URL] absoluteString]];
+ return nil;
+ }
+
+ if (!pushed_) {
+ pushed_ = true;
+ [book_ pushPage:self];
+ }
+
+ return [self _addHeadersToRequest:request];
+}
+
+- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
+ if (request != nil && [[[request URL] scheme] isEqualToString:@"apptapp"])
+ return nil;
+ else {
+ [self setBackButtonTitle:title_];
+
+ BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+ [browser setDelegate:delegate_];
+
+ if (request != nil) {
+ [browser loadRequest:[self _addHeadersToRequest:request]];
+ [book_ pushPage:browser];
+ }
+
+ return [browser webView];
+ }
+}
+
- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
title_ = [title retain];
[self setTitle:title];
[webview_ setDelegate:self];
//[webview_ setEnabledGestures:2];
- CGSize indsize = [UIProgressIndicator defaultSizeForStyle:0];
+ CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite];
indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 42, indsize.width, indsize.height)];
- [indicator_ setStyle:0];
+ [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite];
Package *package([database_ packageWithName:@"cydia"]);
NSString *application = package == nil ? @"Cydia" : [NSString
- (void) _leftButtonClicked {
UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:@"About Cydia Packager"
+ initWithTitle:@"About Cydia Installer"
buttons:[NSArray arrayWithObjects:@"Close", nil]
defaultButtonIndex:0
delegate:self
- (void) resetViewAnimated:(BOOL)animated {
}
+- (void) setPushed:(bool)pushed {
+ pushed_ = pushed;
+}
+
@end
/* }}} */
@end
+/* Source Cell {{{ */
+@interface SourceCell : UITableCell {
+ UITextLabel *description_;
+ UIRightTextLabel *label_;
+ UITextLabel *origin_;
+}
+
+- (void) dealloc;
+
+- (SourceCell *) initWithSource:(Source *)source;
+
+- (void) _setSelected:(float)fraction;
+- (void) setSelected:(BOOL)selected;
+- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
+- (void) _setSelectionFadeFraction:(float)fraction;
+
+@end
+
+@implementation SourceCell
+
+- (void) dealloc {
+ [description_ release];
+ [label_ release];
+ [origin_ release];
+ [super dealloc];
+}
+
+- (SourceCell *) initWithSource:(Source *)source {
+ if ((self = [super init]) != nil) {
+ GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 20);
+ GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14);
+
+ CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+ float clear[] = {0, 0, 0, 0};
+
+ NSString *description = [source description];
+ if (description == nil)
+ description = [source uri];
+
+ description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 7, 270, 25)];
+ [description_ setBackgroundColor:CGColorCreate(space, clear)];
+ [description_ setFont:bold];
+ [description_ setText:description];
+
+ NSString *label = [source label];
+ if (label == nil)
+ label = [source type];
+
+ label_ = [[UIRightTextLabel alloc] initWithFrame:CGRectMake(290, 32, 90, 25)];
+ [label_ setBackgroundColor:CGColorCreate(space, clear)];
+ [label_ setFont:small];
+ [label_ setText:label];
+
+ NSString *origin = [source origin];
+ if (origin == nil)
+ origin = [source distribution];
+
+ origin_ = [[UITextLabel alloc] initWithFrame:CGRectMake(13, 35, 315, 20)];
+ [origin_ setBackgroundColor:CGColorCreate(space, clear)];
+ [origin_ setFont:small];
+ [origin_ setText:origin];
+
+ [self addSubview:description_];
+ [self addSubview:label_];
+ [self addSubview:origin_];
+
+ CFRelease(small);
+ CFRelease(bold);
+ } return self;
+}
+
+- (void) _setSelected:(float)fraction {
+ CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+
+ float black[] = {
+ Interpolate(0.0, 1.0, fraction),
+ Interpolate(0.0, 1.0, fraction),
+ Interpolate(0.0, 1.0, fraction),
+ 1.0};
+
+ float blue[] = {
+ Interpolate(0.2, 1.0, fraction),
+ Interpolate(0.2, 1.0, fraction),
+ Interpolate(1.0, 1.0, fraction),
+ 1.0};
+
+ float gray[] = {
+ Interpolate(0.4, 1.0, fraction),
+ Interpolate(0.4, 1.0, fraction),
+ Interpolate(0.4, 1.0, fraction),
+ 1.0};
+
+ [description_ setColor:CGColorCreate(space, black)];
+ [label_ setColor:CGColorCreate(space, blue)];
+ [origin_ setColor:CGColorCreate(space, gray)];
+}
+
+- (void) setSelected:(BOOL)selected {
+ [self _setSelected:(selected ? 1.0 : 0.0)];
+ [super setSelected:selected];
+}
+
+- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
+ if (!fade)
+ [self _setSelected:(selected ? 1.0 : 0.0)];
+ [super setSelected:selected withFade:fade];
+}
+
+- (void) _setSelectionFadeFraction:(float)fraction {
+ [self _setSelected:fraction];
+ [super _setSelectionFadeFraction:fraction];
+}
+
+@end
+/* }}} */
+/* Source Table {{{ */
+@interface SourceTable : RVPage {
+ _transient Database *database_;
+ UISectionList *list_;
+ NSMutableArray *sources_;
+ UIAlertSheet *alert_;
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+
+@end
+
+@implementation SourceTable
+
+- (void) dealloc {
+ [list_ setDataSource:nil];
+
+ if (sources_ != nil)
+ [sources_ release];
+ [list_ release];
+ [super dealloc];
+}
+
+- (int) numberOfSectionsInSectionList:(UISectionList *)list {
+ return 1;
+}
+
+- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
+ return @"Sources";
+}
+
+- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
+ return 0;
+}
+
+- (int) numberOfRowsInTable:(UITable *)table {
+ return [sources_ count];
+}
+
+- (float) table:(UITable *)table heightForRow:(int)row {
+ return 64;
+}
+
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col {
+ return [[[SourceCell alloc] initWithSource:[sources_ objectAtIndex:row]] autorelease];
+}
+
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
+ return NO;
+}
+
+- (void) tableRowSelected:(NSNotification*)notification {
+ UITable *table([list_ table]);
+ int row([table selectedRow]);
+ if (row == INT_MAX)
+ return;
+
+ [table selectRow:-1 byExtendingSelection:NO withFade:YES];
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+ if ((self = [super initWithBook:book]) != nil) {
+ database_ = database;
+ sources_ = nil;
+
+ list_ = [[UISectionList alloc] initWithFrame:[self bounds]];
+
+ [self addSubview:list_];
+
+ [list_ setDataSource:self];
+ [list_ setShouldHideHeaderInShortLists:NO];
+
+ UITableColumn *column = [[UITableColumn alloc]
+ initWithTitle:@"Name"
+ identifier:@"name"
+ width:[self frame].size.width
+ ];
+
+ UITable *table = [list_ table];
+ [table setSeparatorStyle:1];
+ [table addTableColumn:column];
+ [table setDelegate:self];
+ } return self;
+}
+
+- (void) reloadData {
+ pkgSourceList list;
+ _assert(list.ReadMainList());
+
+ if (sources_ != nil)
+ [sources_ release];
+
+ sources_ = [[NSMutableArray arrayWithCapacity:16] retain];
+ for (pkgSourceList::const_iterator source = list.begin(); source != list.end(); ++source)
+ [sources_ addObject:[[[Source alloc] initWithMetaIndex:*source] autorelease]];
+
+ [list_ reloadData];
+}
+
+- (void) resetViewAnimated:(BOOL)animated {
+ [list_ resetViewAnimated:animated];
+}
+
+- (NSString *) leftTitle {
+ return @"Refresh All";
+}
+
+- (NSString *) rightTitle {
+ return @"Edit";
+}
+
+@end
+/* }}} */
+
/* Install View {{{ */
@interface InstallView : RVPage {
_transient Database *database_;
}
- (float) table:(UITable *)table heightForRow:(int)row {
- return 73;
+ return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];
}
- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
for (size_t i(0); i != [packages count]; ++i) {
Package *package([packages objectAtIndex:i]);
- if ([package installed] == nil && [package valid] || [package upgradable])
+ if ([package installed] == nil && [package valid] || [package upgradableAndEssential:NO])
[packages_ addObject:package];
}
upgrades_ = 0;
bool unseens = false;
- CFLocaleRef locale = CFLocaleCopyCurrent();
- CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+ CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
Package *package = [packages_ objectAtIndex:offset];
- if ([package upgradable]) {
+ if ([package upgradableAndEssential:YES]) {
++upgrades_;
[upgradable addToCount];
} else {
}
CFRelease(formatter);
- CFRelease(locale);
if (unseens) {
Section *last = [sections_ lastObject];
@end
/* }}} */
/* Manage View {{{ */
-@interface ManageView : PackageTable {
+@interface ManageView : RVPage {
+ _transient Database *database_;
+ PackageTable *packages_;
+ SourceTable *sources_;
}
- (id) initWithBook:(RVBook *)book database:(Database *)database;
@implementation ManageView
+- (void) dealloc {
+ [packages_ release];
+ [sources_ release];
+ [super dealloc];
+}
+
- (id) initWithBook:(RVBook *)book database:(Database *)database {
- if ((self = [super
- initWithBook:book
- database:database
- title:nil
- filter:@selector(isInstalledInSection:)
- with:nil
- ]) != nil) {
+ if ((self = [super initWithBook:book]) != nil) {
+ database_ = database;
+
+ packages_ = [[PackageTable alloc]
+ initWithBook:book
+ database:database
+ title:nil
+ filter:@selector(isInstalledInSection:)
+ with:nil
+ ];
+
+ sources_ = [[SourceTable alloc]
+ initWithBook:book
+ database:database
+ ];
+
+ [self addSubview:packages_];
} return self;
}
+- (void) resetViewAnimated:(BOOL)animated {
+ [packages_ resetViewAnimated:animated];
+ [sources_ resetViewAnimated:animated];
+}
+
+- (void) reloadData {
+ [packages_ reloadData];
+ [sources_ reloadData];
+}
+
- (NSString *) title {
return @"Installed Packages";
}
- (NSString *) backButtonTitle {
- return @"All Packages";
+ return @"Packages";
+}
+
+- (void) setDelegate:(id)delegate {
+ [super setDelegate:delegate];
+ [packages_ setDelegate:delegate];
+ [sources_ setDelegate:delegate];
}
@end
if (show)
[animator performSelector:@selector(startAnimation:) withObject:animation afterDelay:delay];
+#ifndef __OBJC2__
[delegate_ showKeyboard:show];
+#endif
}
- (void) textFieldDidBecomeFirstResponder:(UITextField *)field {
[table_ setShouldHideHeaderInShortLists:NO];
[transition_ transition:0 toView:table_];
- CGRect cnfrect = {{1, 38}, {17, 18}};
+ CGRect cnfrect = {{
+#ifdef __OBJC2__
+ 6 +
+#endif
+ 1, 38}, {17, 18}};
CGRect area;
- area.origin.x = cnfrect.size.width + 15;
+ area.origin.x = cnfrect.origin.x + cnfrect.size.width + 14;
area.origin.y = 30;
- area.size.width = [self bounds].size.width - area.origin.x - 18;
+
+ area.size.width =
+#ifdef __OBJC2__
+ 8 +
+#endif
+ [self bounds].size.width - area.origin.x - 18;
+
area.size.height = [UISearchField defaultHeight];
field_ = [[UISearchField alloc] initWithFrame:area];
CFRelease(font);
[field_ setPlaceholder:@"Package Names & Descriptions"];
- [field_ setPaddingTop:5];
[field_ setDelegate:self];
+#ifdef __OBJC2__
+ [field_ setPaddingTop:3];
+#else
+ [field_ setPaddingTop:5];
+#endif
+
#ifndef __OBJC2__
UITextTraits *traits = [field_ textTraits];
[traits setEditingDelegate:self];
[traits setAutoCorrectionType:1];
#endif
+ CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height + 30}};
+
+ accessory_ = [[UIView alloc] initWithFrame:accrect];
+ [accessory_ addSubview:field_];
+
UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease];
[configure setShowPressFeedback:YES];
[configure setImage:[UIImage applicationImageNamed:@"advanced.png"]];
[configure addTarget:self action:@selector(configurePushed) forEvents:1];
-
- accessory_ = [[UIView alloc] initWithFrame:CGRectMake(0, 6, cnfrect.size.width + area.size.width + 6 * 3, area.size.height + 30)];
- [accessory_ addSubview:field_];
[accessory_ addSubview:configure];
} return self;
}
- (void) flipPage {
+#ifndef __OBJC2__
LKAnimation *animation = [LKTransition animation];
[animation setType:@"oglFlip"];
[animation setTimingFunction:[LKTimingFunction functionWithName:@"easeInEaseOut"]];
[[transition_ _layer] addAnimation:animation forKey:0];
[transition_ transition:0 toView:(flipped_ ? (UIView *) table_ : (UIView *) advanced_)];
flipped_ = !flipped_;
+#endif
}
- (void) configurePushed {
[navbar_ setBarStyle:1];
CGRect ovrrect = [navbar_ bounds];
- ovrrect.size.height = [UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height;
+ ovrrect.size.height = ([UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height);
overlay_ = [[UIView alloc] initWithFrame:ovrrect];
- CGSize indsize = [UIProgressIndicator defaultSizeForStyle:2];
+ UIProgressIndicatorStyle style = Advanced_ ?
+ kUIProgressIndicatorStyleSmallWhite :
+ kUIProgressIndicatorStyleSmallBlack;
+
+ CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
CGRect indrect = {{indoffset, indoffset}, indsize};
indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
- [indicator_ setStyle:(Advanced_ ? 2 : 3)];
+ [indicator_ setStyle:style];
[overlay_ addSubview:indicator_];
- CGSize prmsize = {200, indsize.width};
+ CGSize prmsize = {200, indsize.width + 4};
CGRect prmrect = {{
indoffset * 2 + indsize.width,
+#ifdef __OBJC2__
+ -1 +
+#endif
(ovrrect.size.height - prmsize.height) / 2
}, prmsize};
prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
- [prompt_ setColor:(Advanced_ ? White_ : Black_)];
+ [prompt_ setColor:(Advanced_ ? White_ : Blueish_)];
[prompt_ setBackgroundColor:Clear_];
[prompt_ setFont:font];
[pool release];
}
-- (void) setProgressError:(NSString *)error {
- [self
- performSelectorOnMainThread:@selector(_setProgressError:)
- withObject:error
- waitUntilDone:YES
- ];
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+ [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];
}
- (void) setProgressTitle:(NSString *)title {
[sheet dismiss];
}
-- (void) _setProgressError:(NSString *)error {
- [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];
-}
-
- (void) _setProgressTitle:(NSString *)title {
[prompt_ setText:[title stringByAppendingString:@"..."]];
}
UIButtonBar *buttonbar_;
ConfirmationView *confirm_;
+
NSMutableArray *essential_;
+ NSMutableArray *broken_;
Database *database_;
ProgressView *progress_;
unsigned tag_;
UIKeyboard *keyboard_;
+ UIProgressHUD *hud_;
InstallView *install_;
ChangesView *changes_;
@implementation Cydia
+- (void) _loaded {
+ if ([broken_ count] != 0) {
+ int count = [broken_ count];
+
+ UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+ initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
+ buttons:[NSArray arrayWithObjects:
+ @"Forcibly Clear",
+ @"Ignore (Temporary)",
+ nil]
+ defaultButtonIndex:0
+ delegate:self
+ context:@"fixhalf"
+ ] autorelease];
+
+ [sheet setBodyText:@"When the shell scripts associated with packages fail, they are left in a bad state known as either half-configured or half-installed. These errors don't go away and instead continue to cause issues. These scripts can be deleted and the packages forcibly removed."];
+ [sheet popupAlertAnimated:YES];
+ } else if (!Ignored_ && [essential_ count] != 0) {
+ int count = [essential_ count];
+
+ UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+ initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
+ buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
+ defaultButtonIndex:0
+ delegate:self
+ context:@"upgrade"
+ ] autorelease];
+
+ [sheet setBodyText:@"One or more essential packages are currently out of date. If these upgrades are not performed you are likely to encounter errors."];
+ [sheet popupAlertAnimated:YES];
+ }
+}
+
- (void) _reloadData {
/*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
[hud setText:@"Reloading Data"];
}
size_t changes(0);
+
[essential_ removeAllObjects];
+ [broken_ removeAllObjects];
NSArray *packages = [database_ packages];
for (int i(0), e([packages count]); i != e; ++i) {
Package *package = [packages objectAtIndex:i];
- if ([package upgradable]) {
+ if ([package half])
+ [broken_ addObject:package];
+ if ([package upgradableAndEssential:NO]) {
if ([package essential])
[essential_ addObject:package];
++changes;
[book_ reloadData];
if ([packages count] == 0);
- else if (!Loaded_) {
+ else if (Loaded_)
+ [self _loaded];
+ else {
Loaded_ = YES;
[book_ update];
- } else if (!Ignored_ && [essential_ count] != 0) {
- int count = [essential_ count];
-
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
- buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
- defaultButtonIndex:0
- delegate:self
- context:@"upgrade"
- ] autorelease];
-
- [sheet setBodyText:@"One or more essential packages are currently out of date. If these packages are not upgraded you are likely to encounter errors."];
- [sheet popupAlertAnimated:YES];
}
/*[hud show:NO];
- (void) confirm {
[overlay_ removeFromSuperview];
- restart_ = true;
+ reload_ = true;
[progress_
detachNewThreadSelector:@selector(perform)
- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
NSString *context = [sheet context];
- if ([context isEqualToString:@"upgrade"])
+ if ([context isEqualToString:@"fixhalf"])
+ switch (button) {
+ case 1:
+ @synchronized (self) {
+ for (int i = 0, e = [broken_ count]; i != e; ++i) {
+ Package *broken = [broken_ objectAtIndex:i];
+ [broken remove];
+
+ NSString *id = [broken id];
+ unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]);
+ unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]);
+ unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]);
+ unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]);
+ }
+
+ [self resolve];
+ [self perform];
+ }
+ break;
+
+ case 2:
+ [broken_ removeAllObjects];
+ [self _loaded];
+ break;
+
+ default:
+ _assert(false);
+ }
+ else if ([context isEqualToString:@"upgrade"])
switch (button) {
case 1:
@synchronized (self) {
Ignored_ = YES;
break;
- default: _assert(false);
+ default:
+ _assert(false);
}
[sheet dismiss];
}
- (void) applicationWillSuspend {
+ _trace();
[super applicationWillSuspend];
- if (restart_)
- if (FW_LEAST(1,1,3))
- notify_post("com.apple.language.changed");
- else
- system("launchctl stop com.apple.SpringBoard");
-}
-
-- (void) applicationDidFinishLaunching:(id)unused {
- _assert(pkgInitConfig(*_config));
- _assert(pkgInitSystem(*_config, _system));
+ [database_ clean];
- confirm_ = nil;
- tag_ = 1;
+ if (reload_) {
+ pid_t pid = ExecFork();
+ if (pid == 0) {
+#ifndef __OBJC2__
+ sleep(1);
+#endif
- essential_ = [[NSMutableArray alloc] initWithCapacity:4];
+ if (pid_t child = fork()) {
+ waitpid(child, NULL, 0);
+ } else {
+ execlp("launchctl", "launchctl", "unload", SpringBoard_, NULL);
+ perror("launchctl unload");
+ exit(0);
+ }
- CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
- window_ = [[UIWindow alloc] initWithContentRect:screenrect];
+ execlp("launchctl", "launchctl", "load", SpringBoard_, NULL);
+ perror("launchctl load");
+ exit(0);
+ }
+ }
+}
- [window_ orderFront: self];
- [window_ makeKey: self];
- [window_ _setHidden: NO];
+- (void) finish {
+ if (hud_ != nil) {
+ [self setStatusBarShowsProgress:NO];
- database_ = [[Database alloc] init];
- progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
- [database_ setDelegate:progress_];
- [window_ setContentView:progress_];
+ [hud_ show:NO];
+ [hud_ removeFromSuperview];
+ [hud_ autorelease];
+ hud_ = nil;
- underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];
- [progress_ setContentView:underlay_];
+ reload_ = true;
+ [self suspendWithAnimation:YES];
+ return;
+ }
overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];
- if (!bootstrap_)
- [underlay_ addSubview:overlay_];
-
+ CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
book_ = [[CYBook alloc] initWithFrame:CGRectMake(
0, 0, screenrect.size.width, screenrect.size.height - 48
) database:database_];
manage_ = [[ManageView alloc] initWithBook:book_ database:database_];
search_ = [[SearchView alloc] initWithBook:book_ database:database_];
- [progress_ resetView];
+ if (!bootstrap_)
+ [underlay_ addSubview:overlay_];
+
[self reloadData];
if (bootstrap_)
[self _setHomePage];
}
+- (void) reorganize {
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ system("/usr/libexec/cydia/free.sh");
+ [self performSelectorOnMainThread:@selector(finish) withObject:nil waitUntilDone:NO];
+ [pool release];
+}
+
+- (void) applicationSuspend:(__GSEvent *)event {
+ if (hud_ == nil && ![progress_ isRunning])
+ [super applicationSuspend:event];
+ _trace();
+}
+
+- (void) applicationDidFinishLaunching:(id)unused {
+ _assert(pkgInitConfig(*_config));
+ _assert(pkgInitSystem(*_config, _system));
+
+ confirm_ = nil;
+ tag_ = 1;
+
+ essential_ = [[NSMutableArray alloc] initWithCapacity:4];
+ broken_ = [[NSMutableArray alloc] initWithCapacity:4];
+
+ CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
+ window_ = [[UIWindow alloc] initWithContentRect:screenrect];
+
+ [window_ orderFront: self];
+ [window_ makeKey: self];
+ [window_ _setHidden: NO];
+
+ database_ = [[Database alloc] init];
+ progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
+ [database_ setDelegate:progress_];
+ [window_ setContentView:progress_];
+
+ underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];
+ [progress_ setContentView:underlay_];
+
+ [progress_ resetView];
+
+ if (
+ readlink("/Applications", NULL, 0) == -1 && errno == EINVAL ||
+ readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL ||
+ readlink("/Library/Ringtones", NULL, 0) == -1 && errno == EINVAL ||
+ readlink("/Library/Wallpapers", NULL, 0) == -1 && errno == EINVAL
+ ) {
+ hud_ = [[UIProgressHUD alloc] initWithWindow:window_];
+ [hud_ setText:@"Reorganizing\nOne Minute!\nPlease Wait...\nDO NOT STOP"];
+ [hud_ show:YES];
+ [underlay_ addSubview:hud_];
+
+ [self setStatusBarShowsProgress:YES];
+
+ [NSThread
+ detachNewThreadSelector:@selector(reorganize)
+ toTarget:self
+ withObject:nil
+ ];
+ } else
+ [self finish];
+}
+
- (void) showKeyboard:(BOOL)show {
CGSize keysize = [UIKeyboard defaultSize];
CGRect keydown = {{0, [overlay_ bounds].size.height}, keysize};
}
- (void) slideUp:(UIAlertSheet *)alert {
- [alert presentSheetInView:overlay_];
+ if (Advanced_)
+ [alert presentSheetFromButtonBar:buttonbar_];
+ else
+ [alert presentSheetInView:overlay_];
}
@end
setuid(0);
setgid(0);
+ if (unlink("/var/cache/apt/pkgcache.bin") == -1)
+ _assert(errno == ENOENT);
+ if (unlink("/var/cache/apt/srcpkgcache.bin") == -1)
+ _assert(errno == ENOENT);
+
/*Method alloc = class_getClassMethod([NSObject class], @selector(alloc));
alloc_ = alloc->method_imp;
alloc->method_imp = (IMP) &Alloc_;*/
else
Packages_ = [Metadata_ objectForKey:@"Packages"];
- setenv("CYDIA", "", _not(int));
if (access("/User", F_OK) != 0)
system("/usr/libexec/cydia/firmware.sh");
+ Locale_ = CFLocaleCopyCurrent();
space_ = CGColorSpaceCreateDeviceRGB();
+ Blueish_.Set(space_, 0x19/255.f, 0x32/255.f, 0x50/255.f, 1.0);
Black_.Set(space_, 0.0, 0.0, 0.0, 1.0);
Clear_.Set(space_, 0.0, 0.0, 0.0, 0.0);
Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);
int value = UIApplicationMain(argc, argv, [Cydia class]);
CGColorSpaceRelease(space_);
+ CFRelease(Locale_);
[pool release];
return value;
projects / cydia.git / blobdiff