Skip to content

visit count not available anymore in WebHistory #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
internetzel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

visit count not available anymore in WebHistory #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45bc5f6
visit count not available anymore in WebHistory
May 14, 2016
7b7d040
visit count is entirely gone - both for writing and for reading
May 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Stainless/StainlessServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ enum {

BOOL webHistoryCanRecordVisits;
BOOL webHistoryCanControlVisitCount;
BOOL webHistoryHasVisitCount;
}

@property(nonatomic, retain) NSString* ignoreHistory;
Expand Down
11 changes: 8 additions & 3 deletions Stainless/StainlessServer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ - (void)awakeFromNib

webHistoryCanRecordVisits = NO;
webHistoryCanControlVisitCount = NO;
webHistoryHasVisitCount = NO;

WebHistoryItem* entry = [[WebHistoryItem alloc] initWithURLString:@"" title:@"" lastVisitedTimeInterval:[NSDate timeIntervalSinceReferenceDate]];
if([entry respondsToSelector:@selector(_recordInitialVisit)]) {
Expand All @@ -192,6 +193,8 @@ - (void)awakeFromNib
else if([entry respondsToSelector:@selector(_visitedWithTitle:)])
webHistoryCanRecordVisits = YES;
}
if([entry respondsToSelector:@selector(visitCount)])
webHistoryHasVisitCount = YES;
[entry release];

[self refreshHistory];
Expand Down Expand Up @@ -2110,7 +2113,7 @@ - (oneway void)addURLToHistory:(bycopy NSString *)URLString title:(bycopy NSStri

if(webHistoryCanRecordVisits)
[entry _recordInitialVisit];
else
else if(webHistoryHasVisitCount)
[entry setVisitCount:1];

[clientHistory addItems:[NSArray arrayWithObject:entry]];
Expand Down Expand Up @@ -2248,7 +2251,8 @@ - (NSArray*)completionForURLString:(bycopy NSString*)urlString includeSearch:(BO
[searchComplete swap];

NSMutableArray* matches = [searchComplete arrayOfDataMatchingString:urlString];
[matches sortUsingSelector:@selector(visitCountCompare:)];
if(webHistoryHasVisitCount)
[matches sortUsingSelector:@selector(visitCountCompare:)];
for(WebHistoryItem* item in matches) {
NSString* alternateTitle = [item alternateTitle];
if(alternateTitle) {
Expand All @@ -2273,7 +2277,8 @@ - (NSArray*)completionForURLString:(bycopy NSString*)urlString includeSearch:(BO
completion = [NSMutableArray arrayWithCapacity:maxCount];

NSMutableArray* matches = [urlComplete arrayOfDataMatchingString:urlString];
[matches sortUsingSelector:@selector(visitCountCompare:)];
if(webHistoryHasVisitCount)
[matches sortUsingSelector:@selector(visitCountCompare:)];
for(WebHistoryItem* item in matches) {
NSString* itemURLString = [item URLString];

Expand Down