Changeset 207

Timestamp:

12/28/10 07:26:44 (13 years ago)

Author:

nanardon

Message:

• add analyse functions (need yet to be improve)

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Analysis.pm (modified) (1 diff)
• lib/Sophie/Controller/Analysis/Solver.pm (modified) (7 diffs)
• lib/Sophie/Controller/User/Folder.pm (modified) (1 diff)
• root/static/images/draw-eraser.png (added)
• root/static/sophie.css (modified) (1 diff)
• root/templates/html/analysis (added)
• root/templates/html/analysis/analyse_folder.html (added)
• root/templates/html/analysis/analyse_folder.tt (added)
• root/templates/html/analysis/index.html (added)
• root/templates/html/analysis/index.tt (added)
• root/templates/html/analysis/required_by.tt (added)
• root/templates/html/user (added)
• root/templates/html/user/folder (added)
• root/templates/html/user/folder/clear.tt (added)
• root/templates/html/user/folder/delete.tt (added)
• root/templates/html/user/folder/list.tt (added)
• t/controller_User-Folder.t (modified) (2 diffs)

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

@@ -25 +25 @@
     my ( $self, $c ) = @_;
 
-    $c->response->body('Matched Sophie::Controller::Analysis in Analysis.');
+    if (my $upload = $c->req->upload('file')) {
+        if ($upload->size < 5 * 1024 * 1024) { # 5Mo
+            $c->forward('/user/folder/load_rpm', [ $upload->slurp ]);
+        }
+    }
+    $c->forward('analyse_folder');
+}
+
+sub analyse_folder : Local {
+    my ($self, $c) = @_;
+
+    $c->session->{analyse_dist} = {
+        distribution => $c->req->param('distribution') || undef,
+        release => $c->req->param('release') || undef,
+        arch => $c->req->param('arch') || undef,
+    };
+
+}
+
+sub required_by :Local {
+    my ($self, $c, $id) = @_;
+    $id ||= $c->req->param('id');
+
+    my @deplist;
+    foreach my $dep ($c->model('Base::UsersDeps')->search(
+        {
+            pid => [ $id ],
+            deptype => 'R',
+        },
+        {
+            select => [ 'rpmsenseflag("flags")',
+                qw(depname flags evr deptype) ],
+            as => [ qw'sense depname flags evr deptype' ],
+        }
+        )->all) {
+        $dep->get_column('depname') =~ /^rpmlib\(/ and next;
+        push(@deplist, [
+                $dep->get_column('depname'),
+                $dep->get_column('sense'),
+                $dep->get_column('evr') ]);
+    }
+
+    my @folderid = map { $_->{id} } @{ $c->forward('/user/folder/list') };
+    
+    $c->stash->{xmlrpc} = $c->forward(
+        '/analysis/solver/find_requirements',
+        [ $c->session->{analyse_dist},
+            'P', \@deplist, \@folderid ]
+    );
 }
 

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

@@ -34 +34 @@
     my %need_pkgid;
     my %need_pool;
+    my %bydep;
     my @unresolved;
     foreach my $dep (@{ $deplist || []}) {
@@ -43 +44 @@
 
         $depname =~ /^rpmlib\(/ and next;
+        my $depdisplay = $depname . ($sense ? " $sense $evr" : '');
+        $bydep{$depdisplay} and next; # same already searched
+        $bydep{$depdisplay} = {};
         my $found = 0;
         if ($depname =~ /^\//) {
@@ -48 +52 @@
             if (@{$res}) {
                 $found = 1;
-                foreach (@{$res->{results}}) {
+                foreach (@{$res}) {
                     $need_pkgid{$_} = 1;
+                    $bydep{$depdisplay}{pkg}{$_} = 1;
                 }
             } 
@@ -58 +63 @@
                     foreach (@{$res}) {
                         $need_pool{$_} = 1;
+                        $bydep{$depdisplay}{pool}{$_} = 1;
+
                     }
                 }
@@ -70 +77 @@
                 foreach (@{$res}) {
                     $need_pkgid{$_} = 1;
+                    $bydep{$depdisplay}{pkg}{$_} = 1;
                 }
             } 
@@ -82 +90 @@
                     foreach (@{$res}) {
                         $need_pool{$_} = 1;
+                        $bydep{$depdisplay}{pool}{$_} = 1;
                     }
                 }
@@ -97 +106 @@
     }
 
+    foreach my $d (keys %bydep) {
+        foreach my $t (keys %{ $bydep{$d} || {} }) {
+            $bydep{$d}{$t} = [ keys %{ $bydep{$d}{$t} } ];
+        }
+    }
+
+
     $c->stash->{xmlrpc} = {
         unresolved => \@unresolved,
         pkg => [ keys %need_pkgid ],
         pool => [ keys %need_pool ],
+        bydep => \%bydep,
     };
 }

server/trunk/web/lib/Sophie/Controller/User/Folder.pm

@@ -28 +28 @@
 
     $c->response->body('Matched Sophie::Controller::User::folder in User::folder.');
+}
+
+sub list :XMLRPC :Local {
+    my ($self, $c ) = @_;
+
+    $c->stash->{xmlrpc} = [
+        map { { $_->get_columns } }
+        $c->model('Base::UsersRpms')->search(
+        {
+            ($c->user_exists
+            ? ( user_fkey => $c->model('Base::Users')->find({ mail =>
+                        $c->user->mail })->ukey )
+            : ( sessions_fkey => 'session:' . $c->sessionid ) ),
+        }
+    )->all ]
+}
+
+sub delete :XMLRPC :Local {
+    my ($self, $c, $pid ) = @_;
+    $pid ||= $c->req->param('delete');
+
+    my $pkg = $c->model('Base::UsersRpms')->search(
+        {
+            -and => [ {
+            ($c->user_exists
+            ? ( user_fkey => $c->model('Base::Users')->find({ mail =>
+                        $c->user->mail })->ukey )
+            : ( sessions_fkey => 'session:' . $c->sessionid ) ),
+            },
+            { id => $pid },
+            ]
+        }
+    )->first;
+    if ($pkg) {
+        $pkg->delete;
+        $c->model('Base')->storage->dbh->commit;
+        $c->stash->{xmlrpc} = 'Delete';
+    } else {
+        $c->stash->{xmlrpc} = 'No package found';
+    }
+}
+
+sub clear : XMLRPC : Local {
+    my ($self, $c, $pid ) = @_;
+    $pid ||= $c->req->param('delete');
+
+    my $pkg = $c->model('Base::UsersRpms')->search(
+        {
+            -and => [ {
+            ($c->user_exists
+            ? ( user_fkey => $c->model('Base::Users')->find({ mail =>
+                        $c->user->mail })->ukey )
+            : ( sessions_fkey => 'session:' . $c->sessionid ) ),
+            },
+            ]
+        }
+    )->delete;
+    $c->model('Base')->storage->dbh->commit;
+    $c->stash->{xmlrpc} = 'Empty';
 }
 

server/trunk/web/root/static/sophie.css

@@ -248 +248 @@
 }
 
+.alert {
+    color: red;
+}
+
 #w3c {
     float: right;

server/trunk/web/t/controller_User-Folder.t

@@ -2 +2 @@
 use warnings;
 use Test::More;
+use FindBin;
+require "$FindBin::Bin/xml.pl";
 
 BEGIN { use_ok 'Catalyst::Test', 'Sophie' }
@@ -7 +9 @@
 
 ok( request('/user/folder')->is_success, 'Request should succeed' );
+ok( xmlrequest_ok('user.folder.list'), 'RPC user.folder.list');
 done_testing();