From d7f343464fe9af8f66a30ca1f4200a6708725c17 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 06 2015 15:42:03 +0000
Subject: Fix more plugins to use get_repo_path and reduce code redundancy


---

diff --git a/progit/hooks/irc.py b/progit/hooks/irc.py
index 391304e..ec1b0c4 100644
--- a/progit/hooks/irc.py
+++ b/progit/hooks/irc.py
@@ -18,7 +18,7 @@ from sqlalchemy.orm import relation
 
 from progit.hooks import BaseHook
 from progit.lib.model import BASE, Project
-from progit import SESSION, APP
+from progit import SESSION, APP, get_repo_path
 
 
 class IrcTable(BASE):
@@ -108,9 +108,8 @@ class Hook(BaseHook):
             should be installed
 
         '''
-        repopath = os.path.join(APP.config['GIT_FOLDER'], project.path)
-        if project.is_fork:
-            repopath = os.path.join(APP.config['FORK_FOLDER'], project.path)
+        repopath = get_repo_path(project)
+
         hook_files = os.path.join(
             os.path.dirname(os.path.realpath(__file__)), 'files')
         repo_obj = pygit2.Repository(repopath)
diff --git a/progit/hooks/mail.py b/progit/hooks/mail.py
index f9834c5..f325a53 100644
--- a/progit/hooks/mail.py
+++ b/progit/hooks/mail.py
@@ -19,7 +19,7 @@ from sqlalchemy.orm import relation
 
 from progit.hooks import BaseHook
 from progit.lib.model import BASE, Project
-from progit import SESSION, APP
+from progit import SESSION, APP, get_repo_path
 
 
 class MailTable(BASE):
@@ -75,9 +75,8 @@ class Mail(BaseHook):
             should be installed
 
         '''
-        repopath = os.path.join(APP.config['GIT_FOLDER'], project.path)
-        if project.is_fork:
-            repopath = os.path.join(APP.config['FORK_FOLDER'], project.path)
+        repopath = get_repo_path(project)
+
         hook_files = os.path.join(
             os.path.dirname(os.path.realpath(__file__)), 'files')
         repo_obj = pygit2.Repository(repopath)
@@ -106,9 +105,8 @@ class Mail(BaseHook):
             should be installed
 
         '''
-        repopath = os.path.join(APP.config['GIT_FOLDER'], project.path)
-        if project.is_fork:
-            repopath = os.path.join(APP.config['FORK_FOLDER'], project.path)
+        repopath = get_repo_path(project)
+
         hook_path = os.path.join(repopath, 'hooks', 'post-receive.mail')
         if os.path.exists(hook_path):
             os.unlink(hook_path)
diff --git a/progit/hooks/progit_hook.py b/progit/hooks/progit_hook.py
index 88f3ec2..5b53de1 100644
--- a/progit/hooks/progit_hook.py
+++ b/progit/hooks/progit_hook.py
@@ -19,7 +19,7 @@ from sqlalchemy.orm import relation
 
 from progit.hooks import BaseHook
 from progit.lib.model import BASE, Project
-from progit import SESSION, APP
+from progit import SESSION, APP, get_repo_path
 
 
 class ProgitTable(BASE):
@@ -70,9 +70,8 @@ class ProgitHook(BaseHook):
             should be installed
 
         '''
-        repopath = os.path.join(APP.config['GIT_FOLDER'], project.path)
-        if project.is_fork:
-            repopath = os.path.join(APP.config['FORK_FOLDER'], project.path)
+        repopath = get_repo_path(project)
+
         hook_files = os.path.join(
             os.path.dirname(os.path.realpath(__file__)), 'files')
         repo_obj = pygit2.Repository(repopath)
@@ -92,9 +91,8 @@ class ProgitHook(BaseHook):
             should be installed
 
         '''
-        repopath = os.path.join(APP.config['GIT_FOLDER'], project.path)
-        if project.is_fork:
-            repopath = os.path.join(APP.config['FORK_FOLDER'], project.path)
+        repopath = get_repo_path(project)
+
         hook_path = os.path.join(repopath, 'hooks', 'post-receive.progit')
         if os.path.exists(hook_path):
             os.unlink(hook_path)