projects
/
meviz.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dfbc4d8
)
use latest svjatoslavcommons
author
Svjatoslav Agejenko
<svjatoslav@svjatoslav.eu>
Wed, 10 Jun 2015 19:56:14 +0000
(22:56 +0300)
committer
Svjatoslav Agejenko
<svjatoslav@svjatoslav.eu>
Wed, 10 Jun 2015 19:56:14 +0000
(22:56 +0300)
pom.xml
patch
|
blob
|
history
src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
patch
|
blob
|
history
src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java
patch
|
blob
|
history
src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java
patch
|
blob
|
history
src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
patch
|
blob
|
history
diff --git
a/pom.xml
b/pom.xml
index
233913b
..
9886233
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-17,7
+17,7
@@
<dependency>
<groupId>eu.svjatoslav</groupId>
<artifactId>svjatoslavcommons</artifactId>
<dependency>
<groupId>eu.svjatoslav</groupId>
<artifactId>svjatoslavcommons</artifactId>
- <version>1.
4
-SNAPSHOT</version>
+ <version>1.
5
-SNAPSHOT</version>
</dependency>
<dependency>
</dependency>
<dependency>
diff --git
a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
index
061163e
..
d13306c
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
+++ b/
src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
@@
-19,7
+19,6
@@
import java.util.List;
import org.apache.log4j.Logger;
import eu.svjatoslav.commons.file.IOHelper;
import org.apache.log4j.Logger;
import eu.svjatoslav.commons.file.IOHelper;
-import eu.svjatoslav.commons.network.UrlParamEncoder;
import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
import eu.svjatoslav.meviz.htmlindexer.metadata.MetadadaHelper;
import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
import eu.svjatoslav.meviz.htmlindexer.metadata.MetadadaHelper;
@@
-156,7
+155,7
@@
public class FilesystemIndexer extends AbstractIndexer {
desiredDimension.getAwtDimension());
}
return Constants.THUMBNAILS_DIRECTORY_NAME + "/"
desiredDimension.getAwtDimension());
}
return Constants.THUMBNAILS_DIRECTORY_NAME + "/"
- + U
rlParamEncoder.e
ncode(thumbnailFileName);
+ + U
tils.urlE
ncode(thumbnailFileName);
}
public void initializeLayouts() {
}
public void initializeLayouts() {
diff --git
a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java
b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java
index
6200e06
..
4455992
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java
+++ b/
src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java
@@
-15,6
+15,8
@@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.HashSet;
import java.util.zip.CRC32;
import java.util.HashSet;
import java.util.zip.CRC32;
@@
-25,6
+27,7
@@
import eu.svjatoslav.meviz.htmlindexer.layouts.MixedLayout;
public class Utils {
private static File lastLoadedFile;
public class Utils {
private static File lastLoadedFile;
+ private static final String UTF_8 = "UTF-8";
private static BufferedImage lastLoadedBufferedImage;
private static BufferedImage lastLoadedBufferedImage;
@@
-125,4
+128,12
@@
public class Utils {
return isMevizFile;
}
return isMevizFile;
}
+ public static String urlEncode(String string) {
+ try {
+ return URLEncoder.encode(string, UTF_8);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
}
}
diff --git
a/src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java
b/src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java
index
213cfad
..
7cf1d20
100644
(file)
--- a/
src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java
+++ b/
src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java
@@
-9,7
+9,6
@@
import java.net.URL;
import java.net.URLEncoder;
import java.util.List;
import java.net.URLEncoder;
import java.util.List;
-import eu.svjatoslav.commons.network.UrlParamEncoder;
import eu.svjatoslav.meviz.htmlindexer.layouts.MixedLayout;
import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
import eu.svjatoslav.meviz.htmlindexer.layouts.MixedLayout;
import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
@@
-73,7
+72,7
@@
public class WebIndexer extends AbstractIndexer {
final StringBuffer urlStringBuffer = new StringBuffer();
urlStringBuffer.append(globalPrefix);
final StringBuffer urlStringBuffer = new StringBuffer();
urlStringBuffer.append(globalPrefix);
- urlStringBuffer.append(U
rlParamEncoder.e
ncode(requestPath));
+ urlStringBuffer.append(U
tils.urlE
ncode(requestPath));
urlStringBuffer.append("/.thumbnails/metadata_6.dat");
final String urlString = urlStringBuffer.toString();
urlStringBuffer.append("/.thumbnails/metadata_6.dat");
final String urlString = urlStringBuffer.toString();
@@
-131,7
+130,7
@@
public class WebIndexer extends AbstractIndexer {
return context.getGlobalUrl() + context.getLocalUrl() + "/"
+ Constants.THUMBNAILS_DIRECTORY_NAME + "/"
return context.getGlobalUrl() + context.getLocalUrl() + "/"
+ Constants.THUMBNAILS_DIRECTORY_NAME + "/"
- + U
rlParamEncoder.e
ncode(thumbnailFileName);
+ + U
tils.urlE
ncode(thumbnailFileName);
}
}
}
}
diff --git
a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
index
f721ba6
..
cf1285e
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/
src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@
-16,11
+16,11
@@
import java.util.List;
import org.apache.log4j.Logger;
import eu.svjatoslav.commons.file.FilePathParser;
import org.apache.log4j.Logger;
import eu.svjatoslav.commons.file.FilePathParser;
-import eu.svjatoslav.commons.network.UrlParamEncoder;
import eu.svjatoslav.meviz.htmlindexer.AbstractIndexer;
import eu.svjatoslav.meviz.htmlindexer.Constants;
import eu.svjatoslav.meviz.htmlindexer.IndexingContext;
import eu.svjatoslav.meviz.htmlindexer.Layout;
import eu.svjatoslav.meviz.htmlindexer.AbstractIndexer;
import eu.svjatoslav.meviz.htmlindexer.Constants;
import eu.svjatoslav.meviz.htmlindexer.IndexingContext;
import eu.svjatoslav.meviz.htmlindexer.Layout;
+import eu.svjatoslav.meviz.htmlindexer.Utils;
import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.AbstractFile;
import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.AbstractFile;
@@
-64,7
+64,7
@@
public class MixedLayout implements Layout {
filesHtml.append("<div style=\"clear: both;\"><a href=\""
+ indexingContext.getGlobalUrl()
filesHtml.append("<div style=\"clear: both;\"><a href=\""
+ indexingContext.getGlobalUrl()
- + U
rlParamEncoder.e
ncode(indexingContext.getLocalUrl() + "/"
+ + U
tils.urlE
ncode(indexingContext.getLocalUrl() + "/"
+ fullFileName) + "\">" + fullFileName + "</a>\n");
filesHtml.append(" ("
+ FilePathParser.getFileSizeDescription(file.getFileLength())
+ fullFileName) + "\">" + fullFileName + "</a>\n");
filesHtml.append(" ("
+ FilePathParser.getFileSizeDescription(file.getFileLength())
@@
-115,8
+115,9
@@
public class MixedLayout implements Layout {
// clickable image thumbnail
filesHtml.append("<a href=\""
+ indexingContext.getGlobalUrl()
// clickable image thumbnail
filesHtml.append("<a href=\""
+ indexingContext.getGlobalUrl()
- + U
rlParamEncoder.e
ncode(indexingContext.getLocalUrl() + "/"
+ + U
tils.urlE
ncode(indexingContext.getLocalUrl() + "/"
+ picture.fileName) + "\">\n");
+ picture.fileName) + "\">\n");
+
filesHtml.append("<img border=\"0\" src=\""
+ getImageThumbnailUrl(picture) + "\"/></a><br/>\n");
filesHtml.append("<img border=\"0\" src=\""
+ getImageThumbnailUrl(picture) + "\"/></a><br/>\n");
@@
-147,8
+148,8
@@
public class MixedLayout implements Layout {
filesHtml
.append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\""
+ indexingContext.getGlobalUrl()
filesHtml
.append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\""
+ indexingContext.getGlobalUrl()
- + U
rlParamEncoder.encode(indexingContext.getLocalUrl()
- +
"/" +
file.fileName) + "\">\n");
+ + U
tils.urlEncode(indexingContext.getLocalUrl() + "/"
+ + file.fileName) + "\">\n");
filesHtml.append("</source>\n");
filesHtml.append("</video>\n");
filesHtml.append("<br/>\n");
filesHtml.append("</source>\n");
filesHtml.append("</video>\n");
filesHtml.append("<br/>\n");
@@
-163,7
+164,7
@@
public class MixedLayout implements Layout {
// video download link
filesHtml.append("<a href=\""
+ indexingContext.getGlobalUrl()
// video download link
filesHtml.append("<a href=\""
+ indexingContext.getGlobalUrl()
- + U
rlParamEncoder.e
ncode(indexingContext.getLocalUrl() + "/"
+ + U
tils.urlE
ncode(indexingContext.getLocalUrl() + "/"
+ file.fileName) + "\">download as OGV file</a>");
filesHtml.append("</div>\n");
+ file.fileName) + "\">download as OGV file</a>");
filesHtml.append("</div>\n");
@@
-282,7
+283,7
@@
public class MixedLayout implements Layout {
// watchable video
String fileUrl = indexingContext.getGlobalUrl()
// watchable video
String fileUrl = indexingContext.getGlobalUrl()
- + U
rlParamEncoder.e
ncode(indexingContext.getLocalUrl() + "/"
+ + U
tils.urlE
ncode(indexingContext.getLocalUrl() + "/"
+ file.fileName);
filesHtml.append("<video controls>\n");
+ file.fileName);
filesHtml.append("<video controls>\n");
@@
-301,7
+302,7
@@
public class MixedLayout implements Layout {
// video download link
filesHtml.append("<a href=\""
+ indexingContext.getGlobalUrl()
// video download link
filesHtml.append("<a href=\""
+ indexingContext.getGlobalUrl()
- + U
rlParamEncoder.e
ncode(indexingContext.getLocalUrl() + "/"
+ + U
tils.urlE
ncode(indexingContext.getLocalUrl() + "/"
+ file.fileName) + "\">download as WebM file</a>");
filesHtml.append("</div>\n");
+ file.fileName) + "\">download as WebM file</a>");
filesHtml.append("</div>\n");