From: Niki Roo <niki@nikiroo.be>
Date: Wed, 6 May 2020 15:25:53 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=868e32295fb975158cb8456cb559e79924b73151;hp=509c7ce173c9d2f607cca22799d66ddb24a9aa29

Merge branch 'subtree'
---

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 2e8b6d1..9d9592e 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -126,6 +126,9 @@ public class Main {
 
 		int exitCode = 0;
 		for (int i = 0; exitCode == 0 && i < args.length; i++) {
+			if (args[i] == null)
+				continue;
+
 			// Action (--) handling:
 			if (!noMoreActions && args[i].startsWith("--")) {
 				if (args[i].equals("--")) {
diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index f163558..56a3bb8 100644
--- a/src/be/nikiroo/fanfix/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@ -12,6 +12,7 @@ import java.util.Map;
 import java.util.Scanner;
 import java.util.Map.Entry;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.jsoup.helper.DataUtil;
 import org.jsoup.nodes.Document;
@@ -347,6 +348,8 @@ public abstract class BasicSupport {
 			scan.useDelimiter("\0");
 			try {
 				return new JSONObject(scan.next());
+			} catch (JSONException e) {
+				throw new IOException(e);
 			} finally {
 				scan.close();
 			}
diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java
index dc7cb1b..adf8d28 100644
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@ -7,7 +7,6 @@ import java.net.URL;
 import java.net.URLDecoder;
 import java.util.AbstractMap;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;