0.3

KursX · Aug 3, 2017 · 27abd35 · 27abd35
1 parent f62ce46
commit 27abd35
Show file tree

Hide file tree

Showing 36 changed files with 101 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,16 @@
 *.class
 *.iml
 .idea/
+out/*
+*.fb2
+
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
 *.ear
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+hs_err_pid*
diff --git a/src/Main.java → Main.java b/src/Main.java → Main.java
diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
-# fb2parser 
-## Easy parser fb2 files into java objects 
+# Fb2 parser
+## Simple parser of book format fb2 in java objects
 
-download jar/fb2parser.jar 
+Download [Fb2Parser.jar](https://github.com/KursX/fb2parser/raw/master/jar/fb2parser.jar)
 
 Using: 
 
 ```java
 try {
-	FictionBook fb2 = new FictionBook(new File("book.fb2"));
+    FictionBook fb2 = new FictionBook(new File("book.fb2"));
 } catch (ParserConfigurationException | IOException | SAXException e) {
 	e.printStackTrace();
 }

diff --git a/src/com/kursx/parser/fb2/Annotation.java → com/kursx/parser/fb2/Annotation.java b/src/com/kursx/parser/fb2/Annotation.java → com/kursx/parser/fb2/Annotation.java
diff --git a/src/com/kursx/parser/fb2/Author.java → com/kursx/parser/fb2/Author.java b/src/com/kursx/parser/fb2/Author.java → com/kursx/parser/fb2/Author.java
diff --git a/src/com/kursx/parser/fb2/Binary.java → com/kursx/parser/fb2/Binary.java b/src/com/kursx/parser/fb2/Binary.java → com/kursx/parser/fb2/Binary.java
diff --git a/src/com/kursx/parser/fb2/Body.java → com/kursx/parser/fb2/Body.java b/src/com/kursx/parser/fb2/Body.java → com/kursx/parser/fb2/Body.java
diff --git a/src/com/kursx/parser/fb2/CustomInfo.java → com/kursx/parser/fb2/CustomInfo.java b/src/com/kursx/parser/fb2/CustomInfo.java → com/kursx/parser/fb2/CustomInfo.java
diff --git a/src/com/kursx/parser/fb2/Date.java → com/kursx/parser/fb2/Date.java b/src/com/kursx/parser/fb2/Date.java → com/kursx/parser/fb2/Date.java
diff --git a/src/com/kursx/parser/fb2/Description.java → com/kursx/parser/fb2/Description.java b/src/com/kursx/parser/fb2/Description.java → com/kursx/parser/fb2/Description.java
diff --git a/src/com/kursx/parser/fb2/DocumentInfo.java → com/kursx/parser/fb2/DocumentInfo.java b/src/com/kursx/parser/fb2/DocumentInfo.java → com/kursx/parser/fb2/DocumentInfo.java
diff --git a/com/kursx/parser/fb2/EmptyLine.java b/com/kursx/parser/fb2/EmptyLine.java
@@ -0,0 +1,8 @@
+package com.kursx.parser.fb2;
+
+public class EmptyLine extends P {
+
+    public EmptyLine() {
+        p = "";
+    }
+}
diff --git a/src/com/kursx/parser/fb2/Epigraph.java → com/kursx/parser/fb2/Epigraph.java b/src/com/kursx/parser/fb2/Epigraph.java → com/kursx/parser/fb2/Epigraph.java
diff --git a/src/com/kursx/parser/fb2/FictionBook.java → com/kursx/parser/fb2/FictionBook.java b/src/com/kursx/parser/fb2/FictionBook.java → com/kursx/parser/fb2/FictionBook.java
@@ -25,16 +25,20 @@ public class FictionBook {
     protected List<Body> bodies = new ArrayList<>();
     protected Map<String, Binary> binaries = new HashMap<>();
 
-    public FictionBook() {
-    }
+    public FictionBook() {}
 
-    public FictionBook(File file) throws ParserConfigurationException, IOException, SAXException {
+    public FictionBook(File file) throws ParserConfigurationException, IOException, SAXException, OutOfMemoryError {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         DocumentBuilder db = dbf.newDocumentBuilder();
         InputStream inputStream = new FileInputStream(file);
         BufferedReader br = new BufferedReader(new FileReader(file));
-        String line = br.readLine();
-        String encoding = line.substring(line.indexOf("encoding=\"") + 10, line.length() - 3);
+        String encoding = "utf-8";
+        try {
+            String line = br.readLine();
+            encoding = line.substring(line.indexOf("encoding=\"") + 10, line.indexOf("\"?>"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         Document doc = db.parse(new InputSource(new InputStreamReader(inputStream, encoding)));
         initXmlns(doc);
         description = new Description(doc);

diff --git a/com/kursx/parser/fb2/Gson.java b/com/kursx/parser/fb2/Gson.java
@@ -0,0 +1,7 @@
+package com.kursx.parser.fb2;
+
+/**
+ * Created by kurs on 30.7.17.
+ */
+public class Gson {
+}
diff --git a/src/com/kursx/parser/fb2/History.java → com/kursx/parser/fb2/History.java b/src/com/kursx/parser/fb2/History.java → com/kursx/parser/fb2/History.java
diff --git a/src/com/kursx/parser/fb2/Image.java → com/kursx/parser/fb2/Image.java b/src/com/kursx/parser/fb2/Image.java → com/kursx/parser/fb2/Image.java
diff --git a/src/com/kursx/parser/fb2/P.java → com/kursx/parser/fb2/P.java b/src/com/kursx/parser/fb2/P.java → com/kursx/parser/fb2/P.java
@@ -1,5 +1,8 @@
 package com.kursx.parser.fb2;
 
+import com.kursx.parser.fb2.fonts.Emphasis;
+import com.kursx.parser.fb2.fonts.StrikeThrough;
+import com.kursx.parser.fb2.fonts.Strong;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -9,11 +12,13 @@
 public class P {
 
     protected String p;
-    protected List<Image> images = new ArrayList<>();
-//    TODO <empty-line/>
-//    Жирный - <strong>, а курсивный - <emphasis>
+
+    protected List<Image> images;
+    protected List<Emphasis> emphasis;
+    protected List<Strong> strong;
+    protected List<StrikeThrough> strikeThrough;
+//    TODO
 //    Для нижних индексов <sub>, а для верхних индексов <sup>
-//    Перечеркнутый - <strikethrough>
 //    Программный код - <code>
 //    <subtitle>* * *</subtitle>
 
@@ -28,19 +33,31 @@ public P() {
     }
 
     public P(Image image) {
+        if (images == null) images = new ArrayList<>();
         images.add(image);
     }
 
     public P(Node p) {
+        this.p = p.getTextContent();
         NodeList nodeList = p.getChildNodes();
         for (int index = 0; index < nodeList.getLength(); index++) {
             Node node = nodeList.item(index);
             switch (nodeList.item(index).getNodeName()) {
                 case "image":
+                    if (images == null) images = new ArrayList<>();
                     images.add(new Image(node));
                     break;
-                case "#text":
-                    this.p = p.getTextContent();
+                case "strikethrough":
+                    if (strikeThrough == null) strikeThrough = new ArrayList<>();
+                    strikeThrough.add(new StrikeThrough(node.getTextContent(), p.getTextContent()));
+                    break;
+                case "strong":
+                    if (strong == null) strong = new ArrayList<>();
+                    strong.add(new Strong(node.getTextContent(), p.getTextContent()));
+                    break;
+                case "emphasis":
+                    if (emphasis == null) emphasis = new ArrayList<>();
+                    emphasis.add(new Emphasis(node.getTextContent(), p.getTextContent()));
                     break;
             }
         }

diff --git a/src/com/kursx/parser/fb2/Poem.java → com/kursx/parser/fb2/Poem.java b/src/com/kursx/parser/fb2/Poem.java → com/kursx/parser/fb2/Poem.java
diff --git a/src/com/kursx/parser/fb2/PublishInfo.java → com/kursx/parser/fb2/PublishInfo.java b/src/com/kursx/parser/fb2/PublishInfo.java → com/kursx/parser/fb2/PublishInfo.java
diff --git a/src/com/kursx/parser/fb2/Section.java → com/kursx/parser/fb2/Section.java b/src/com/kursx/parser/fb2/Section.java → com/kursx/parser/fb2/Section.java
@@ -55,6 +55,9 @@ public Section() {
                 case "p":
                     paragraphs.add(new P(node));
                     break;
+                case "empty-line":
+                    paragraphs.add(new EmptyLine());
+                    break;
             }
         }
     }

diff --git a/src/com/kursx/parser/fb2/Sequence.java → com/kursx/parser/fb2/Sequence.java b/src/com/kursx/parser/fb2/Sequence.java → com/kursx/parser/fb2/Sequence.java
diff --git a/src/com/kursx/parser/fb2/SrcTitleInfo.java → com/kursx/parser/fb2/SrcTitleInfo.java b/src/com/kursx/parser/fb2/SrcTitleInfo.java → com/kursx/parser/fb2/SrcTitleInfo.java
diff --git a/src/com/kursx/parser/fb2/Table.java → com/kursx/parser/fb2/Table.java b/src/com/kursx/parser/fb2/Table.java → com/kursx/parser/fb2/Table.java
diff --git a/src/com/kursx/parser/fb2/Title.java → com/kursx/parser/fb2/Title.java b/src/com/kursx/parser/fb2/Title.java → com/kursx/parser/fb2/Title.java
diff --git a/src/com/kursx/parser/fb2/TitleInfo.java → com/kursx/parser/fb2/TitleInfo.java b/src/com/kursx/parser/fb2/TitleInfo.java → com/kursx/parser/fb2/TitleInfo.java
diff --git a/src/com/kursx/parser/fb2/Xmlns.java → com/kursx/parser/fb2/Xmlns.java b/src/com/kursx/parser/fb2/Xmlns.java → com/kursx/parser/fb2/Xmlns.java
diff --git a/com/kursx/parser/fb2/fonts/Emphasis.java b/com/kursx/parser/fb2/fonts/Emphasis.java
@@ -0,0 +1,8 @@
+package com.kursx.parser.fb2.fonts;
+
+public class Emphasis extends Font {
+
+    public Emphasis(String emphasis, String p) {
+        super(emphasis, p);
+    }
+}
diff --git a/com/kursx/parser/fb2/fonts/Font.java b/com/kursx/parser/fb2/fonts/Font.java
@@ -0,0 +1,19 @@
+package com.kursx.parser.fb2.fonts;
+
+public class Font {
+
+    protected final int startIndex, finishIndex;
+
+    protected Font(String emphasis, String p) {
+        startIndex = p.indexOf(emphasis);
+        finishIndex = startIndex + emphasis.length();
+    }
+
+    public int getStartIndex() {
+        return startIndex;
+    }
+
+    public int getFinishIndex() {
+        return finishIndex;
+    }
+}
diff --git a/com/kursx/parser/fb2/fonts/StrikeThrough.java b/com/kursx/parser/fb2/fonts/StrikeThrough.java
@@ -0,0 +1,8 @@
+package com.kursx.parser.fb2.fonts;
+
+public class StrikeThrough extends Font {
+
+    public StrikeThrough(String strong, String p) {
+        super(strong, p);
+    }
+}
diff --git a/com/kursx/parser/fb2/fonts/Strong.java b/com/kursx/parser/fb2/fonts/Strong.java
@@ -0,0 +1,8 @@
+package com.kursx.parser.fb2.fonts;
+
+public class Strong extends Font {
+
+    public Strong(String strong, String p) {
+        super(strong, p);
+    }
+}
diff --git a/jar/fb2parser.jar b/jar/fb2parser.jar
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
diff --git a/src/file.fb2 b/src/file.fb2
diff --git a/src/out/production/fb2parser/META-INF/MANIFEST.MF b/src/out/production/fb2parser/META-INF/MANIFEST.MF
diff --git a/src/out/production/fb2parser/file.fb2 b/src/out/production/fb2parser/file.fb2