dvorka/hstr
1
1
Fork 0
mirror of https://github.com/dvorka/hstr.git synced 2024-09-20 23:06:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing #131 by filtering history timestamps out of the raw history & condensing raw history & setting the right length.

Browse source
This commit is contained in:
Martin Dvorak 2015-02-24 07:23:39 +01:00
parent 1271343427
commit 595e18970a
3 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/hstr_history.c
View file

@ -36,10 +36,12 @@ static const char *commandBlacklist[] = {
#define DEBUG_RADIXSORT()
#endif
// TODO make this configurable from command line as option
#define METRICS_LOGARITHM(RANK,ORDER,LENGTH) RANK+(log(ORDER)*10.0)+LENGTH
#define METRICS_ADDITIVE(RANK,ORDER,LENGTH) RANK+ORDER/10+LENGTH
unsigned history_ranking_function(unsigned rank, int newOccurenceOrder, size_t length) {
long metrics=rank+(log(newOccurenceOrder)*10.0)+length;
// alternative metrics:
// rank+newOccurenceOrder/10+length
long metrics=METRICS_LOGARITHM(rank, newOccurenceOrder, length);
assert(metrics<UINT_MAX);
return metrics;
}
@ -123,10 +125,12 @@ HistoryItems *get_prioritized_history()
RadixItem *radixItem;
HIST_ENTRY **historyList=history_list();
char **rawHistory=malloc(sizeof(char*) * historyState->length);
int rawOffset=historyState->length-1;
int rawOffset=historyState->length-1, rawTimestamps=0;
char *line;
for(i=0; i<historyState->length; i++, rawOffset--) {
if(!regexp_match(&regexp, historyList[i]->line)) {
rawHistory[rawOffset]=0;
rawTimestamps++;
continue;
}
if(historyList[i]->line && strlen(historyList[i]->line)>itemOffset) {
@ -162,6 +166,14 @@ HistoryItems *get_prioritized_history()
}
}
}
if(rawTimestamps) {
rawOffset=0;
for(i=0; i<historyState->length; i++) {
if(rawHistory[i]) {
rawHistory[rawOffset++]=rawHistory[i];
}
}
}
regfree(&regexp);
@ -170,7 +182,7 @@ HistoryItems *get_prioritized_history()
RadixItem **prioritizedRadix=radixsort_dump(&rs);
prioritizedHistory=malloc(sizeof(HistoryItems));
prioritizedHistory->count=rs.size;
prioritizedHistory->rawCount=historyState->length;
prioritizedHistory->rawCount=historyState->length-rawTimestamps;
prioritizedHistory->items=malloc(rs.size * sizeof(char*));
prioritizedHistory->rawItems=rawHistory;
for(i=0; i<rs.size; i++) {

2
tests/resources/.bash_history_131_A Normal file
View file

@ -0,0 +1,2 @@
#1234567890
foobar

6
tests/resources/.bash_history_131_B Normal file
View file

@ -0,0 +1,6 @@
#1234567890
foo
#1234567892
bar
#1234567891
blah