Changeset 127

Timestamp:

12/16/10 07:42:22 (13 years ago)

Author:

nanardon

Message:

• add user/folder to store user's rpms
• make solver working

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Analysis.pm (modified) (3 diffs)
• lib/Sophie/Controller/Analysis/Solver.pm (modified) (3 diffs)
• lib/Sophie/Controller/User (added)
• lib/Sophie/Controller/User/Folder.pm (added)
• t/controller_User-Folder.t (added)

server/trunk/web/lib/Sophie/Controller/Analysis.pm

@@ -2 +2 @@
 use Moose;
 use namespace::autoclean;
-use XML::Simple;
-use MIME::Base64;
 
 BEGIN {extends 'Catalyst::Controller'; }
@@ -30 +28 @@
 }
 
-sub load_rpm : XMLRPCLocal {
-    my ($self, $c, $string) = @_;
-
-    my $ref = XMLin($string, ForceArray => 1);
-    my $tags = $ref->{rpmTag} or return;
-
-
-    my $User = $c->user
-        ? $c->model('Base')->resultset('Users')->find( { mail => $c->user->mail } )
-        : undef;
-    $c->session;
-    $c->store_session_data('session:' . $c->sessionid, $c->session);
-
-    my $pkgid = unpack('H*',MIME::Base64::decode($tags->{Sigmd5}{base64}[0]));
-
-    my $newrpm = $c->model('Base::UsersRpms')->create(
-        {
-            name => $tags->{Name}{string}[0],
-            evr => sprintf('%s%s-%s',
-                defined($tags->{Epoch}{integer}[0]) ?
-                $tags->{Epoch}{integer}[0] . ':' : '',
-                $tags->{Version}{string}[0],
-                $tags->{Release}{string}[0],
-            ),
-            user_fkey => $User,
-            sessions_fkey => 'session:' . $c->sessionid,
-            pkgid => $pkgid,
-        }
-    );
-    {
-        my @populate;
-        foreach my $fcount (0 .. $#{$tags->{Basenames}{string}}) {
-            push(@populate,
-                {
-                    pid => $newrpm->id,
-                    basename => $tags->{Basenames}{string}[$fcount],
-                    dirname  => $tags->{Dirnames}{string}[
-                        $tags->{Dirindexes}{integer}[$fcount]
-                    ],
-                }
-            );
-        }
-        $c->model('Base::UsersFiles')->populate(\@populate) if(@populate);
-    }
-    {
-        my @populate;
-        foreach my $dtype (qw(Provide Require Conflict Obsolete Suggest Enhanced)) {
-            my $initial = substr($dtype, 0, 1);
-            $tags->{"${dtype}name"} or next;
-            foreach my $fcount (0 .. $#{$tags->{"${dtype}name"}{string}}) {
-                push(@populate,
-                    {
-                        pid => $newrpm->id,
-                        deptype => $initial,
-                        depname => $tags->{"${dtype}name"}{string}[$fcount],
-                        evr => ref $tags->{"${dtype}version"}{string}[$fcount]
-                        ? ''
-                        : $tags->{"${dtype}version"}{string}[$fcount],
-                        flags => $tags->{"${dtype}flags"}{integer}[$fcount] || 0,
-                    }
-                );
-            }
-        }
-        $c->model('Base::UsersDeps')->populate(\@populate) if(@populate);
-    }
-    $c->model('Base')->storage->dbh->commit;
-
-    $c->stash->{xmlrpc} = $newrpm->id;
-}
-
 sub find_requirements : XMLRPC {
     my ($self, $c, $string) = @_;
 
-    my $id = $c->forward('load_rpm', [ $string ]);
+    my $id = $c->forward('/user/folder/load_rpm', [ $string ]);
 
     my @deplist;
@@ -124 +52 @@
     }
 
-    $c->forward('/analysis/solver/find_requirements', [ {}, 'P', \@deplist ]);
+    $c->forward('/analysis/solver/find_requirements', [ {}, 'P', \@deplist, $id ]);
 }
 

server/trunk/web/lib/Sophie/Controller/Analysis/Solver.pm

@@ -29 +29 @@
 
 sub find_requirements : XMLRPC {
-    my ($self, $c, $searchspec, $over, $deplist) = @_;
+    my ($self, $c, $searchspec, $over, $deplist, $pool) = @_;
 
     $searchspec->{nopager} = 1;
     my %need_pkgid;
+    my %need_pool;
     my @unresolved;
     foreach my $dep (@{ $deplist || []}) {
@@ -42 +43 @@
 
         $depname =~ /^rpmlib\(/ and next;
-        my $res = $c->forward('/search/bydep', [ $searchspec, $over,
-                $depname,
-                $sense,
-                $evr ]);
-        if (@{$res->{results}}) {
-            foreach (@{$res->{results}}) {
-                $need_pkgid{$_} = 1;
+        my $found = 0;
+        if ($depname =~ /^\//) {
+            my $res = $c->forward('/search/byfile', [ $searchspec, $depname, ]);
+            if (@{$res->{results}}) {
+                $found = 1;
+                foreach (@{$res->{results}}) {
+                    $need_pkgid{$_} = 1;
+                }
+            } 
+            if ($pool) {
+                $res = $c->forward('/user/folder/byfile', [ $pool, $depname, ]);
+                if (@{$res}) {
+                    $found = 1;
+                    foreach (@{$res}) {
+                        $need_pool{$_} = 1;
+                    }
+                }
             }
         } else {
+            my $res = $c->forward('/search/bydep', [ $searchspec, $over,
+                    $depname,
+                    $sense,
+                    $evr ]);
+            if (@{$res->{results}}) {
+                $found = 1;
+                foreach (@{$res->{results}}) {
+                    $need_pkgid{$_} = 1;
+                }
+            } 
+            if ($pool) {
+                $res = $c->forward('/user/folder/bydep', [ $pool, $over,
+                        $depname,
+                        $sense,
+                        $evr ]
+                );
+                if (@{$res}) {
+                    $found = 1;
+                    foreach (@{$res}) {
+                        $need_pool{$_} = 1;
+                    }
+                }
+            }
+        }
+        if (!$found) {
             push(@unresolved,
                 $depname . (
@@ -64 +100 @@
         unresolved => \@unresolved,
         pkg => [ keys %need_pkgid ],
+        pool => [ keys %need_pool ],
     };
 }