Changeset 344

Timestamp:

01/24/11 19:06:18 (13 years ago)

Author:

nanardon

Message:

• add tools to rescan rpm
• index desktop files (only if in /usr/share/applications)

Location:

server/trunk/web

Files:

• bin/sophie_rescan (added)
• lib/Sophie/Base/Result/BinFiles.pm (modified) (1 diff)
• lib/Sophie/Base/Result/DesktopEntries.pm (added)
• lib/Sophie/Base/Result/DesktopFiles.pm (added)
• lib/Sophie/Scan.pm (modified) (1 diff)
• lib/Sophie/Scan/RpmParser.pm (modified) (1 diff)
• lib/Sophie/Scan/RpmParser/Desktopfile.pm (added)
• lib/Sophie/Scan/RpmsPath.pm (modified) (1 diff)

server/trunk/web/lib/Sophie/Base/Result/BinFiles.pm

@@ -7 +7 @@
 __PACKAGE__->table('binfiles');
 __PACKAGE__->add_columns(qw/dirnamekey pkgid count basename md5 user group linkto
-    mode fflags size class color vflags mtime nlink has_content/);
+    mode fflags size class color vflags mtime nlink has_content contents/);
 __PACKAGE__->set_primary_key(qw/pkgid count/);
 __PACKAGE__->belongs_to(Rpms => 'Sophie::Base::Result::Rpms', 'pkgid');

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

@@ -68 +68 @@
 }
 
+sub call_plugins_parser {
+    my ($self, $rpm, $pkgid, $new) = @_;
+    foreach my $plugins (qw'sources') {
+        $self->call_plugin_parser($plugins, $rpm, $pkgid, $new);
+    }
+}
+
+sub call_plugin_parser {
+    my ($self, $plugins, $rpm, $pkgid, $new) = @_;
+    my $mod = ucfirst(lc($plugins));
+    eval "require Sophie::Scan::RpmParser::$mod;";
+    warn $@ if($@);
+    eval {
+        my $parser = "Sophie::Scan::RpmParser::$mod"->new($self);
+        $parser->run($rpm, $pkgid, $new);
+    }
+}
+
 1;

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

@@ -25 +25 @@
         close($cpioh);
     } else {
+        warn $!;
         return 0;
     }

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

@@ -148 +148 @@
     warn "$$ adding $rpm";
     eval {
-    my ($pkgid, $new) = $self->db->base->storage->txn_do(
-        sub {
-            my ($pkgid, $new) = $self->_add_header($rpm);
-            if (defined($pkgid)) {
-                $pkgid or return;
-                $self->db->base->resultset('RpmFile')->create(
-                    {
-                        d_path => $self->key,
-                        filename => $rpm,
-                        pkgid => $pkgid,
-                    }
-                ); 
-                return $pkgid, $new;
-            }
-        },
-    );
-    foreach my $plugins (qw'sources') {
-        my $mod = ucfirst(lc($plugins));
-        eval "require Sophie::Scan::RpmParser::$mod;";
-        warn $@ if($@);
-        eval {
-            my $parser = "Sophie::Scan::RpmParser::$mod"->new($self->db);
-            $parser->run($self->path . '/' . $rpm, $pkgid, $new);
-        }
-    }
-    }
+        my ($pkgid, $new) = $self->db->base->storage->txn_do(
+            sub {
+                my ($pkgid, $new) = $self->_add_header($rpm);
+                if (defined($pkgid)) {
+                    $pkgid or return;
+                    $self->db->base->resultset('RpmFile')->create(
+                        {
+                            d_path => $self->key,
+                            filename => $rpm,
+                            pkgid => $pkgid,
+                        }
+                    ); 
+                    return $pkgid, $new;
+                }
+            },
+        );
+        $self->db->call_plugins_parser($self->path . '/' . $rpm, $pkgid, $new);
+    };
 }