onepaperlink: fix handling of multiple changes

This change removes two recently added hooks. No deprecation cycle
because they have only existed for a week, so it's extremely unlikely
that anyone's using them.

lib/RevBank/Products.pm

@@ -183,6 +183,8 @@ sub read_products($filename = "revbank.products", $default_contra = "+sales/prod
         $product->{total_price} = $tag_price + $hidden;
     }
 
+    my @changes;
+
     if (%$cache) {
         for my $new (values %products) {
             next if $new->{is_alias};
@@ -190,16 +192,19 @@ sub read_products($filename = "revbank.products", $default_contra = "+sales/prod
             my $id = $new->{id};
             my $old = $cache->{$id};
 
-            call_hooks("product_changed", $old, $new, $$mtime)
+            if (not defined $old or $new->{config} ne $old->{config}) {
-                if not defined $old or $new->{config} ne $old->{config};
+                push @changes, [$old, $new];
+            }
 
             delete $cache->{$id};
         }
 
         for my $p (values %$cache) {
             next if $p->{is_alias};
-            call_hooks("product_deleted", $p, $$mtime);
+            push @changes, [$p, undef];
         }
+
+        call_hooks("products_changed", \@changes, $$mtime);
     }
 
     %$cache = %products;

plugins/openepaperlink

@@ -61,45 +61,39 @@ sub command :Tab(openepaperlink) ($self, $cart, $command, @) {
 	};
 }
 
-sub hook_product_deleted($class, $product, $mtime, @) {
+sub hook_products_changed($class, $changes, $mtime, @) {
-	my $product_id = $product->{id};
-
 	-f $fn or return;
 
 	return with_lock {
 		$mtime >= (stat $fn)[9] or return;
 
 		my @macs;
-		rewrite $fn, sub($line) {
+		my %deleted;
-			my ($mac, $id, $hwtype) = split " ", $line;
+		my %product2mac = reverse %{ _read_oepl() };
 
-			if ($id eq $product_id) {
+		for my $pair (@$changes) {
-				push @macs, $mac;
+			my ($old, $new) = @$pair;
-				return "$mac _DELETED_ $hwtype\n" 
+
-			}
+			my $id = defined($new) ? $new->{id} : $old->{id};
+			$product2mac{$id} or next;
+
+			push @macs, $product2mac{$id};
+			$deleted{$id} = 1 if not defined $new;
+		}
+		
+		if (%deleted) {
+			rewrite $fn, sub($line) {
+				my ($mac, $product_id, $hwtype) = split " ", $line;
+
+				return "$mac _DELETED_ $hwtype\n" if $deleted{$product_id};
+				return $line;
+			};
+		}
 
-			return $line;
-		};
 		@macs or return;
 		_run @macs;
 
 		sleep 1 if $mtime == time;
-		_touch;  # XXX this is wrong; causes subsequent product changes to be ignored.
+		_touch;
-	};
-}
-
-sub hook_product_changed($class, $old, $new, $mtime, @) {
-	-f $fn or return;
-
-	return with_lock {
-		$mtime >= (stat $fn)[9] or return;
-
-		my $product2mac = { reverse %{ _read_oepl() } };
-		$product2mac->{ $new->{id} } or return;
-
-		_run $new->{id};
-
-		sleep 1 if $mtime == time;
-		_touch;  # XXX this is wrong; causes subsequent product changes to be ignored.
 	};
 }

revbank

@@ -17,7 +17,7 @@ use RevBank::Messages;
 use RevBank::Cart;
 use RevBank::Prompt;
 
-our $VERSION = "8.1.1";
+our $VERSION = "8.2.0";
 
 our %HELP1 = (
     "abort" => "Abort the current transaction",