/*
* Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright (C) 2012 -- 2019, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- */
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
+*/
package eu.svjatoslav.meviz.htmlindexer;
+import eu.svjatoslav.meviz.htmlindexer.layouts.Layout;
import eu.svjatoslav.meviz.htmlindexer.layouts.MixedLayout;
-import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
-import java.io.*;
-import java.net.URLEncoder;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
import java.util.HashSet;
import java.util.zip.CRC32;
-public class Utils {
+import static javax.imageio.ImageIO.read;
- private static final String UTF_8 = "UTF-8";
+public class Utils {
private static File lastLoadedFile;
private static BufferedImage lastLoadedBufferedImage;
return lastLoadedBufferedImage;
System.out.println("Loading image: " + file.getPath());
- lastLoadedBufferedImage = ImageIO.read(file);
+ lastLoadedBufferedImage = read(file);
lastLoadedFile = file;
if (lastLoadedBufferedImage == null) {
}
public static HashSet<Layout> getLayouts() {
- final HashSet<Layout> layouts = new HashSet<Layout>();
+ final HashSet<Layout> layouts = new HashSet<>();
layouts.add(new MixedLayout());
return layouts;
}
crc.update(b);
// note use crc.value, not crc.getValue()
- final String hex = Integer.toHexString((int) crc.getValue())
- .toUpperCase();
-
- // System.out.println("Input string: " + input);
- // System.out.println("Result: " + hex);
- return hex;
+ return Integer.toHexString((int) crc.getValue())
+ .toUpperCase();
}
public static File getThumbnailsDirectory(final File directoryToIndex) {
return isMevizFile;
}
+ /**
+ * TODO: URL path component is encoded differently from URL query parameter.
+ * Also some URL encoding might work for HTML on local filesystem, while other
+ * stuff works for web. Things must be cleared up here. Currently they are mixed and
+ * hacked together.
+ */
public static String urlEncode(String string) {
if (string.startsWith("./"))
string = string.substring(2);
- try {
- return URLEncoder.encode(string, UTF_8).replace("+", "%20");
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
+ // TODO: get rid of UrlParamEncoder.
+ return UrlParamEncoder.encode(string);
+ //
+// try {
+// return URLEncoder.encode(string, UTF_8).replace("+", "%20");
+// } catch (UnsupportedEncodingException e) {
+// throw new RuntimeException(e);
+// }
}
}