gCubeSystem
/
workspace
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed mark as read from server-side 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@144991 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2017-03-16 17:49:17 +00:00
parent 51ac080019
commit ffc9d39ea1
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/gcube/portlets/user/workspace/server/DownloadFolderWebSocketServer.java
View File

@ -7,8 +7,6 @@ import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.channels.FileChannel; import java.nio.channels.FileChannel;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
@ -25,11 +23,9 @@ import javax.websocket.server.ServerEndpoint;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.gcube.common.authorization.library.provider.UserInfo; import org.gcube.common.authorization.library.provider.UserInfo;
import org.gcube.common.homelibrary.home.HomeLibrary; import org.gcube.common.homelibrary.home.HomeLibrary;
import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
import org.gcube.common.homelibrary.home.workspace.Workspace; import org.gcube.common.homelibrary.home.workspace.Workspace;
import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder; import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundException;
import org.gcube.common.homelibrary.util.zip.ZipUtil; import org.gcube.common.homelibrary.util.zip.ZipUtil;
import org.gcube.common.portal.PortalContext; import org.gcube.common.portal.PortalContext;
import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.api.ScopeProvider;
@ -73,12 +69,12 @@ public class DownloadFolderWebSocketServer {
} }
} }
} }
} }
} }
private final static String DEFAULT_ROLE = "OrganizationMember"; private final static String DEFAULT_ROLE = "OrganizationMember";
private static void setAuthorizationToken(String username) throws Exception { private static void setAuthorizationToken(String username) throws Exception {
String scope = "/"+PortalContext.getConfiguration().getInfrastructureName(); String scope = "/"+PortalContext.getConfiguration().getInfrastructureName();
ScopeProvider.instance.set(scope); ScopeProvider.instance.set(scope);
_log.debug("calling service token on scope " + scope); _log.debug("calling service token on scope " + scope);
@ -88,7 +84,7 @@ public class DownloadFolderWebSocketServer {
_log.debug("received token: "+token); _log.debug("received token: "+token);
_log.info("Security token set in session for: "+username + " on " + scope); _log.info("Security token set in session for: "+username + " on " + scope);
} }
private String zipFolder(String itemId, Session peer, String username) { private String zipFolder(String itemId, Session peer, String username) {
_log.info("FOLDER DOWNLOAD REQUEST itemId="+itemId + " user=" + username); _log.info("FOLDER DOWNLOAD REQUEST itemId="+itemId + " user=" + username);
@ -108,14 +104,8 @@ public class DownloadFolderWebSocketServer {
try { try {
item = wa.getItem(itemId); item = wa.getItem(itemId);
try{
//ACCOUNTING
item.markAsRead(true);
} catch (InternalErrorException e) {
_log.error("Requested item "+itemId+" has thrown an internal error exception",e);
}
} catch (ItemNotFoundException e) { } catch (Exception e) {
_log.error("Requested item "+itemId+" not found",e); _log.error("Requested item "+itemId+" not found",e);
peer.getAsyncRemote().sendText(ConstantsExplorer.DOWNLOAD_WORKSPACE_FOLDER_PROTOCOL_ERROR_NOT_FOUND); peer.getAsyncRemote().sendText(ConstantsExplorer.DOWNLOAD_WORKSPACE_FOLDER_PROTOCOL_ERROR_NOT_FOUND);
return null; return null;
@ -126,7 +116,7 @@ public class DownloadFolderWebSocketServer {
case FOLDER:{ case FOLDER:{
try { try {
File tmpZip = ZipUtil.zipFolder((WorkspaceFolder) item); File tmpZip = ZipUtil.zipFolder((WorkspaceFolder) item);
String tmpSys = System.getProperty("java.io.tmpdir"); String tmpSys = System.getProperty("java.io.tmpdir");
String randomDirName = UUID.randomUUID().toString(); String randomDirName = UUID.randomUUID().toString();
String toReturn = randomDirName + File.separator + item.getName(); String toReturn = randomDirName + File.separator + item.getName();
@ -137,7 +127,7 @@ public class DownloadFolderWebSocketServer {
File toCopy = new File(tmpSys + File.separator + toReturn); File toCopy = new File(tmpSys + File.separator + toReturn);
if (!toCopy.exists()) if (!toCopy.exists())
toCopy.createNewFile(); toCopy.createNewFile();
copyFileUsingFileChannels(tmpZip, toCopy); copyFileUsingFileChannels(tmpZip, toCopy);
_log.info("Zipped folder in="+toCopy.getAbsolutePath() + ", returning="+toReturn); _log.info("Zipped folder in="+toCopy.getAbsolutePath() + ", returning="+toReturn);
tmpZip.deleteOnExit(); tmpZip.deleteOnExit();
return toReturn; return toReturn;
@ -167,6 +157,6 @@ public class DownloadFolderWebSocketServer {
} }
} }