Changeset 360

Timestamp:

01/31/11 13:11:32 (13 years ago)

Author:

nanardon

Message:

• order package adding/removal according mtime

File:

• server/trunk/web/lib/Sophie/Scan/RpmsPath.pm (modified) (3 diffs)

server/trunk/web/lib/Sophie/Scan/RpmsPath.pm

@@ -36 +36 @@
     my %list;
     foreach ($self->db->base->resultset('RpmFile')->search(
-        { d_path => $self->key }
-    )->get_column('filename')->all) {
-        $list{$_} = 1;
+        { d_path => $self->key },
+        { 'select' => [ qw(filename mtime) ], as => [ qw(filename mtime) ] },
+    )->all) {
+        $list{$_->get_column('filename')} = $_->get_column('mtime') || 1;
     }
     return \%list;
@@ -45 +46 @@
 sub local_ls_rpms {
     my ($self) = @_;
-
-    if (opendir(my $dh, $self->path)) {
+    my $path = $self->path;
+
+    if (opendir(my $dh, $path)) {
         my %list;
         while (my $entry = readdir($dh)) {
             $entry eq '.' and next;
             $entry eq '..' and next;
-            $list{$entry} = 1;
+            $list{$entry} = (stat("$path/$_"))[9];
         }
         closedir($dh);
@@ -85 +87 @@
             # nothing to do
         } elsif ($localrpms->{$rpm}) {
-            push(@delta, { rpm => $rpm, delta => 'A' });
+            push(@delta, { rpm => $rpm, delta => 'A', mtime => $localrpms->{$rpm} });
         } elsif ($baserpms->{$rpm}) {
-            push(@delta, { rpm => $rpm, delta => 'R' });
-        }
-    }
-    @delta;
+            push(@delta, { rpm => $rpm, delta => 'R', mtime => $baserpms->{$rpm} });
+        }
+    }
+    sort { $a->{delta} eq $b->{delta} 
+        ? $a->{mtime} <=> $b->{mtime}
+        : ($a->{delta} eq 'A' ? 1 : -1)
+    } @delta;
 }