#620 Delete dt file implementation

This commit is contained in:
serge-rider
2020-05-04 15:23:40 +03:00
parent 6de03b8a90
commit 625e41e26d
2 changed files with 15 additions and 2 deletions
@@ -49,6 +49,6 @@ public interface DBWServiceDataTransfer extends DBWService {
WebDataTransferParameters parameters) throws DBWebException;
@WebAction
Boolean dataTransferRemoveDataFile(WebSQLProcessor sqlProcessor, String dataFileId) throws DBWebException;
Boolean dataTransferRemoveDataFile(WebSession session, String dataFileId) throws DBWebException;
}
@@ -117,7 +117,20 @@ public class WebServiceDataTransfer implements DBWServiceDataTransfer {
}
@Override
public Boolean dataTransferRemoveDataFile(WebSQLProcessor sqlProcessor, String dataFileId) {
public Boolean dataTransferRemoveDataFile(WebSession webSession, String dataFileId) throws DBWebException {
WebDataTransferSessionConfig dtConfig = WebDataTransferUtils.getSessionDataTransferConfig(webSession);
WebDataTransferTaskConfig taskInfo = dtConfig.getTask(dataFileId);
if (taskInfo == null) {
throw new DBWebException("Session task '" + dataFileId + "' not found");
}
File dataFile = taskInfo.getDataFile();
if (dataFile != null) {
if (!dataFile.delete()) {
log.warn("Error deleting data file '" + dataFile.getAbsolutePath() + "'");
}
}
dtConfig.removeTask(taskInfo);
return true;
}