From 65de69067277479c3f8e011098ca4ce70df8267a Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Wed, 18 May 2011 17:59:19 +0200
Subject: If ignored files are still present, do not re-add them while updating

---
 Changelog        |  5 +++++
 lib/App/Hashl.pm | 22 ++++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Changelog b/Changelog
index 415af31..ba06ae9 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+git HEAD
+
+    * The internal representation of ignored hashes was changed
+    * "hashl update" no longer re-adds ignored (but existing) files
+
 hashl 0.1 - Fri May 06 2011
 
     * Initial release
diff --git a/lib/App/Hashl.pm b/lib/App/Hashl.pm
index c0b7e8c..e8015b2 100644
--- a/lib/App/Hashl.pm
+++ b/lib/App/Hashl.pm
@@ -128,12 +128,8 @@ Otherwise, returns undef.
 sub hash_in_db {
 	my ($self, $hash) = @_;
 
-	if ($self->{ignored}->{hashes}) {
-		for my $ihash (@{$self->{ignored}->{hashes}}) {
-			if ($hash eq $ihash) {
-				return '// ignored';
-			}
-		}
+	if ($self->{ignored}->{$hash}) {
+		return '// ignored';
 	}
 
 	for my $name ($self->files()) {
@@ -241,8 +237,14 @@ sub add_file {
 		return;
 	}
 
+	my $hash = $self->hash_file($path);
+
+	if ($self->{ignored}->{$hash}) {
+		return;
+	}
+
 	$self->{files}->{$file} = {
-		hash  => $self->hash_file($path),
+		hash  => $hash,
 		mtime => $mtime,
 		size  => $size,
 	};
@@ -256,8 +258,8 @@ Returns a list of all ignored file hashes
 
 sub ignored {
 	my ($self) = @_;
-	if (exists $self->{ignored}->{hashes}) {
-		return @{ $self->{ignored}->{hashes} };
+	if (exists $self->{ignored}) {
+		return keys %{ $self->{ignored} };
 	}
 	else {
 		return ();
@@ -275,7 +277,7 @@ sub ignore {
 	my ($self, $file, $path) = @_;
 
 	$self->delete_file($file);
-	push(@{ $self->{ignored}->{hashes} }, $self->hash_file($path));
+	$self->{ignored}->{ $self->hash_file($path) } = 1;
 }
 
 =item $hashl->save(I<$file>)
-- 
cgit v1.2.3