Changeset 6

Timestamp:

11/20/10 16:15:39 (14 years ago)

Author:

nanardon

Message:

• add base updater daemon

Location:

web/trunk

Files:

• bin/sophie_scan (added)
• lib/Sophie/Base/Result/Deps.pm (modified) (1 diff)
• lib/Sophie/Base/Result/Paths.pm (modified) (1 diff)
• lib/Sophie/Base/RpmsPath.pm (modified) (4 diffs)
• lib/Sophie/Controller/Search.pm (modified) (1 diff)

web/trunk/lib/Sophie/Base/Result/Deps.pm

@@ -6 +6 @@
 
 __PACKAGE__->table('dependencies');
-__PACKAGE__->add_columns(qw/pkgid deptype count name pkgid/);
+__PACKAGE__->add_columns(qw/pkgid deptype count depname pkgid flags evr color/);
 __PACKAGE__->set_primary_key(qw/pkgid deptype count/);
 __PACKAGE__->belongs_to(Rpms => 'Sophie::Base::Result::Rpms', 'pkgid');

web/trunk/lib/Sophie/Base/Result/Paths.pm

@@ -6 +6 @@
 
 __PACKAGE__->table('d_path');
-__PACKAGE__->add_columns(qw/d_path_key path/);
+__PACKAGE__->add_columns(qw/d_path_key path added updated/);
 __PACKAGE__->set_primary_key('d_path_key');
 #__PACKAGE__->belongs_to(media => 'Sophie::Base::Result::Medias', 'media');

web/trunk/lib/Sophie/Base/RpmsPath.pm

@@ -57 +57 @@
 }
 
-sub update_content {
+sub find_delta {
     my ($self) = @_;
 
@@ -69 +69 @@
         $list{$_} = 1;
     }
+    my @delta;
 
     foreach my $rpm (sort { $b cmp $a } keys %list) {
@@ -74 +75 @@
             # nothing to do
         } elsif ($localrpms->{$rpm}) {
-            warn "adding $rpm";
-            $self->add_rpm($rpm);
+            push(@delta, { rpm => $rpm, delta => 'A' });
         } elsif ($baserpms->{$rpm}) {
-            my $remove = $self->db->prepare_cached(
-                q{
-                DELETE FROM rpmfiles where d_path = ? and filename = ?
-                }
-            );
-            $remove->execute($$self, $rpm);
-            warn "deleting $rpm";
+            push(@delta, { rpm => $rpm, delta => 'R' });
         }
     }
+    @delta;
+}
+sub update_content {
+    my ($self, @delta) = @_;
+    foreach (@delta) {
+        if (!$_->{delta}) {
+        }
+        elsif ($_->{delta} eq 'A') {
+            $self->add_rpm($_->{rpm});
+        }
+        elsif ($_->{delta} eq 'R') {
+            $self->remove_rpm($_->{rpm});
+        }
+    }
+}
 
+sub remove_rpm {
+    my ($self, $rpm) = @_;
+    my $remove = $self->db->prepare_cached(
+        q{
+        DELETE FROM rpmfiles where d_path = ? and filename = ?
+        }
+    );
+    $remove->execute($$self, $rpm);
+    warn "deleting $rpm";
+    $self->db->commit;
 }
 
@@ -103 +122 @@
     } else {
     }
+    warn "adding $rpm";
     $self->db->commit;
 }

web/trunk/lib/Sophie/Controller/Search.pm

@@ -28 +28 @@
 }
 
+sub bytag : XMLRPCPath('/search/rpm/bytag') {
+    my ( $self, $c, $searchspec, $tag, $tagvalue ) = @_;
+
+    @{$c->stash->{xmlrpc}} = $c->model('Base')->resultset('Rpms')->search(
+        {
+            pkgid => { IN => $c->model('Base')->resultset('Tags')
+                ->search({ tagname => $tag, value => $tagvalue})
+                ->get_column('pkgid')->as_query }
+        }
+    )->get_column('pkgid')->all
+
+}
+
+sub bydep : XMLRPCPath('/search/rpm/bydep') {
+    my ( $self, $c, $searchspec, $deptype, $depname, $depsense, $depevr ) = @_;
+
+    @{$c->stash->{xmlrpc}} = $c->model('Base')->resultset('Rpms')->search(
+        {
+            pkgid => { IN => $c->model('Base')->resultset('Deps')
+                ->search({
+                        deptype => $deptype,
+                        depname => $depname,
+                        ($depsense
+                            ? (-nest => \[
+                                'rpmdepmatch(flags, evr, rpmsenseflag(?), ?)',
+                                     [ plain_text => $depsense],
+                                     [ plain_text => $depevr ]
+                                 ])
+                            : ()
+                        ),
+                })
+                ->get_column('pkgid')->as_query }
+        }
+    )->get_column('pkgid')->all
+
+}
 
 =head1 AUTHOR