@@ -755,38 +755,24 @@ sub project_urls {

   return \@urls;

 }

-sub projects {

-  my ($self, $user, $opts) = @_;

+sub repository {

+  my ($self, $user, $project) = @_;

+

+  return unless -d $self->rep($user, $project);

-  my $home = $self->rep_home;

-  my $dir = "$home/$user";

-  

-  # Repositories

-  opendir my $dh, $self->_enc($dir)

-    or croak qq/Can't open directory $dir: $!/;

-  my @reps;

-  while (my $rep_name = readdir $dh) {

-    next unless $rep_name =~ /\.git$/;

-    my $project = $rep_name;

-    $project =~ s/\.git$//;

-    my $rep_path = "$home/$user/$rep_name";

-    my @activity = $self->last_activity($user, $project);

-    

-    my $rep = {};

-    $rep->{name} = $project;

-    if (@activity) {

-      $rep->{age} = $activity[0];

-      $rep->{age_string} = $activity[1];

-    }

-    else { $rep->{age} = 0 }

-    

-    my $description = $self->description($user, $project) || '';

-    $rep->{description} = $self->_chop_str($description, 25, 5);

-    

-    push @reps, $rep;

+

+  my $rep = {};

+  my @activity = $self->last_activity($user, $project);

+  if (@activity) {

+    $rep->{age} = $activity[0];

+    $rep->{age_string} = $activity[1];

   }

+  else { $rep->{age} = 0 }

+  

+  my $description = $self->description($user, $project) || '';

+  $rep->{description} = $self->_chop_str($description, 25, 5);

-  return \@reps;

+  return $rep;

 }

 sub references {

@@ -30,6 +30,46 @@ sub default_branch {

   return $default_branch;

 }

+sub fork_project {

+  my ($self, $user, $original_user, $project) = @_;

+  

+  # Fork project

+  my $dbi = $self->app->dbi;

+  my $error;

+  eval {

+    $dbi->connector->txn(sub {

+      

+      # Original project id

+      my $original_pid = $dbi->model('project')

+        ->select('original_pid', id => [$original_user, $project])->value;

+      

+      croak "Can't get original project id"

+        unless defined $original_pid && $original_pid > 0;

+      

+      # Create project

+      eval {

+        $self->_create_project(

+          $user,

+          $project,

+          {

+            original_user => $original_user,

+            original_project => $project,

+            original_pid => $original_pid

+          }

+        );

+      };

+      croak $error = $@ if $@;

+      

+      # Create repository

+      eval {

+        $self->_fork_rep($original_user, $project, $user, $project);

+      };

+      croak $error = $@ if $@;

+    });

+  };

+  croak $error if $@;

+}

+

 sub is_admin {

   my ($self, $user) = @_;

@@ -162,12 +202,23 @@ sub original_user {

   return $original_user;

 }

+sub projects {

+  my ($self, $user) = @_;

+

+  # Projects

+  my $projects = $self->app->dbi->model('project')->select(

+    where => {user_id => $user},

+    append => 'order by name'

+  )->all;

+  

+  return $projects;

+}

+

 sub users {

   my $self = shift;

   # Users

   my $users = $self->app->dbi->model('user')->select(

-    'id',

     where => [':admin{<>}',{admin => 1}],

     append => 'order by id'

   )->all;

@@ -175,119 +226,22 @@ sub users {

   return $users;

 }

-sub _delete_db_user {

-  my ($self, $user) = @_;

-  

-  # Delete database user

-  $self->app->dbi->model('user')->delete(id => $user);

-}

-

-sub _delete_user_dir {

-  my ($self, $user) = @_;

-  

-  # Delete user directory

-  my $rep_home = $self->app->git->rep_home;

-  my $user_dir = "$rep_home/$user";

-  rmtree $user_dir;

-}

-

-sub _create_db_user {

-  my ($self, $user, $data) = @_;

-  

-  # Create database user

-  $self->app->dbi->model('user')->insert($data, id => $user);

-}

-

-sub _create_user_dir {

-  my ($self, $user) = @_;

-  

-  # Create user directory

-  my $rep_home = $self->app->git->rep_home;

-  my $user_dir = "$rep_home/$user";

-  mkpath $user_dir;

-}

-

-sub fork_project {

-  my ($self, $user, $original_user, $project) = @_;

-  

-  # DBI

-  my $dbi = $self->app->dbi;

-  

-  # Fork project

-  my $error;

-  eval {

-    $dbi->connector->txn(sub {

-      

-      # Original project id

-      my $original_pid = $dbi->model('project')

-        ->select('original_pid', id => [$original_user, $project])->value;

-      

-      croak "Can't get original project id"

-        unless defined $original_pid && $original_pid > 0;

-      

-      # Create project

-      eval {

-        $self->_create_project(

-          $user,

-          $project,

-          {

-            original_user => $original_user,

-            original_project => $project,

-            original_pid => $original_pid

-          }

-        );

-      };

-      croak $error = $@ if $@;

-      

-      # Create repository

-      eval {

-        $self->_fork_rep($original_user, $project, $user, $project);

-      };

-      croak $error = $@ if $@;

-    });

-  };

-  croak $error if $@;

-}

-

-sub _fork_rep {

-  my ($self, $user, $project, $to_user, $to_project) = @_;

-  

-  # Git

-  my $git = $self->app->git;

-  

-  # Git clone

-  my $rep = $git->rep($user, $project);

-  my $to_rep = $git->rep($to_user, $to_project);

-  my @git_clone_cmd = (

-    $git->bin,

-    'clone',

-    '-q',

-    '--bare',

-    $rep,

-    $to_rep

-  );

-  system(@git_clone_cmd) == 0

-    or croak "Can't execute git clone";

-}

-

 sub rename_project {

-  my ($self, $user, $project, $renamed_project) = @_;

+  my ($self, $user, $project, $to_project) = @_;

+  # Rename project

   my $git = $self->app->git;

   my $dbi = $self->app->dbi;

-  

   my $error = {};

-  

-  if ($self->exists_project($user, $renamed_project)

-    || $self->_exists_rep($user, $renamed_project))

+  if ($self->exists_project($user, $to_project))

   {

     $error->{message} = 'Already exists';

     return $error;

   }

   else {

     $dbi->connector->txn(sub {

-      $self->_rename_project($user, $project, $renamed_project);

-      $self->_rename_rep($user, $project, $renamed_project);

+      $self->_rename_project($user, $project, $to_project);

+      $self->_rename_rep($user, $project, $to_project);

     });

     if ($@) {

       $error->{message} = 'Rename failed';

@@ -535,6 +489,38 @@ sub _create_rep {

   }

 }

+sub _create_db_user {

+  my ($self, $user, $data) = @_;

+  

+  # Create database user

+  $self->app->dbi->model('user')->insert($data, id => $user);

+}

+

+sub _create_user_dir {

+  my ($self, $user) = @_;

+  

+  # Create user directory

+  my $rep_home = $self->app->git->rep_home;

+  my $user_dir = "$rep_home/$user";

+  mkpath $user_dir;

+}

+

+sub _delete_db_user {

+  my ($self, $user) = @_;

+  

+  # Delete database user

+  $self->app->dbi->model('user')->delete(id => $user);

+}

+

+sub _delete_user_dir {

+  my ($self, $user) = @_;

+  

+  # Delete user directory

+  my $rep_home = $self->app->git->rep_home;

+  my $user_dir = "$rep_home/$user";

+  rmtree $user_dir;

+}

+

 sub _delete_project {

   my ($self, $user, $project) = @_;

@@ -571,6 +557,25 @@ sub _exists_rep {

   return -e $rep;

 }

+sub _fork_rep {

+  my ($self, $user, $project, $to_user, $to_project) = @_;

+  

+  # Git clone

+  my $git = $self->app->git;

+  my $rep = $git->rep($user, $project);

+  my $to_rep = $git->rep($to_user, $to_project);

+  my @cmd = (

+    $git->bin,

+    'clone',

+    '-q',

+    '--bare',

+    $rep,

+    $to_rep

+  );

+  system(@cmd) == 0

+    or croak "Can't fork repository: @cmd";

+}

+

 sub _rename_project {

   my ($self, $user, $project, $renamed_project) = @_;

@@ -109,7 +109,7 @@

     % }

     %= include '/include/project_header';

-

+    

     <h3 style="margin:20px 0px 20px 0;font-size:16px;line-height:0">

       <%= $desc %>

     </h3>

@@ -2,7 +2,7 @@

   my $api = gitprep_api;

   my $logined = $api->logined;

   my $user_is_valid = $logined && $user eq session('user');

-  my $default_branch = app->manager->default_branch($user, $project);

+  my $default_branch_name = app->manager->default_branch($user, $project);

   my $git = app->git;

@@ -217,7 +217,7 @@

         Default Branch

         % my $branches = $git->branches($user, $project);

         % my $branch_names = [map { $_->{name} } @$branches];

-        % push @$branch_names, $default_branch->{name} unless @$branch_names;

+        % push @$branch_names, $default_branch_name unless @$branch_names;

         %= select_field 'default_branch' => $branch_names, style => 'margin-top:5px';

       </div>

     </div>

@@ -3,13 +3,20 @@

   if (my $deleted_project = param('deleted_project')) {

     flash('deleted_project', $deleted_project);

     $self->redirect_to('current');

-    return 1;

+    $self->finish_rendering;

+    return;

   }

   my $user = param('user');

   # Projects

-  my $reps = app->git->projects($user);

+  my $projects = app->manager->projects($user);

+  my $reps = [];

+  for my $project (@$projects) {

+    my $rep = app->git->repository($user, $project->{name}) || {none => 1};

+    $rep->{name} = $project->{name};

+    push $reps, $rep;

+  }

 %>

 % layout 'common';

@@ -51,7 +58,14 @@

                 <%= $rep->{description} %>

               </td>

               % my $age = $rep->{age_string};

-              <td class="muted"><%= $age ? "last updated $age" : 'new repository' %></td>

+              <td class="muted">

+                % if ($rep->{none}) {

+                  <span style="color:red">Repository not exists</span>

+                  <a class="btn btn-mini">Delete</a>

+                % } else {

+                  <%= $age ? "last updated $age" : 'new repository' %>

+                % }

+              </td>

             </div>

           </tr>

         % }