X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FBasicSupport.java;h=471147ea0548ede456aa66e01a6337c9ae4ef1ef;hp=0ee12fec463cef8b1c6dd31093ad2401c9ef4587;hb=27dc71793c8d76712f01cc6fdef75195bb22483a;hpb=e8eeea0a321493d270c35f594a8bf392cc95f4df

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index 0ee12fe..471147e 100644
--- a/src/be/nikiroo/fanfix/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@ -62,6 +62,8 @@ public abstract class BasicSupport {
 		E621,
 		/** Furry website with stories */
 		YIFFSTAR,
+		/** Comics and images groups, mostly but not only NSFW */
+		E_HENTAI,
 		/** CBZ files */
 		CBZ,
 		/** HTML files */
@@ -874,19 +876,35 @@ public abstract class BasicSupport {
 
 		if (line != null) {
 			// try for files
-			String path = null;
 			if (source != null) {
-				path = new File(source.getFile()).getParent();
 				try {
-					String basePath = new File(new File(path), line.trim())
-							.getAbsolutePath();
+
+					String relPath = null;
+					String absPath = null;
+					try {
+						String path = new File(source.getFile()).getParent();
+						relPath = new File(new File(path), line.trim())
+								.getAbsolutePath();
+					} catch (Exception e) {
+						// Cannot be converted to path (one possibility to take
+						// into account: absolute path on Windows)
+					}
+					try {
+						absPath = new File(line.trim()).getAbsolutePath();
+					} catch (Exception e) {
+						// Cannot be converted to path (at all)
+					}
+
 					for (String ext : getImageExt(true)) {
-						if (new File(basePath + ext).exists()) {
-							url = new File(basePath + ext).toURI().toURL();
+						if (absPath != null && new File(absPath + ext).exists()) {
+							url = new File(absPath + ext).toURI().toURL();
+						} else if (relPath != null
+								&& new File(relPath + ext).exists()) {
+							url = new File(relPath + ext).toURI().toURL();
 						}
 					}
 				} catch (Exception e) {
-					// Nothing to do here
+					// Should not happen since we control the correct arguments
 				}
 			}
 
@@ -1373,6 +1391,8 @@ public abstract class BasicSupport {
 			return new E621().setType(type);
 		case YIFFSTAR:
 			return new YiffStar().setType(type);
+		case E_HENTAI:
+			return new EHentai().setType(type);
 		case CBZ:
 			return new Cbz().setType(type);
 		case HTML:
@@ -1463,4 +1483,48 @@ public abstract class BasicSupport {
 
 		return rep;
 	}
+
+	/**
+	 * Return the text between the key and the endKey (and optional subKey can
+	 * be passed, in this case we will look for the key first, then take the
+	 * text between the subKey and the endKey).
+	 * <p>
+	 * Will only match the first line with the given key if more than one are
+	 * possible. Which also means that if the subKey or endKey is not found on
+	 * that line, NULL will be returned.
+	 * 
+	 * @param in
+	 *            the input
+	 * @param key
+	 *            the key to match (also supports "^" at start to say
+	 *            "only if it starts with" the key)
+	 * @param subKey
+	 *            the sub key or NULL if none
+	 * @param endKey
+	 *            the end key or NULL for "up to the end"
+	 * @return the text or NULL if not found
+	 */
+	static String getKeyLine(InputStream in, String key, String subKey,
+			String endKey) {
+		String result = null;
+
+		String line = getLine(in, key, 0);
+		if (line != null && line.contains(key)) {
+			line = line.substring(line.indexOf(key) + key.length());
+			if (subKey == null || subKey.isEmpty() || line.contains(subKey)) {
+				if (subKey != null) {
+					line = line.substring(line.indexOf(subKey)
+							+ subKey.length());
+				}
+				if (endKey == null || line.contains(endKey)) {
+					if (endKey != null) {
+						line = line.substring(0, line.indexOf(endKey));
+						result = line;
+					}
+				}
+			}
+		}
+
+		return result;
+	}
 }