Skip to content

The Unified and Autonomous Development Platform

Fix various attachment lost issue

Robin Shenfe7ca05aa5f3
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index 4a8ad80c0a..ce87e735dc 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -212,8 +212,8 @@ import io.onedev.server.security.OneFilterChainResolver;
import io.onedev.server.security.OnePasswordService;
import io.onedev.server.security.OneRememberMeManager;
import io.onedev.server.security.OneWebSecurityManager;
-import io.onedev.server.storage.AttachmentManager;
-import io.onedev.server.storage.DefaultAttachmentManager;
+import io.onedev.server.storage.AttachmentStorageManager;
+import io.onedev.server.storage.DefaultAttachmentStorageManager;
import io.onedev.server.storage.DefaultStorageManager;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.jackson.ObjectMapperConfigurator;
@@ -339,7 +339,7 @@ public class CoreModule extends AbstractPluginModule {
bind(MembershipManager.class).to(DefaultMembershipManager.class);
bind(PullRequestChangeManager.class).to(DefaultPullRequestChangeManager.class);
bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);
- bind(AttachmentManager.class).to(DefaultAttachmentManager.class);
+ bind(AttachmentStorageManager.class).to(DefaultAttachmentStorageManager.class);
bind(CodeCommentRelationInfoManager.class).to(DefaultCodeCommentRelationInfoManager.class);
bind(BuildInfoManager.class).to(DefaultBuildInfoManager.class);
bind(CodeCommentRelationManager.class).to(DefaultCodeCommentRelationManager.class);
diff --git a/core/src/main/java/io/onedev/server/model/CodeComment.java b/core/src/main/java/io/onedev/server/model/CodeComment.java
index d12f4ef14f..a72a7ef326 100644
--- a/core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -40,6 +40,7 @@ import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.model.support.TextRange;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.storage.AttachmentStorageSupport;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
@@ -54,7 +55,7 @@ import io.onedev.server.util.diff.WhitespaceOption;
@Index(columnList="commit"), @Index(columnList="path"),
@Index(columnList="createDate"), @Index(columnList="updateDate")})
@DynamicUpdate
-public class CodeComment extends AbstractEntity {
+public class CodeComment extends AbstractEntity implements AttachmentStorageSupport {
private static final long serialVersionUID = 1L;
@@ -312,5 +313,15 @@ public class CodeComment extends AbstractEntity {
}
}
+
+ @Override
+ public String getAttachmentStorageUUID() {
+ return uuid;
+ }
+
+ @Override
+ public Project getAttachmentProject() {
+ return getProject();
+ }
}
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index cdb54d286b..9e642cd424 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -43,6 +43,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.storage.AttachmentStorageSupport;
import io.onedev.server.util.IssueField;
import io.onedev.server.util.Referenceable;
import io.onedev.server.util.facade.IssueFacade;
@@ -67,7 +68,7 @@ import io.onedev.server.web.editable.annotation.Editable;
@Index(columnList="updateDate")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})
@Editable
-public class Issue extends AbstractEntity implements Referenceable {
+public class Issue extends AbstractEntity implements Referenceable, AttachmentStorageSupport {
private static final long serialVersionUID = 1L;
@@ -483,5 +484,15 @@ public class Issue extends AbstractEntity implements Referenceable {
}
return commits;
}
+
+ @Override
+ public String getAttachmentStorageUUID() {
+ return uuid;
+ }
+
+ @Override
+ public Project getAttachmentProject() {
+ return getProject();
+ }
}
diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.java
index 50b3b7b5ae..305beaf59b 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -52,6 +52,7 @@ import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.storage.AttachmentStorageSupport;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.util.Referenceable;
@@ -77,7 +78,7 @@ import io.onedev.server.util.jackson.RestView;
@Index(columnList="CLOSE_STATUS"), @Index(columnList="CLOSE_USER"),
@Index(columnList="CLOSE_USER_NAME")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_targetProject_id", "number"})})
-public class PullRequest extends AbstractEntity implements Referenceable {
+public class PullRequest extends AbstractEntity implements Referenceable, AttachmentStorageSupport {
private static final long serialVersionUID = 1L;
@@ -859,4 +860,14 @@ public class PullRequest extends AbstractEntity implements Referenceable {
}
+ @Override
+ public String getAttachmentStorageUUID() {
+ return uuid;
+ }
+
+ @Override
+ public Project getAttachmentProject() {
+ return getTargetProject();
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/storage/AttachmentManager.java b/core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java
similarity index 73%
rename from core/src/main/java/io/onedev/server/storage/AttachmentManager.java
rename to core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java
index afd7c97365..18fd8ef24d 100644
--- a/core/src/main/java/io/onedev/server/storage/AttachmentManager.java
+++ b/core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java
@@ -4,7 +4,7 @@ import java.io.File;
import io.onedev.server.util.facade.ProjectFacade;
-public interface AttachmentManager {
+public interface AttachmentStorageManager {
/**
* Get directory to store attachment of specified project and uuid
@@ -13,6 +13,6 @@ public interface AttachmentManager {
* directory to store attachment of specified project and uuid. The directory may not exist
* if there is no any attachment saved
*/
- File getAttachmentDir(ProjectFacade project, String attachmentDirUUID);
+ File getAttachmentStorage(ProjectFacade project, String attachmentStorageUUID);
}
diff --git a/core/src/main/java/io/onedev/server/storage/AttachmentStorageSupport.java b/core/src/main/java/io/onedev/server/storage/AttachmentStorageSupport.java
new file mode 100644
index 0000000000..4820d94de4
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/storage/AttachmentStorageSupport.java
@@ -0,0 +1,11 @@
+package io.onedev.server.storage;
+
+import io.onedev.server.model.Project;
+
+public interface AttachmentStorageSupport {
+
+ Project getAttachmentProject();
+
+ String getAttachmentStorageUUID();
+
+}
diff --git a/core/src/main/java/io/onedev/server/storage/DefaultAttachmentManager.java b/core/src/main/java/io/onedev/server/storage/DefaultAttachmentManager.java
deleted file mode 100644
index 0b8b149d42..0000000000
--- a/core/src/main/java/io/onedev/server/storage/DefaultAttachmentManager.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package io.onedev.server.storage;
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.quartz.CronScheduleBuilder;
-import org.quartz.ScheduleBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.launcher.loader.Listen;
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.schedule.SchedulableTask;
-import io.onedev.commons.utils.schedule.TaskScheduler;
-import io.onedev.server.event.entity.EntityPersisted;
-import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.system.SystemStarted;
-import io.onedev.server.event.system.SystemStopping;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.persistence.TransactionManager;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.util.facade.ProjectFacade;
-
-@Singleton
-public class DefaultAttachmentManager implements AttachmentManager, SchedulableTask {
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultAttachmentManager.class);
-
- private static final long TEMP_PRESERVE_PERIOD = 24*3600*1000L;
-
- private final StorageManager storageManager;
-
- private final TransactionManager transactionManager;
-
- private final TaskScheduler taskScheduler;
-
- private final Dao dao;
-
- private String taskId;
-
- @Inject
- public DefaultAttachmentManager(Dao dao, StorageManager storageManager, TransactionManager transactionManager,
- TaskScheduler taskScheduler) {
- this.dao = dao;
- this.storageManager = storageManager;
- this.transactionManager = transactionManager;
- this.taskScheduler = taskScheduler;
- }
-
- @Override
- public File getAttachmentDir(ProjectFacade project, String attachmentDirUUID) {
- File projectAttachmentDir = storageManager.getProjectAttachmentDir(project.getId());
- File attachmentDir = getPermanentAttachmentDir(projectAttachmentDir, attachmentDirUUID);
- if (attachmentDir.exists())
- return attachmentDir;
- else
- return getTempAttachmentDir(projectAttachmentDir, attachmentDirUUID);
- }
-
- private File getPermanentAttachmentDir(File projectAttachmentDir, String attachmentDirUUID) {
- String category = attachmentDirUUID.substring(0, 2);
- return new File(projectAttachmentDir, "permanent/" + category + "/" + attachmentDirUUID);
- }
-
- private File getTempAttachmentDir(File projectAttachmentDir) {
- return new File(projectAttachmentDir, "temp");
- }
-
- private File getTempAttachmentDir(File projectAttachmentDir, String attachmentDirUUID) {
- return new File(getTempAttachmentDir(projectAttachmentDir), attachmentDirUUID);
- }
-
- private void makeAttachmentPermanent(File projectAttachmentDir, String attachmentDirUUID) {
- File tempAttachmentDir = getTempAttachmentDir(projectAttachmentDir, attachmentDirUUID);
- File permanentAttachmentDir = getPermanentAttachmentDir(projectAttachmentDir, attachmentDirUUID);
- if (tempAttachmentDir.exists() && !permanentAttachmentDir.exists()) {
- try {
- FileUtils.moveDirectory(tempAttachmentDir, permanentAttachmentDir);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
-
- @Listen
- public void on(SystemStarted event) {
- taskId = taskScheduler.schedule(this);
- }
-
- @Listen
- public void on(SystemStopping event) {
- taskScheduler.unschedule(taskId);
- }
-
- @Sessional
- @Override
- public void execute() {
- try {
- for (Project project: dao.query(Project.class)) {
- File tempDir = getTempAttachmentDir(storageManager.getProjectAttachmentDir(project.getId()));
- if (tempDir.exists()) {
- for (File file: tempDir.listFiles()) {
- if (System.currentTimeMillis() - file.lastModified() > TEMP_PRESERVE_PERIOD) {
- FileUtils.deleteDir(file);
- }
- }
- }
- }
- } catch (Exception e) {
- logger.error("Error cleaning up temp attachments", e);
- }
- }
-
- @Override
- public ScheduleBuilder<?> getScheduleBuilder() {
- return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);
- }
-
- @Transactional
- @Listen
- public void on(EntityPersisted event) {
- if (event.isNew()) {
- File projectAttachmentDir;
- String attachmentUUID;
- if (event.getEntity() instanceof PullRequest) {
- PullRequest request = (PullRequest) event.getEntity();
- projectAttachmentDir = storageManager.getProjectAttachmentDir(request.getTargetProject().getId());
- attachmentUUID = request.getUUID();
- } else if (event.getEntity() instanceof CodeComment) {
- CodeComment comment = (CodeComment) event.getEntity();
- projectAttachmentDir = storageManager.getProjectAttachmentDir(comment.getProject().getId());
- attachmentUUID = comment.getUUID();
- } else if (event.getEntity() instanceof Issue) {
- Issue issue = (Issue) event.getEntity();
- projectAttachmentDir = storageManager.getProjectAttachmentDir(issue.getProject().getId());
- attachmentUUID = issue.getUUID();
- } else {
- projectAttachmentDir = null;
- attachmentUUID = null;
- }
- if (projectAttachmentDir != null && attachmentUUID != null) {
- transactionManager.runAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- makeAttachmentPermanent(projectAttachmentDir, attachmentUUID);
- }
-
- });
- }
- }
- }
-
- @Transactional
- @Listen
- public void on(EntityRemoved event) {
- File dirToDelete;
- if (event.getEntity() instanceof Project) {
- Project project = (Project) event.getEntity();
- dirToDelete = storageManager.getProjectAttachmentDir(project.getId());
- } else if (event.getEntity() instanceof CodeComment) {
- CodeComment comment = (CodeComment) event.getEntity();
- dirToDelete = getPermanentAttachmentDir(
- storageManager.getProjectAttachmentDir(comment.getProject().getId()), comment.getUUID());
- } else if (event.getEntity() instanceof Issue) {
- Issue issue = (Issue) event.getEntity();
- dirToDelete = getPermanentAttachmentDir(
- storageManager.getProjectAttachmentDir(issue.getProject().getId()), issue.getUUID());
- } else {
- dirToDelete = null;
- }
- if (dirToDelete != null) {
- transactionManager.runAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- if (dirToDelete.exists())
- FileUtils.deleteDir(dirToDelete);
- }
-
- });
- }
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java b/core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java
new file mode 100644
index 0000000000..d10e620385
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java
@@ -0,0 +1,156 @@
+package io.onedev.server.storage;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.quartz.CronScheduleBuilder;
+import org.quartz.ScheduleBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.schedule.SchedulableTask;
+import io.onedev.commons.utils.schedule.TaskScheduler;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStopping;
+import io.onedev.server.model.Project;
+import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.util.facade.ProjectFacade;
+
+@Singleton
+public class DefaultAttachmentStorageManager implements AttachmentStorageManager, SchedulableTask {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultAttachmentStorageManager.class);
+
+ private static final long TEMP_PRESERVE_PERIOD = 24*3600*1000L;
+
+ private static final String PERMANENT = "permanent";
+
+ private static final String TEMP = "temp";
+
+ private final StorageManager storageManager;
+
+ private final TransactionManager transactionManager;
+
+ private final TaskScheduler taskScheduler;
+
+ private final Dao dao;
+
+ private String taskId;
+
+ @Inject
+ public DefaultAttachmentStorageManager(Dao dao, StorageManager storageManager, TransactionManager transactionManager,
+ TaskScheduler taskScheduler) {
+ this.dao = dao;
+ this.storageManager = storageManager;
+ this.transactionManager = transactionManager;
+ this.taskScheduler = taskScheduler;
+ }
+
+ @Override
+ public File getAttachmentStorage(ProjectFacade project, String attachmentStorageUUID) {
+ File attachmentBase = storageManager.getProjectAttachmentDir(project.getId());
+ File attachmentStorage = getPermanentAttachmentStorage(attachmentBase, attachmentStorageUUID);
+ if (attachmentStorage.exists())
+ return attachmentStorage;
+ else
+ return new File(attachmentBase, TEMP + "/" + attachmentStorageUUID);
+ }
+
+ private File getPermanentAttachmentStorage(File attachmentBase, String attachmentStorageUUID) {
+ String prefix = attachmentStorageUUID.substring(0, 2);
+ return new File(attachmentBase, PERMANENT + "/" + prefix + "/" + attachmentStorageUUID);
+ }
+
+ private void permanentizeAttachmentStorage(File attachmentBase, String attachmentStorageUUID) {
+ File tempAttachmentStorage = new File(attachmentBase, TEMP + "/" + attachmentStorageUUID);
+ File permanentAttachmentStorage = getPermanentAttachmentStorage(attachmentBase, attachmentStorageUUID);
+ if (tempAttachmentStorage.exists() && !permanentAttachmentStorage.exists()) {
+ try {
+ FileUtils.moveDirectory(tempAttachmentStorage, permanentAttachmentStorage);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ @Listen
+ public void on(SystemStarted event) {
+ taskId = taskScheduler.schedule(this);
+ }
+
+ @Listen
+ public void on(SystemStopping event) {
+ taskScheduler.unschedule(taskId);
+ }
+
+ @Sessional
+ @Override
+ public void execute() {
+ try {
+ for (Project project: dao.query(Project.class)) {
+ File tempAttachmentBase = new File(storageManager.getProjectAttachmentDir(project.getId()), TEMP);
+ if (tempAttachmentBase.exists()) {
+ for (File file: tempAttachmentBase.listFiles()) {
+ if (System.currentTimeMillis() - file.lastModified() > TEMP_PRESERVE_PERIOD) {
+ FileUtils.deleteDir(file);
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ logger.error("Error cleaning up temp attachments", e);
+ }
+ }
+
+ @Override
+ public ScheduleBuilder<?> getScheduleBuilder() {
+ return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.isNew() && event.getEntity() instanceof AttachmentStorageSupport) {
+ AttachmentStorageSupport storageSupport = (AttachmentStorageSupport) event.getEntity();
+ File attachmentBase = storageManager.getProjectAttachmentDir(storageSupport.getAttachmentProject().getId());
+ String attachmentStorageUUID = storageSupport.getAttachmentStorageUUID();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ permanentizeAttachmentStorage(attachmentBase, attachmentStorageUUID);
+ }
+
+ });
+ }
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityRemoved event) {
+ if (event.getEntity() instanceof AttachmentStorageSupport) {
+ AttachmentStorageSupport storageSupport = (AttachmentStorageSupport) event.getEntity();
+ File attachmentStorage = getPermanentAttachmentStorage(
+ storageManager.getProjectAttachmentDir(storageSupport.getAttachmentProject().getId()), storageSupport.getAttachmentStorageUUID());
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ FileUtils.deleteDir(attachmentStorage);
+ }
+
+ });
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 9158aa9b07..f0852f2b89 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -144,7 +144,7 @@ public abstract class CodeCommentPanel extends Panel {
@Override
protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getComment().getProject(), "codecomment" + getComment().getUUID());
+ return new ProjectAttachmentSupport(getComment().getProject(), getComment().getUUID());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/stream/AttachmentStreamResource.java b/core/src/main/java/io/onedev/server/web/stream/AttachmentStreamResource.java
index ffff1fc819..17ca14819f 100644
--- a/core/src/main/java/io/onedev/server/web/stream/AttachmentStreamResource.java
+++ b/core/src/main/java/io/onedev/server/web/stream/AttachmentStreamResource.java
@@ -18,7 +18,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.storage.AttachmentManager;
+import io.onedev.server.storage.AttachmentStorageManager;
import io.onedev.server.util.facade.ProjectFacade;
public class AttachmentStreamResource extends AbstractResource {
@@ -47,15 +47,15 @@ public class AttachmentStreamResource extends AbstractResource {
if (!SecurityUtils.canReadCode(project.getFacade()))
throw new UnauthorizedException();
- String storage = params.get(PARAM_UUID).toString();
- if (StringUtils.isBlank(storage))
+ String uuid = params.get(PARAM_UUID).toString();
+ if (StringUtils.isBlank(uuid))
throw new IllegalArgumentException("uuid parameter has to be specified");
String attachment = params.get(PARAM_ATTACHMENT).toString();
if (StringUtils.isBlank(attachment))
throw new IllegalArgumentException("attachment parameter has to be specified");
- File attachmentFile = new File(getAttachmentDir(project.getFacade(), storage), attachment);
+ File attachmentFile = new File(getAttachmentDir(project.getFacade(), uuid), attachment);
if (!attachmentFile.exists())
throw new RuntimeException("Attachment not found: " + attachment);
@@ -84,15 +84,15 @@ public class AttachmentStreamResource extends AbstractResource {
}
private static File getAttachmentDir(ProjectFacade project, String uuid) {
- return OneDev.getInstance(AttachmentManager.class).getAttachmentDir(project, uuid);
+ return OneDev.getInstance(AttachmentStorageManager.class).getAttachmentStorage(project, uuid);
}
- public static PageParameters paramsOf(ProjectFacade project, String attachmentDirUUID, String attachmentName) {
+ public static PageParameters paramsOf(ProjectFacade project, String attachmentStorageUUID, String attachmentName) {
PageParameters params = new PageParameters();
params.set(PARAM_PROJECT, project.getName());
- params.set(PARAM_UUID, attachmentDirUUID);
+ params.set(PARAM_UUID, attachmentStorageUUID);
params.set(PARAM_ATTACHMENT, attachmentName);
- final File attachmentFile = new File(getAttachmentDir(project, attachmentDirUUID), attachmentName);
+ final File attachmentFile = new File(getAttachmentDir(project, attachmentStorageUUID), attachmentName);
params.set("v", attachmentFile.lastModified());
return params;
diff --git a/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java b/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
index 25867600fe..50823666d4 100644
--- a/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
+++ b/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
@@ -20,7 +20,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.storage.AttachmentManager;
+import io.onedev.server.storage.AttachmentStorageManager;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.stream.AttachmentStreamResource;
@@ -52,7 +52,7 @@ public class ProjectAttachmentSupport implements AttachmentSupport {
@Override
public List<String> getAttachments() {
List<String> attachments = new ArrayList<>();
- File attachmentDir = OneDev.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID);
+ File attachmentDir = OneDev.getInstance(AttachmentStorageManager.class).getAttachmentStorage(getProject(), attachmentDirUUID);
if (attachmentDir.exists()) {
for (File file: attachmentDir.listFiles())
attachments.add(file.getName());
@@ -61,12 +61,12 @@ public class ProjectAttachmentSupport implements AttachmentSupport {
}
private File getAttachmentDir() {
- return OneDev.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID);
+ return OneDev.getInstance(AttachmentStorageManager.class).getAttachmentStorage(getProject(), attachmentDirUUID);
}
@Override
public void deleteAttachemnt(String attachment) {
- File attachmentDir = OneDev.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID);
+ File attachmentDir = OneDev.getInstance(AttachmentStorageManager.class).getAttachmentStorage(getProject(), attachmentDirUUID);
FileUtils.deleteFile(new File(attachmentDir, attachment));
}