bkuhn/small-hacks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not duplicate lines in the proposed diary.

Browse source
This commit is contained in:
Bradley M. Kuhn 2013-11-30 14:58:51 -05:00
parent 0d08eb65f4
commit 8cb5021d40
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
calendar-import.plx
View file

@ -265,7 +265,11 @@ ELISP_END
open(REAL_DIARY, '>>', $config->{proposedDiary}) open(REAL_DIARY, '>>', $config->{proposedDiary})
or DieLog("unable to append to config->{proposedDiary}: $!"); or DieLog("unable to append to config->{proposedDiary}: $!");
while (my $line = <NEW_DIARY>) { print $line; print REAL_DIARY $line; } while (my $line = <NEW_DIARY>) {
print $line;
chomp $line;
print REAL_DIARY "$line\n" unless defined $config->{__knownLines}{$line};
}
close NEW_DIARY; DieLog("error reading $newDiaryTempFile: $!") unless ($? == 0); close NEW_DIARY; DieLog("error reading $newDiaryTempFile: $!") unless ($? == 0);
close REAL_DIARY; DieLog("error appending to $config->{proposedDiary}: $!") unless ($? == 0); close REAL_DIARY; DieLog("error appending to $config->{proposedDiary}: $!") unless ($? == 0);
@ -296,9 +300,21 @@ sub HandleProposedEvent ($$$) {
} }
} }
############################################################################### ###############################################################################
sub KnownLines ($) {
my($file) = @_;
open(DATA, "<", $file) or DieLog("Unable to open $file for reading: $!");
my %lines;
while (my $line = <DATA>) { chomp $line; $lines{$line} = $line; }
return \%lines;
}
###############################################################################
sub GenerateDiaryFromNewEvents ($) { sub GenerateDiaryFromNewEvents ($) {
my($config) = @_; my($config) = @_;
$config->{__knownLines} = KnownLines($config->{proposedDiary});
chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}"); chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}");
system($config->{gitBinary}, 'checkout', '-q', $config->{incomingBranch}); system($config->{gitBinary}, 'checkout', '-q', $config->{incomingBranch});
@ -313,6 +329,7 @@ sub GenerateDiaryFromNewEvents ($) {
my($operation, $file) = ($1, $2); my($operation, $file) = ($1, $2);
HandleProposedEvent($config, $operation, $file); HandleProposedEvent($config, $operation, $file);
} }
delete $config->{__knownLines};
} }
############################################################################### ###############################################################################
sub ReadConfig($) { sub ReadConfig($) {