From 4d897569def8493a8b279bed8bb0a83a0c572c31 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Tue, 30 Oct 2012 22:27:59 +0530 Subject: added license info to parsers/DocumentDate.java --- parsers/DocumentDate.java | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'parsers') 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: + * + * 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 . + */ + + 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 +} -- cgit v1.2.3 From 1f61844084d9e9383b3be04ff8f60c11eb628075 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Wed, 31 Oct 2012 22:00:35 +0530 Subject: modified: conversion/ConvertDirectory.java (minor edit) index/IndexCreator.java (removed code which (1) creates a index file, if it is not present (2) checks for the existence of index.html) io/WriteFile.java (made the stdout message more verbose) parsers/Header.java ('scruf' footer links to scruf's project page) todo (1 task completed) --- parsers/Header.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'parsers') diff --git a/parsers/Header.java b/parsers/Header.java index eebec5d..5cf2c55 100644 --- a/parsers/Header.java +++ b/parsers/Header.java @@ -55,7 +55,7 @@ public class Header implements Parser { sbuilder.append("\n"); // add "powered by scruf" at bottom of page. sbuilder.append("\n
\n"); - sbuilder.append("powered by scruf"); + sbuilder.append("powered by scruf"); sbuilder.append("\n
\n"); // Close body tag sbuilder.append("\n\n"); -- cgit v1.2.3 From e1804b3d0ef3be3db8be169043c6eae8a98bbc86 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Wed, 31 Oct 2012 23:32:29 +0530 Subject: added: status/ status/DirectoryInfo.java (record the directory 'level' at which scruf is parsing with respect to 'root' directory.) modified: Scruf.java (added a line to start the directory level count at zero) conversion/ConvertDirectory.java (DirectoryInfo.level used to take count of directory 'leve') conversion/ConvertFile.java (lines related to 'footer' things were removed) io/PresentFile.java ( 'footer' & 'backButton' field removed) parsers/BackButton.java (back button placement happens in the parse method itself, instead of doing it in Header.java) (back button is not placed, if the present directory is root directory) parsers/Footer.java (footer placement happens in the parse method itself, instead of doing it in Header.java) parsers/Header.java (back button placement & footer placement removed.) --- parsers/BackButton.java | 30 ++++++++++++++++++------------ parsers/Footer.java | 8 ++++---- parsers/Header.java | 6 ------ 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'parsers') diff --git a/parsers/BackButton.java b/parsers/BackButton.java index 6dd37d1..0bba9b8 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
\n"); - button.append(" home "); - }else { - button.append("./\"> back "); - } - button.append("\n"); - button.append("
\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
\n"); + fileBuilder.append(" back "); + }else { + fileBuilder.append("./\"> back "); + } + fileBuilder.append("\n"); + fileBuilder.append("
\n"); + } + return fileBuilder.toString(); } } diff --git a/parsers/Footer.java b/parsers/Footer.java index 7f079bd..6c1db65 100644 --- a/parsers/Footer.java +++ b/parsers/Footer.java @@ -28,11 +28,11 @@ 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
"+matcher.group(1)+"
\n"; - fileContent = new NullIt().nullIt(fileContent,matcher.group()); + footer = "\n
"+matcher.group(1)+"
\n"; + matcher.appendReplacement(sbuffer,footer); } - - return fileContent; + return sbuffer.toString(); } } diff --git a/parsers/Header.java b/parsers/Header.java index 5cf2c55..3d9b846 100644 --- a/parsers/Header.java +++ b/parsers/Header.java @@ -46,12 +46,6 @@ public class Header implements Parser { sbuilder.append("
\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("
\n"); // add "powered by scruf" at bottom of page. sbuilder.append("\n
\n"); -- cgit v1.2.3 From 14e4df00173c52b6d4932402614e2531eba9abd6 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Thu, 1 Nov 2012 10:07:41 +0530 Subject: added: parsers/QuoteSpecialText.java (new parser to quote special text) modified: parsers/CodeBlocks.java (the regex was made more strict) parsers/Footer.java (fix: appendTail() was added after while()) parsers/ParserList.java (new parser, see above) (parser order changed) todo --- parsers/CodeBlocks.java | 7 +++---- parsers/Footer.java | 1 + parsers/ParserList.java | 3 ++- parsers/QuoteSpecialText.java | 46 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 parsers/QuoteSpecialText.java (limited to 'parsers') 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("
"); - replacement.append(quote(lbreak.parse(matcher.group(2)))); + replacement.append(lbreak.parse(quote(matcher.group(3)))); replacement.append("
"); 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/Footer.java b/parsers/Footer.java index 6c1db65..f8d85ae 100644 --- a/parsers/Footer.java +++ b/parsers/Footer.java @@ -33,6 +33,7 @@ public class Footer implements Parser { footer = "\n
"+matcher.group(1)+"
\n"; matcher.appendReplacement(sbuffer,footer); } + matcher.appendTail(sbuffer); return sbuffer.toString(); } } diff --git a/parsers/ParserList.java b/parsers/ParserList.java index f57a6b8..85e3d17 100644 --- a/parsers/ParserList.java +++ b/parsers/ParserList.java @@ -28,15 +28,16 @@ public class ParserList { public ParserList() { parsers = new ArrayList(); // 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 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: + * + * 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 . + */ + + +package scruf.parsers; + +import java.util.*; +import java.util.regex.*; + +public class QuoteSpecialText implements Parser { + Map qmap; + public QuoteSpecialText() { + qmap = new HashMap(); + qmap.put("&","&"); + qmap.put("<","<"); + qmap.put(">",">"); + } + 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(); + } +} -- cgit v1.2.3 From 090a72358df3f73752d7cbffa78783e459678c0f Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Fri, 2 Nov 2012 00:07:41 +0530 Subject: modified: parsers/Header.java (now the 'scruf' footer links to project's homepage) todo (new things to do) --- parsers/Header.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'parsers') diff --git a/parsers/Header.java b/parsers/Header.java index 3d9b846..902d0c6 100644 --- a/parsers/Header.java +++ b/parsers/Header.java @@ -49,12 +49,11 @@ public class Header implements Parser { sbuilder.append("\n"); // add "powered by scruf" at bottom of page. sbuilder.append("\n
\n"); - sbuilder.append("powered by scruf"); + sbuilder.append("powered by scruf"); sbuilder.append("\n
\n"); // Close body tag sbuilder.append("\n\n"); sbuilder.append("\n"); - return sbuilder.toString(); } -- cgit v1.2.3 From ceed73fa063ffb3b72d21c8a8800122c115acc58 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Sat, 10 Nov 2012 11:29:31 +0530 Subject: marked-up files should have a '.scruffy' extension from now on. This commit is an un-stable commit. It has bugs. removed: io/PresentFile.java (moved to status/PresentFile.java) added: conversion/CreateHtmlFile.java (creates a corresponding '.html' file for a given '.scruffy' marked-up file) (needs some fine-tuning) status/PresentFile.java (see above) modified: conversion/ConvertFile.java (CreatHtmlFile object takes care of producing a corresponding html 'File') conversion/FileSieve.java (regex modified to reflect the '.scruffy' extension) index/IndexCreator.java (edits to reflect the '.scruffy' extension) parsers/BackButton.java (edit to reflect the '.scruffy' extension) parsers/DocumentName.java (edit to reflect the package change for PresentFile class) parsers/Header.java (edit to reflect the package change for PresentFile class) todo (updated todo) --- parsers/BackButton.java | 2 +- parsers/DocumentName.java | 2 +- parsers/Header.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'parsers') diff --git a/parsers/BackButton.java b/parsers/BackButton.java index 0bba9b8..e504648 100644 --- a/parsers/BackButton.java +++ b/parsers/BackButton.java @@ -36,7 +36,7 @@ public class BackButton implements Parser { if(DirectoryInfo.level!=0) { fileBuilder.append("\n
\n"); fileBuilder.append(" back "); }else { fileBuilder.append("./\"> back "); 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/Header.java b/parsers/Header.java index 902d0c6..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 { -- cgit v1.2.3 From 75114f9ba449a3bafd9d4ddb986e50b772c3a237 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Sat, 10 Nov 2012 17:20:42 +0530 Subject: New Parser: Source; Bug-fix for conversion/CanConvert.java & license/Liberate.java. added: parsers/Source.java (New Parser, adds a link to the 'scruffy' source file) modified: conversion/CanConvert.java (bug-fix) conversion/CreateHtmlFile.java (we have two versions of the create() method now) license/Liberate.java (regex fix) parsers/ParserList.java (new parser added, see above) --- parsers/ParserList.java | 1 + parsers/Source.java | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 parsers/Source.java (limited to 'parsers') diff --git a/parsers/ParserList.java b/parsers/ParserList.java index 85e3d17..999dadc 100644 --- a/parsers/ParserList.java +++ b/parsers/ParserList.java @@ -38,6 +38,7 @@ public class ParserList { 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/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: + * + * 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 . + */ + + +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
\n"); + sbuilder.append("\n source \n
"); + return sbuilder.toString(); + } +} -- cgit v1.2.3