wcreate wiki directory

troneill · Apr 18, 2017 · e1a4f3a · e1a4f3a
1 parent a79e51a
commit e1a4f3a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,12 +24,6 @@ data/*
 data/rep/*
 !data/work/
 data/work/*
-!data/wiki/
-data/wiki/*
-!data/wiki/rep/
-data/wiki/rep/*
-!data/wiki/work/
-data/wiki/work/*
 setup/latest-build
 setup/work/*
 setup/build.log

diff --git a/data/wiki/.gitkeep b/data/wiki/.gitkeep
diff --git a/data/wiki/rep/.gitkeep b/data/wiki/rep/.gitkeep
diff --git a/data/wiki/work/.gitkeep b/data/wiki/work/.gitkeep
diff --git a/lib/Gitprep.pm b/lib/Gitprep.pm
@@ -73,29 +73,13 @@ sub work_rep_info {
   return $info;
 }
 
-sub wiki_rep_home {
-  my $self = shift;
-
-  my $wiki_rep_home = $self->data_dir . "/wiki/rep";
-
-  return $wiki_rep_home;
-}
-
-sub wiki_work_rep_home {
-  my $self = shift;
-
-  my $wiki_work_home = $self->data_dir . "/wiki/work";
-
-  return $wiki_work_home;
-}
-
 sub wiki_rep_info {
   my ($self, $user_id, $project_id) = @_;
 
   my $info = {};
   $info->{user} = $user_id;
   $info->{project} = $project_id;
-  $info->{git_dir} = $self->wiki_rep_home . "/$user_id/$project_id.git";
+  $info->{git_dir} = $self->rep_home . "/$user_id/$project_id.wiki.git";
 
   return $info;
 }
@@ -106,8 +90,8 @@ sub wiki_work_rep_info {
   my $info = {};
   $info->{user} = $user_id;
   $info->{project} = $project_id;
-  $info->{git_dir} = $self->wiki_work_rep_home . "/$user_id/$project_id/.git";
-  $info->{work_tree} = $self->wiki_work_rep_home . "/$user_id/$project_id";
+  $info->{git_dir} = $self->work_rep_home . "/$user_id/$project_id.wiki/.git";
+  $info->{work_tree} = $self->work_rep_home . "/$user_id/$project_id.wiki";
 
   return $info;
 }

diff --git a/lib/Gitprep/API.pm b/lib/Gitprep/API.pm
@@ -22,12 +22,19 @@ sub create_wiki_page {
       project => $project_row_id,
       home => $title
     };
-    $self->app->dbi->model('wiki')->insert($new_wiki);
+
+    eval {
+      $self->app->dbi->connector->txn(sub {
+        $self->app->dbi->model('wiki')->insert($new_wiki);
+        $self->app->manager->create_wiki_rep($user_id, $project_id);
+        $self->app->manager->create_wiki_work_rep($user_id, $project_id);
+      });
+    };
+
+    if (my $error = $@) {
+      die $error
+    }
   }
-
-
-  die "aaaa";
-
 }
 
 sub get_pull_request_count {

diff --git a/lib/Gitprep/Manager.pm b/lib/Gitprep/Manager.pm
@@ -812,7 +812,7 @@ sub _create_rep {
 }
 
 sub create_wiki_rep {
-  my ($self, $user, $project, $opts) = @_;
+  my ($self, $user, $project) = @_;
 
   # Create repository directory
   my $git = $self->app->git;