move parse_repo_name to utils

Author: miltontony

cms/utils.py

@@ -1,6 +1,8 @@
+from urlparse import urlparse
+
+from cms import mappings
 from django.conf import settings
 from elasticgit import EG
-from cms import mappings
 
 from unicore.content.models import (
     Category, Page, Localisation as EGLocalisation)
@@ -18,6 +20,17 @@ def push_to_git(repo_path, index_prefix, es_host):
         remote.push(remote_master.remote_head)
 
 
+def parse_repo_name(repo_url):
+    pr = urlparse(repo_url)
+    _, _, repo_name_dot_ext = pr.path.rpartition('/')
+    if any([
+            repo_name_dot_ext.endswith('.git'),
+            repo_name_dot_ext.endswith('.json')]):
+        repo_name, _, _ = repo_name_dot_ext.partition('.')
+        return repo_name
+    return repo_name_dot_ext
+
+
 def setup_workspace(repo_path, index_prefix):
     workspace = EG.workspace(
         repo_path, index_prefix=index_prefix,

cms/views.py

@@ -2,8 +2,6 @@
 import os.path
 import shutil
 
-from urlparse import urlparse
-
 from django.core.exceptions import ValidationError
 from django.http import HttpResponse
 from django.shortcuts import redirect
@@ -21,17 +19,6 @@
     Category, Page, Localisation as EGLocalisation)
 
 
-def parse_repo_name(repo_url):
-    pr = urlparse(repo_url)
-    _, _, repo_name_dot_ext = pr.path.rpartition('/')
-    if any([
-            repo_name_dot_ext.endswith('.git'),
-            repo_name_dot_ext.endswith('.json')]):
-        repo_name, _, _ = repo_name_dot_ext.partition('.')
-        return repo_name
-    return repo_name_dot_ext
-
-
 def clone_repo(url, name):
     repo_path = os.path.join(settings.IMPORT_CLONE_REPO_PATH, name)
     if os.path.exists(repo_path):
@@ -49,7 +36,7 @@ def import_clone_repo(request, *args, **kwargs):
                 'Invalid repo_url',
                 status=400,
                 mimetype='application/json')
-        repo_index = 'import-repo-prefix-%s' % parse_repo_name(url)
+        repo_index = 'import-repo-prefix-%s' % utils.parse_repo_name(url)
         repo = clone_repo(url, repo_index)
         ws = utils.setup_workspace(repo.working_dir, repo_index)
         ws.sync(EGLocalisation)