eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-15 14:56:41 +00:00
Code Activity

bug4671 Fixed typos and channel usages

Browse Source
This commit is contained in:
Benjamin Barth committed 2018-07-25 11:00:35 +02:00
1 parent 8f8c111c9a
commit 516728a4e7
2 files changed
+11 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/JSDownloadUtils.java
+4 -4
View File
@@ -10,7 +10,7 @@ import com.google.gwt.typedarrays.shared.Int8Array;
*/
public class JSDownloadUtils {
private static final Double REQUIRED_SIZE = 10000000.0;
protected static final Double MAX_MEMORY_USEAGE_FOR_DL = 1024.0 * 1024 * 1024 * 2;
protected static final Double MAX_MEMORY_USAGE_FOR_DL = 1024 * 1024 * 1024 * 2d;
public interface JSDownloadCallback {
void progress(Double current, Double total);
@@ -44,7 +44,7 @@ public class JSDownloadUtils {
getDataFast(url, callback, total, REQUIRED_SIZE);
} else {
//fallback will always work, if cors is supported, does not require any other server configuration
getDataSlow(url, callback, REQUIRED_SIZE, MAX_MEMORY_USEAGE_FOR_DL);
getDataSlow(url, callback, REQUIRED_SIZE, MAX_MEMORY_USAGE_FOR_DL);
}
}
});
@@ -145,14 +145,14 @@ public class JSDownloadUtils {
* If range requests are not possible, the whole file is downloaded and then slices to the required parts
*/
private native static void getDataSlow(String url, JSDownloadCallback callback, Double REQUIRED_SIZE,
Double maxMemoryUseage) /*-{
Double maxMemoryUsage) /*-{
try {
var xhr = new XMLHttpRequest();
xhr.open("GET", url, true);
xhr.responseType = "arraybuffer";
xhr.onprogress = function(evt) {
//ensure not more memory is used by the tab than commonly available in browsers
if (evt.total > maxMemoryUseage || evt.loaded > maxMemoryUseage) {
if (evt.total > maxMemoryUsage || evt.loaded > maxMemoryUsage) {
xhr.abort();
}
callback.@com.sap.sailing.gwt.ui.client.media.JSDownloadUtils.JSDownloadCallback::progress(Ljava/lang/Double;Ljava/lang/Double;)(evt.loaded, evt.total);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/MediaServiceImpl.java
+7 -8
View File
@@ -222,17 +222,16 @@ public class MediaServiceImpl extends RemoteServiceServlet implements MediaServi
private VideoMetadataDTO checkMetadataByFullFileDownload(URL input)
throws ParserConfigurationException, SAXException, IOException {
File tmp = null;
final File tmp = File.createTempFile("upload", "metadataCheck");
try {
tmp = File.createTempFile("upload", "metadataCheck");
ReadableByteChannel rbc = Channels.newChannel(input.openStream());
final ReadableByteChannel rbc = Channels.newChannel(input.openStream());
try (FileOutputStream fos = new FileOutputStream(tmp)) {
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
try (IsoFile isof = new IsoFile(Channels.newChannel(input.openStream()))) {
boolean canDownload = true;
Date recordStartedTimer = determineRecordingStart(isof);
Duration duration = determineDuration(isof);
boolean spherical = determine360(isof);
try (IsoFile isof = new IsoFile(tmp)) {
final boolean canDownload = true;
final Date recordStartedTimer = determineRecordingStart(isof);
final Duration duration = determineDuration(isof);
final boolean spherical = determine360(isof);
removeTempFiles(isof);
return new VideoMetadataDTO(canDownload, duration, spherical, recordStartedTimer, "");
}