Skip to content

The Unified and Autonomous Development Platform

Copy project avatar while forking a project

Robin Shen576476f4f285
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
index c51c6d638a..0635c9b564 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
@@ -59,6 +59,7 @@ import io.onedev.server.util.facade.MembershipFacade;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.TeamFacade;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
+import io.onedev.server.web.util.avatar.AvatarManager;
import io.onedev.utils.ExceptionUtils;
import io.onedev.utils.FileUtils;
import io.onedev.utils.StringUtils;
@@ -78,6 +79,8 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
private final CacheManager cacheManager;
+ private final AvatarManager avatarManager;
+
private final String gitReceiveHook;
private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();
@@ -85,7 +88,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
@Inject
public DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager,
TeamManager teamManager, MembershipManager membershipManager, BuildManager buildManager,
- CacheManager cacheManager) {
+ CacheManager cacheManager, AvatarManager avatarManager) {
super(dao);
this.commitInfoManager = commitInfoManager;
@@ -93,6 +96,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
this.membershipManager = membershipManager;
this.buildManager = buildManager;
this.cacheManager = cacheManager;
+ this.avatarManager = avatarManager;
try (InputStream is = getClass().getClassLoader().getResourceAsStream("git-receive-hook")) {
Preconditions.checkNotNull(is);
@@ -192,6 +196,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
FileUtils.cleanDir(to.getGitDir());
new CloneCommand(to.getGitDir()).mirror(true).from(from.getGitDir().getAbsolutePath()).call();
commitInfoManager.cloneInfo(from, to);
+ avatarManager.copyAvatar(from.getFacade(), to.getFacade());
}
private boolean isGitHookValid(File gitDir, String hookName) {
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/layout.css b/core/src/main/java/io/onedev/server/web/page/layout/layout.css
index d67c0d5a95..c7169b8669 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/layout.css
+++ b/core/src/main/java/io/onedev/server/web/page/layout/layout.css
@@ -7,6 +7,9 @@
height: 24px;
margin-left: -6px;
}
+.navbar a {
+ font-size: 16px;
+}
.navbar-nav>li>a.avatar {
padding-top: 10px;
padding-bottom: 10px;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
index 416aa31411..6db5f5eed0 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
@@ -8,7 +8,7 @@
<wicket:enclosure child="compareWithMergeBase">
<input wicket:id="compareWithMergeBase" type="checkbox" class="pull-left"></input>
<span class="pull-left">common ancestor</span>
- <a wicket:id="mergeBaseTooltip" class="pull-left"><i class="fa fa-question-circle"></i></a>
+ <span wicket:id="mergeBaseTooltip" class="pull-left"><i class="fa fa-question-circle"></i></span>
</wicket:enclosure>
</div>
<div wicket:id="leftRevSelector" class="selector"></div>
diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java b/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java
index 834b41e477..bf3c4e04be 100644
--- a/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java
+++ b/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java
@@ -42,5 +42,7 @@ public interface AvatarManager {
File getUploaded(ProjectFacade project);
+ void copyAvatar(ProjectFacade from, ProjectFacade to);
+
}
diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java b/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java
index b535759aec..268c5f24d6 100644
--- a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java
+++ b/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java
@@ -177,4 +177,20 @@ public class DefaultAvatarManager implements AvatarManager {
return new File(Bootstrap.getSiteDir(), "avatars/uploaded/projects/" + project.getId());
}
+ @Override
+ public void copyAvatar(ProjectFacade from, ProjectFacade to) {
+ Lock avatarLock = LockUtils.getLock("uploaded-project-avatar:" + from.getId());
+ avatarLock.lock();
+ try {
+ File uploaded = getUploaded(from);
+ if (uploaded.exists()) {
+ FileUtils.copyFile(uploaded, getUploaded(to));
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ avatarLock.unlock();
+ }
+ }
+
}