Add more warnings source to 1.6) and fix warnings
[nikiroo-utils.git] / src / be / nikiroo / fanfix / supported / Text.java
index 2dd052470278886f30b715f541ca571d7967ae50..c9ebd18d108ddac863b5182c9554033fe2e78f6e 100644 (file)
@@ -14,6 +14,7 @@ import java.util.Scanner;
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.utils.Progress;
 
 /**
  * Support class for local stories encoded in textual format, with a few rules:
@@ -56,7 +57,7 @@ class Text extends BasicSupport {
                meta.setPublisher("");
                meta.setUuid(source.toString());
                meta.setLuid("");
-               meta.setLang(getLang(source, reset(in))); // default is EN
+               meta.setLang(getLang(reset(in))); // default is EN
                meta.setSubject(getSubject(source));
                meta.setType(getType().toString());
                meta.setImageDocument(false);
@@ -76,7 +77,7 @@ class Text extends BasicSupport {
 
        }
 
-       private String getLang(URL source, InputStream in) throws IOException {
+       private String getLang(InputStream in) {
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");
                scan.useDelimiter("\\n");
@@ -87,7 +88,12 @@ class Text extends BasicSupport {
                        chapter0 = scan.next();
                }
 
-               String lang = detectChapter(chapter0);
+               String lang = detectChapter(chapter0, 0);
+               if (lang == null) {
+                       // No description??
+                       lang = detectChapter(chapter0, 1);
+               }
+
                if (lang == null) {
                        lang = "EN";
                } else {
@@ -97,14 +103,14 @@ class Text extends BasicSupport {
                return lang;
        }
 
-       private String getTitle(InputStream in) throws IOException {
+       private String getTitle(InputStream in) {
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");
                scan.useDelimiter("\\n");
                return scan.next();
        }
 
-       private String getAuthor(InputStream in) throws IOException {
+       private String getAuthor(InputStream in) {
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");
                scan.useDelimiter("\\n");
@@ -120,7 +126,7 @@ class Text extends BasicSupport {
                return fixAuthor(author);
        }
 
-       private String getDate(InputStream in) throws IOException {
+       private String getDate(InputStream in) {
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");
                scan.useDelimiter("\\n");
@@ -142,10 +148,10 @@ class Text extends BasicSupport {
 
        @Override
        protected String getDesc(URL source, InputStream in) throws IOException {
-               return getChapterContent(source, in, 0);
+               return getChapterContent(source, in, 0, null);
        }
 
-       private BufferedImage getCover(URL source) throws IOException {
+       private BufferedImage getCover(URL source) {
                String path;
                try {
                        path = new File(source.toURI()).getPath();
@@ -164,41 +170,39 @@ class Text extends BasicSupport {
        }
 
        @Override
-       protected List<Entry<String, URL>> getChapters(URL source, InputStream in)
-                       throws IOException {
+       protected List<Entry<String, URL>> getChapters(URL source, InputStream in,
+                       Progress pg) throws IOException {
                List<Entry<String, URL>> chaps = new ArrayList<Entry<String, URL>>();
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");
                scan.useDelimiter("\\n");
-               boolean descSkipped = false;
                boolean prevLineEmpty = false;
                while (scan.hasNext()) {
                        String line = scan.next();
-                       if (prevLineEmpty && detectChapter(line) != null) {
-                               if (descSkipped) {
-                                       String chapName = Integer.toString(chaps.size());
-                                       int pos = line.indexOf(':');
-                                       if (pos >= 0 && pos + 1 < line.length()) {
-                                               chapName = line.substring(pos + 1).trim();
+                       if (prevLineEmpty && detectChapter(line, chaps.size() + 1) != null) {
+                               String chapName = Integer.toString(chaps.size() + 1);
+                               int pos = line.indexOf(':');
+                               if (pos >= 0 && pos + 1 < line.length()) {
+                                       chapName = line.substring(pos + 1).trim();
+                               }
+                               final URL value = source;
+                               final String key = chapName;
+                               chaps.add(new Entry<String, URL>() {
+                                       @Override
+                                       public URL setValue(URL value) {
+                                               return null;
                                        }
-                                       final URL value = source;
-                                       final String key = chapName;
-                                       chaps.add(new Entry<String, URL>() {
-                                               public URL setValue(URL value) {
-                                                       return null;
-                                               }
 
-                                               public URL getValue() {
-                                                       return value;
-                                               }
+                                       @Override
+                                       public URL getValue() {
+                                               return value;
+                                       }
 
-                                               public String getKey() {
-                                                       return key;
-                                               }
-                                       });
-                               } else {
-                                       descSkipped = true;
-                               }
+                                       @Override
+                                       public String getKey() {
+                                               return key;
+                                       }
+                               });
                        }
 
                        prevLineEmpty = line.trim().isEmpty();
@@ -208,8 +212,8 @@ class Text extends BasicSupport {
        }
 
        @Override
-       protected String getChapterContent(URL source, InputStream in, int number)
-                       throws IOException {
+       protected String getChapterContent(URL source, InputStream in, int number,
+                       Progress pg) throws IOException {
                StringBuilder builder = new StringBuilder();
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");
@@ -219,7 +223,7 @@ class Text extends BasicSupport {
                        String line = scan.next();
                        if (detectChapter(line, number) != null) {
                                inChap = true;
-                       } else if (inChap && detectChapter(line) != null) {
+                       } else if (inChap && detectChapter(line, number + 1) != null) {
                                break;
                        } else if (inChap) {
                                builder.append(line);
@@ -248,19 +252,6 @@ class Text extends BasicSupport {
                return false;
        }
 
-       /**
-        * Check if the given line looks like a starting chapter in a supported
-        * language, and return the language if it does (or NULL if not).
-        * 
-        * @param line
-        *            the line to check
-        * 
-        * @return the language or NULL
-        */
-       private String detectChapter(String line) {
-               return detectChapter(line, null);
-       }
-
        /**
         * Check if the given line looks like the given starting chapter in a
         * supported language, and return the language if it does (or NULL if not).
@@ -270,7 +261,7 @@ class Text extends BasicSupport {
         * 
         * @return the language or NULL
         */
-       private String detectChapter(String line, Integer number) {
+       private String detectChapter(String line, int number) {
                line = line.toUpperCase();
                for (String lang : Instance.getConfig().getString(Config.CHAPTER)
                                .split(",")) {
@@ -279,19 +270,16 @@ class Text extends BasicSupport {
                        if (chapter != null && !chapter.isEmpty()) {
                                chapter = chapter.toUpperCase() + " ";
                                if (line.startsWith(chapter)) {
-                                       if (number != null) {
-                                               // We want "[CHAPTER] [number]: [name]", with ": [name]"
-                                               // optional
-                                               String test = line.substring(chapter.length()).trim();
-                                               if (test.startsWith(Integer.toString(number))) {
-                                                       test = test.substring(
-                                                                       Integer.toString(number).length()).trim();
-                                                       if (test.isEmpty() || test.startsWith(":")) {
-                                                               return lang;
-                                                       }
+                                       // We want "[CHAPTER] [number]: [name]", with ": [name]"
+                                       // optional
+                                       String test = line.substring(chapter.length()).trim();
+                                       if (test.startsWith(Integer.toString(number))) {
+                                               test = test
+                                                               .substring(Integer.toString(number).length())
+                                                               .trim();
+                                               if (test.isEmpty() || test.startsWith(":")) {
+                                                       return lang;
                                                }
-                                       } else {
-                                               return lang;
                                        }
                                }
                        }