From f97bf09263fe8ef7ba4dcf231dfe7b8265b1e0df Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 27 Apr 2011 21:22:12 -0400
Subject: [PATCH] Centralized markdown transforms. Moved config ops to GitBlit.

---
 src/com/gitblit/GitBlit.java |   82 +++++++++++++++++++++++++++++++----------
 1 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index f285daf..a626be8 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -1,22 +1,20 @@
 package com.gitblit;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
 
-import org.apache.wicket.Request;
 import org.apache.wicket.protocol.http.WebResponse;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
-import org.eclipse.jgit.http.server.resolver.FileResolver;
-import org.eclipse.jgit.http.server.resolver.ServiceNotEnabledException;
 import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.StoredConfig;
+import org.eclipse.jgit.transport.resolver.FileResolver;
+import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,7 +28,7 @@
 
 	private final Logger logger = LoggerFactory.getLogger(GitBlit.class);
 
-	private FileResolver repositoryResolver;
+	private FileResolver<Void> repositoryResolver;
 
 	private File repositories;
 
@@ -96,31 +94,57 @@
 		response.addCookie(userCookie);
 	}
 
+	public void editRepositoryModel(RepositoryModel repository, boolean isCreate) {
+		Repository r = null;
+		if (isCreate) {
+			// create repository
+			logger.info("create repository " + repository.name);
+			r = JGitUtils.createRepository(repositories, repository.name, true);
+		} else {
+			// load repository
+			logger.info("edit repository " + repository.name);
+			try {
+				r = repositoryResolver.open(null, repository.name);
+			} catch (RepositoryNotFoundException e) {
+				logger.error("Repository not found", e);
+			} catch (ServiceNotEnabledException e) {
+				logger.error("Service not enabled", e);
+			}
+		}
+
+		// update settings
+		StoredConfig config = JGitUtils.readConfig(r);
+		config.setString("gitblit", null, "description", repository.description);
+		config.setString("gitblit", null, "owner", repository.owner);
+		config.setBoolean("gitblit", null, "useTickets", repository.useTickets);
+		config.setBoolean("gitblit", null, "useDocs", repository.useDocs);
+		config.setBoolean("gitblit", null, "restrictedAccess", repository.useRestrictedAccess);
+		try {
+			config.save();
+		} catch (IOException e) {
+			logger.error("Failed to save repository config!", e);
+		}
+		r.close();
+	}
+
 	public List<String> getRepositoryList() {
 		return JGitUtils.getRepositoryList(repositories, exportAll, storedSettings.getBoolean(Keys.git.nestedRepositories, true));
 	}
 
-	public List<RepositoryModel> getRepositories(Request request) {
+	public List<RepositoryModel> getRepositories() {
 		List<String> list = getRepositoryList();
-		ServletWebRequest servletWebRequest = (ServletWebRequest) request;
-		HttpServletRequest req = servletWebRequest.getHttpServletRequest();
-
 		List<RepositoryModel> repositories = new ArrayList<RepositoryModel>();
 		for (String repo : list) {
-			Repository r = getRepository(req, repo);
-			String description = JGitUtils.getRepositoryDescription(r);
-			String owner = JGitUtils.getRepositoryOwner(r);
-			Date lastchange = JGitUtils.getLastChange(r);
-			r.close();
-			repositories.add(new RepositoryModel(repo, description, owner, lastchange));
+			RepositoryModel model = getRepositoryModel(repo);
+			repositories.add(model);
 		}
 		return repositories;
 	}
 
-	public Repository getRepository(HttpServletRequest req, String repositoryName) {
+	public Repository getRepository(String repositoryName) {
 		Repository r = null;
 		try {
-			r = repositoryResolver.open(req, repositoryName);
+			r = repositoryResolver.open(null, repositoryName);
 		} catch (RepositoryNotFoundException e) {
 			r = null;
 			logger.error("Failed to find repository " + repositoryName);
@@ -130,6 +154,24 @@
 			e.printStackTrace();
 		}
 		return r;
+	}
+
+	public RepositoryModel getRepositoryModel(String repositoryName) {
+		Repository r = getRepository(repositoryName);
+		RepositoryModel model = new RepositoryModel();
+		model.name = repositoryName;
+		model.lastChange = JGitUtils.getLastChange(r);
+		StoredConfig config = JGitUtils.readConfig(r);
+		if (config != null) {
+			model.description = config.getString("gitblit", null, "description");
+			model.owner = config.getString("gitblit", null, "owner");
+			model.group = config.getString("gitblit", null, "group");
+			model.useTickets = config.getBoolean("gitblit", "useTickets", false);
+			model.useDocs = config.getBoolean("gitblit", "useDocs", false);
+			model.useRestrictedAccess = config.getBoolean("gitblit", "restrictedAccess", false);
+		}
+		r.close();
+		return model;
 	}
 
 	public void setupContext(IStoredSettings settings) {
@@ -147,7 +189,7 @@
 			WebXmlSettings webxmlSettings = new WebXmlSettings(contextEvent.getServletContext());
 			setupContext(webxmlSettings);
 		} else {
-			logger.info("GitBlit context already setup by " + storedSettings.toString());	
+			logger.info("GitBlit context already setup by " + storedSettings.toString());
 		}
 	}
 

--
Gitblit v1.9.1