From a3e705a134fd9bf8750cd56bc22ad53862f3e12a Mon Sep 17 00:00:00 2001
From: rsiddharth <rsiddharth@ninthfloor.org>
Date: Fri, 30 Nov 2012 09:55:24 +0530
Subject: bug fix: parser/Nullit.java quotes the full regex before sending the
 regex to Pattern.compile().

modified:
  parsers/NullIt.java
---
 parsers/NullIt.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'parsers')

diff --git a/parsers/NullIt.java b/parsers/NullIt.java
index ef710d7..d13f543 100644
--- a/parsers/NullIt.java
+++ b/parsers/NullIt.java
@@ -25,12 +25,14 @@ import java.util.regex.*;
 
 public class NullIt {
     public String nullIt(String content,String regex) {
-	Pattern pattern = Pattern.compile(regex);
-	Matcher matcher = pattern.matcher(content);
-	while(matcher.find()) {
-	    content = matcher.replaceFirst("");
-	    break;
-	}
-	return content;
+		// quote the regex.
+		String quotedRegex = "\\Q"+regex+"\\E";
+		Pattern pattern = Pattern.compile(quotedRegex);
+		Matcher matcher = pattern.matcher(content);
+		while(matcher.find()) {
+			content = matcher.replaceFirst("");
+			break;
+		}
+		return content;
     }
 }
-- 
cgit v1.2.3


From de384fa5b555a4b9bf46da01f30cda5658c8b604 Mon Sep 17 00:00:00 2001
From: rsiddharth <rsiddharth@ninthfloor.org>
Date: Fri, 30 Nov 2012 18:48:40 +0530
Subject: minor-fix(es) to comply with standards modified:  
 index/IndexCreator.java (added space after the link mark-up)  
 parsers/Images.java (now the string for the alt parameter in the   	
 			  <img> will be surrounded by square brackets)

---
 parsers/Images.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'parsers')

diff --git a/parsers/Images.java b/parsers/Images.java
index 0cfa5cf..7bbe60a 100644
--- a/parsers/Images.java
+++ b/parsers/Images.java
@@ -25,7 +25,7 @@ import java.util.regex.*;
 
 public class Images implements Parser {
     // set of strings to build the img tag
-    private String openTag = "<img src=\"$1\" alt=\"$";
+    private String openTag = "<img src=\"$1\" alt=\" \\[$";
     private String closeTag = " />";
     public String parse(String fileContent) {
 	Pattern pattern = Pattern.compile("\\{\\{(.+?\\.(png|jpg))(\\|(.+?))?\\}\\}", Pattern.DOTALL);
@@ -39,7 +39,7 @@ public class Images implements Parser {
 	    replacementString.append(openTag);
 	    // if the "title" is given add to the _img_ tag.
 	    if(matcher.group(3)!=null) {
-		replacementString.append("4\" title=\"$4\"");
+		replacementString.append("4\\] \" title=\"$4\"");
 	    }
 	    else {
 		replacementString.append("1\"");
-- 
cgit v1.2.3


From ce93e97766f508ce9850e409b203a609d17c5241 Mon Sep 17 00:00:00 2001
From: rsiddharth <rsiddharth@ninthfloor.org>
Date: Sun, 2 Dec 2012 13:07:06 +0530
Subject: new feature: I have added support for <audio> tags for Ogg audio.
 added:   parsers/Audio.java (to parse audio) modified:  
 parsers/ParserList.java (new parser added, see above)

---
 parsers/Audio.java      | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
 parsers/ParserList.java |  1 +
 2 files changed, 53 insertions(+)
 create mode 100644 parsers/Audio.java

(limited to 'parsers')

diff --git a/parsers/Audio.java b/parsers/Audio.java
new file mode 100644
index 0000000..78d08a5
--- /dev/null
+++ b/parsers/Audio.java
@@ -0,0 +1,52 @@
+/*+
+ *   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.*;
+
+public class Audio implements Parser {
+	private Pattern pattern;
+	private Matcher matcher;
+	private StringBuffer sbuffer;
+	private String replacement;
+	public Audio() {
+		pattern = Pattern.compile("\\{\\{audio\\:(.+?\\.(ogg|ogv))\\}\\}", 
+								  Pattern.DOTALL);
+		replacement = "<audio controls=\"controls\">"+ 
+			"\n<source src=\"$1\" type=\"audio/ogg\">"+
+			"\n<p>[ No support for HTML5 audio tag for Ogg audio."+ 
+			"<a  href=\"$1\"> Download it</a>. ]</p>"+ 
+			"</audio>";
+		sbuffer = new StringBuffer();
+	}
+	public String parse(String fileContent) {
+		matcher = pattern.matcher(fileContent);
+		// clear the buffer
+		sbuffer.delete(0,sbuffer.length());
+		while(matcher.find()) {
+			matcher.appendReplacement(sbuffer,replacement);
+		}
+		matcher.appendTail(sbuffer);
+		
+		return sbuffer.toString();
+	}
+}
diff --git a/parsers/ParserList.java b/parsers/ParserList.java
index 8691cdd..8db7a04 100644
--- a/parsers/ParserList.java
+++ b/parsers/ParserList.java
@@ -36,6 +36,7 @@ public class ParserList {
 	parsers.add(new Headings());
 	parsers.add(new Links());		
 	parsers.add(new Images());
+	parsers.add(new Audio());
 	parsers.add(new Footer());
 	parsers.add(new Paragraphs());
 	parsers.add(new Source());
-- 
cgit v1.2.3