Merge branch 'subtree'

diff --combined src/be/nikiroo/fanfix/Main.java
index 2e8b6d17cdc7dc99b17353df55aefd469ef4a0a8,9d9592eefd3356e9d7c1e61b9e0b5142ab7b2376..9d9592eefd3356e9d7c1e61b9e0b5142ab7b2376
--- 1/src/be/nikiroo/fanfix/Main.java
--- 2/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@@ -126,6 -126,9 +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 --combined src/be/nikiroo/fanfix/supported/BasicSupport.java
index f1635589bfd70b0dca80b5972dcfd241bda895f8,56a3bb80cb6d51fe40a9c4d830e12cb275102d76..56a3bb80cb6d51fe40a9c4d830e12cb275102d76
--- 1/src/be/nikiroo/fanfix/supported/BasicSupport.java
--- 2/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@@ -12,6 -12,7 +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 +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 --combined src/be/nikiroo/fanfix/supported/E621.java
index dc7cb1b3b8b6e468f0a44ecc091dabf6c5f9a6e7,adf8d28c8b2853a01fddc02b239346bec9f28a0e..adf8d28c8b2853a01fddc02b239346bec9f28a0e
--- 1/src/be/nikiroo/fanfix/supported/E621.java
--- 2/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@@ -7,7 -7,6 +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;