Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #SC-0 feat:added file name in upload url #901

Open
wants to merge 8 commits into
base: release-2.8.0
Choose a base branch
from
Open

Issue #SC-0 feat:added file name in upload url #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
79667d6
Issue #SC-0 feat:added file name in upload url
Feb 19, 2020
8b088cb
Merge branch 'release-2.8.0' of https://github.com/project-sunbird/su…
Feb 19, 2020
0b6c295
Update .gitmodules
Feb 19, 2020
7eb5983
Update .gitmodules
Feb 19, 2020
91803bb
Issue #SC-0 feat: asda
Feb 19, 2020
a012d81
Merge branch 'devcon-2020' of https://github.com/amit-tarento/sunbird…
Feb 19, 2020
dbd45ee
Issue #SC-0 feat: asda
Feb 19, 2020
6f52e44
Issue #SC-0 feat: logger
Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "actors/sunbird-utils"]
path = actors/sunbird-utils
url = https://github.com/project-sunbird/sunbird-utils.git
branch = release-2.8.0
url = https://github.com/amit-tarento/sunbird-utils.git
branch = devcon-2020
10 changes: 4 additions & 6 deletions ...on/src/main/java/org/sunbird/learner/actors/fileuploadservice/FileUploadServiceActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
import org.sunbird.actor.router.ActorConfig;
import org.sunbird.common.exception.ProjectCommonException;
import org.sunbird.common.models.response.Response;
import org.sunbird.common.models.util.ActorOperations;
import org.sunbird.common.models.util.JsonKey;
import org.sunbird.common.models.util.ProjectLogger;
import org.sunbird.common.models.util.ProjectUtil;
import org.sunbird.common.models.util.*;
import org.sunbird.common.models.util.azure.CloudService;
import org.sunbird.common.models.util.azure.CloudServiceFactory;
import org.sunbird.common.request.Request;
Expand Down Expand Up @@ -47,12 +44,13 @@ private void processFileUpload(Request actorMessage) throws IOException {
fileExtension = split[split.length - 1];
}
}
String fName = "File-" + processId;
fileName = fileName.replace("."+fileExtension,"");
String fName = fileName +"-"+ processId;
if (!StringUtils.isBlank(fileExtension)) {
fName = fName + "." + fileExtension.toLowerCase();
ProjectLogger.log("File - " + fName + " Extension is " + fileExtension);
}

ProjectLogger.log("File name is :: "+fName, LoggerEnum.INFO.name());
File file = new File(fName);
FileOutputStream fos = null;
String avatarUrl = null;
Expand Down