summaryrefslogtreecommitdiffstats
path: root/parsers
diff options
context:
space:
mode:
Diffstat (limited to 'parsers')
-rw-r--r--parsers/BackButton.java30
-rw-r--r--parsers/CodeBlocks.java7
-rw-r--r--parsers/DocumentDate.java23
-rw-r--r--parsers/DocumentName.java2
-rw-r--r--parsers/Footer.java9
-rw-r--r--parsers/Header.java11
-rw-r--r--parsers/ParserList.java4
-rw-r--r--parsers/QuoteSpecialText.java46
-rw-r--r--parsers/Source.java36
9 files changed, 136 insertions, 32 deletions
diff --git a/parsers/BackButton.java b/parsers/BackButton.java
index 6dd37d1..e504648 100644
--- a/parsers/BackButton.java
+++ b/parsers/BackButton.java
@@ -23,21 +23,27 @@ package scruf.parsers;
import java.io.*;
import scruf.io.*;
+import scruf.status.*;
public class BackButton implements Parser {
// this method doesn't modify the filContent.
public String parse(String fileContent) {
- StringBuilder button = new StringBuilder();
- button.append("\n<div class=\"back\">\n");
- button.append("<a href=\"");
- if(PresentFile.file.getName().equals("index")) {
- button.append("../\"> home ");
- }else {
- button.append("./\"> back ");
- }
- button.append("</a>\n");
- button.append("</div>\n");
- PresentFile.backButton = button.toString();
- return fileContent;
+ StringBuilder fileBuilder = new StringBuilder(fileContent);
+ /**
+ * Back button is added only if the present directory being
+ * parsed is not 'root'.
+ */
+ if(DirectoryInfo.level!=0) {
+ fileBuilder.append("\n<div class=\"back\">\n");
+ fileBuilder.append("<a href=\"");
+ if(PresentFile.file.getName().equals("index.scruffy")) {
+ fileBuilder.append("../\"> back ");
+ }else {
+ fileBuilder.append("./\"> back ");
+ }
+ fileBuilder.append("</a>\n");
+ fileBuilder.append("</div>\n");
+ }
+ return fileBuilder.toString();
}
}
diff --git a/parsers/CodeBlocks.java b/parsers/CodeBlocks.java
index 2c47099..64e8841 100644
--- a/parsers/CodeBlocks.java
+++ b/parsers/CodeBlocks.java
@@ -25,7 +25,7 @@ import java.util.regex.*;
public class CodeBlocks implements Parser {
public String parse(String fileContent) {
- Pattern pattern = Pattern.compile("(\\#\\#\\#)(.+?)(\\1)",
+ Pattern pattern = Pattern.compile("(\\#\\#\\#)(\\n+)(.+?)(\\n+)(\\1)",
Pattern.DOTALL);
Matcher matcher = pattern.matcher(fileContent);
LineBreak lbreak = new LineBreak();
@@ -34,7 +34,7 @@ public class CodeBlocks implements Parser {
while(matcher.find()) {
replacement.delete(0,replacement.length());
replacement.append("<div class=\"code\">");
- replacement.append(quote(lbreak.parse(matcher.group(2))));
+ replacement.append(lbreak.parse(quote(matcher.group(3))));
replacement.append("</div>");
matcher.appendReplacement(sbuffer,replacement.toString());
}
@@ -53,9 +53,8 @@ public class CodeBlocks implements Parser {
StringBuffer sbuffer = new StringBuffer();
String rep;
while(matcher.find()) {
- rep = "\\\\\\"+matcher.group();
+ rep = "\\\\\\"+matcher.group();
matcher.appendReplacement(sbuffer,rep);
-
}
matcher.appendTail(sbuffer);
return sbuffer.toString();
diff --git a/parsers/DocumentDate.java b/parsers/DocumentDate.java
index 717fe25..7b66caa 100644
--- a/parsers/DocumentDate.java
+++ b/parsers/DocumentDate.java
@@ -1,3 +1,24 @@
+/*+
+ * Copyright 2012 rsiddharth
+ * Email: <rsiddharth@ninthfloor.org>
+ *
+ * This file is part of Scruf.
+ *
+ * Scruf is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
package scruf.parsers;
import java.util.regex.*;
@@ -14,4 +35,4 @@ public class DocumentDate implements Parser {
matcher.appendTail(sbuffer);
return sbuffer.toString();
}
-} \ No newline at end of file
+}
diff --git a/parsers/DocumentName.java b/parsers/DocumentName.java
index 09eaf22..032d7c0 100644
--- a/parsers/DocumentName.java
+++ b/parsers/DocumentName.java
@@ -22,7 +22,7 @@
package scruf.parsers;
import java.io.*;
-import scruf.io.*;
+import scruf.status.*;
public class DocumentName implements Parser {
public String parse(String fileContent) {
diff --git a/parsers/Footer.java b/parsers/Footer.java
index 7f079bd..f8d85ae 100644
--- a/parsers/Footer.java
+++ b/parsers/Footer.java
@@ -28,11 +28,12 @@ public class Footer implements Parser {
Pattern pattern = Pattern.compile("\\-{70}\\n(.+)\\n\\-{70}");
Matcher matcher = pattern.matcher(fileContent);
StringBuffer sbuffer = new StringBuffer();
+ String footer=null;
while(matcher.find()) {
- PresentFile.footer = "\n<footer>"+matcher.group(1)+"</footer>\n";
- fileContent = new NullIt().nullIt(fileContent,matcher.group());
+ footer = "\n<footer>"+matcher.group(1)+"</footer>\n";
+ matcher.appendReplacement(sbuffer,footer);
}
-
- return fileContent;
+ matcher.appendTail(sbuffer);
+ return sbuffer.toString();
}
}
diff --git a/parsers/Header.java b/parsers/Header.java
index eebec5d..50575c1 100644
--- a/parsers/Header.java
+++ b/parsers/Header.java
@@ -21,7 +21,7 @@
package scruf.parsers;
-import scruf.io.*;
+import scruf.status.*;
public class Header implements Parser {
@@ -46,21 +46,14 @@ public class Header implements Parser {
sbuilder.append("<article>\n");
// insert File Content.
sbuilder.append(fileContent);
- // add footer if footer is available.
- if(PresentFile.footer!=null) {
- sbuilder.append(PresentFile.footer);
- }
- // insert back button.
- sbuilder.append(PresentFile.backButton);
sbuilder.append("</article>\n");
// add "powered by scruf" at bottom of page.
sbuilder.append("\n<div class=\"scruf\">\n");
- sbuilder.append("<a href=\"/scruf/\">powered by scruf</a>");
+ sbuilder.append("<a href=\"http://nongnu.org/scruf/\">powered by scruf</a>");
sbuilder.append("\n</div>\n");
// Close body tag
sbuilder.append("\n</body>\n");
sbuilder.append("</html>\n");
-
return sbuilder.toString();
}
diff --git a/parsers/ParserList.java b/parsers/ParserList.java
index f57a6b8..999dadc 100644
--- a/parsers/ParserList.java
+++ b/parsers/ParserList.java
@@ -28,15 +28,17 @@ public class ParserList {
public ParserList() {
parsers = new ArrayList<Parser>();
// add Parsers. NOTE: parser order is significant.
+ parsers.add(new QuoteSpecialText());
parsers.add(new DocumentName());
parsers.add(new DocumentDate());
parsers.add(new WordDecoration());
parsers.add(new CodeBlocks());
parsers.add(new Headings());
- parsers.add(new Paragraphs());
parsers.add(new Links());
parsers.add(new Images());
parsers.add(new Footer());
+ parsers.add(new Paragraphs());
+ parsers.add(new Source());
parsers.add(new BackButton());
parsers.add(new Header());
}
diff --git a/parsers/QuoteSpecialText.java b/parsers/QuoteSpecialText.java
new file mode 100644
index 0000000..165ffa9
--- /dev/null
+++ b/parsers/QuoteSpecialText.java
@@ -0,0 +1,46 @@
+/*+
+ * Copyright 2012 rsiddharth
+ * Email: <rsiddharth@ninthfloor.org>
+ *
+ * This file is part of Scruf.
+ *
+ * Scruf is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+package scruf.parsers;
+
+import java.util.*;
+import java.util.regex.*;
+
+public class QuoteSpecialText implements Parser {
+ Map<String,String> qmap;
+ public QuoteSpecialText() {
+ qmap = new HashMap<String,String>();
+ qmap.put("&","&amp;");
+ qmap.put("<","&lt;");
+ qmap.put(">","&gt;");
+ }
+ public String parse(String fileContent) {
+ Pattern pattern = Pattern.compile("(\\&)|(\\<)|(\\>)");
+ Matcher matcher = pattern.matcher(fileContent);
+ StringBuffer sbuffer = new StringBuffer();
+ while(matcher.find()) {
+ matcher.appendReplacement(sbuffer,
+ qmap.get(matcher.group()));
+ }
+ matcher.appendTail(sbuffer);
+ return sbuffer.toString();
+ }
+}
diff --git a/parsers/Source.java b/parsers/Source.java
new file mode 100644
index 0000000..4dbe303
--- /dev/null
+++ b/parsers/Source.java
@@ -0,0 +1,36 @@
+/*+
+ * Copyright 2012 rsiddharth
+ * Email: <rsiddharth@ninthfloor.org>
+ *
+ * This file is part of Scruf.
+ *
+ * Scruf is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+package scruf.parsers;
+
+import scruf.status.*;
+
+public class Source implements Parser {
+ private StringBuilder sbuilder;
+ public String parse(String fileContent) {
+ sbuilder = new StringBuilder(fileContent);
+ // append a link to the source.
+ sbuilder.append("\n <div class=\"source\"> \n");
+ sbuilder.append("\n <a href=\"./"+PresentFile.file.getName()+
+ "\">source</a> \n </div>");
+ return sbuilder.toString();
+ }
+}
siddharth ravikumar snafu