From 6b92acabc8c971bc5e1a0d3a5f8cc9b4e19e93fb Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 14 Oct 2008 08:51:19 +0000 Subject: [PATCH] Added LastSeen support (for Subscriptions). --- Cydia.app/Sections/WebClips.png | Bin 0 -> 6877 bytes Cydia.mm | 53 ++++++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 Cydia.app/Sections/WebClips.png diff --git a/Cydia.app/Sections/WebClips.png b/Cydia.app/Sections/WebClips.png new file mode 100644 index 0000000000000000000000000000000000000000..7ed4053c242e84d447b6d693e493f4fddf900415 GIT binary patch literal 6877 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 XeNXTBh{93100000NkvXXu0mjfjh`rS literal 0 HcmV?d00001 diff --git a/Cydia.mm b/Cydia.mm index 52b7fc90..55048243 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -1194,7 +1194,12 @@ NSString *Scour(const char *field, const char *begin, const char *end) { database_ = database; version_ = [database_ policy]->GetCandidateVer(iterator_); - latest_ = version_.end() ? nil : [StripVersion([NSString stringWithUTF8String:version_.VerStr()]) retain]; + NSString *latest = version_.end() ? nil : [NSString stringWithUTF8String:version_.VerStr()]; + latest_ = [StripVersion(latest) retain]; + + pkgCache::VerIterator current = iterator_.CurrentVer(); + NSString *installed = current.end() ? nil : [NSString stringWithUTF8String:current.VerStr()]; + installed_ = [StripVersion(installed) retain]; if (!version_.end()) file_ = version_.FileList(); @@ -1203,9 +1208,6 @@ NSString *Scour(const char *field, const char *begin, const char *end) { file_ = pkgCache::VerFileIterator(cache, cache.VerFileP); } - 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()) { @@ -1251,12 +1253,42 @@ NSString *Scour(const char *field, const char *begin, const char *end) { } } + NSString *solid(latest == nil ? installed : latest); + bool changed(false); + NSMutableDictionary *metadata = [Packages_ objectForKey:id_]; - if (metadata == nil || [metadata count] == 0) { + if (metadata == nil) { metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys: now_, @"FirstSeen", nil]; + 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; + } + } + + if (changed) { [Packages_ setObject:metadata forKey:id_]; Changed_ = true; } @@ -1328,7 +1360,16 @@ NSString *Scour(const char *field, const char *begin, const char *end) { } - (NSDate *) seen { - return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"]; + NSDictionary *metadata([Packages_ objectForKey:id_]); + bool subscribed; + if (NSNumber *isSubscribed = [metadata objectForKey:@"IsSubscribed"]) + subscribed = [isSubscribed boolValue]; + else + subscribed = false; + if (subscribed) + if (NSDate *last = [metadata objectForKey:@"LastSeen"]) + return last; + return [metadata objectForKey:@"FirstSeen"]; } - (NSString *) latest { -- 2.45.2