From c998103ce5664ab11dda0f811cd2c3f98baf53cd Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Fri, 29 Jul 2022 17:19:51 +0000 Subject: [PATCH] Correct the article previews Co-authored-by: sigonasr2 --- .../curabitur%20vel%20tempus%20ex.comment | 4 +- comments/test1.comment | 3 + out/DIRECTORY_LISTING | 16 +- out/articles/DIRECTORY_LISTING | 14 +- ...ove Live! Custom Arcade Controller.article | 96 ---- out/articles/curabitur vel tempus ex.article | 96 ---- out/articles/sigplace1.article | 96 ---- out/articles/test articles/DIRECTORY_LISTING | 12 +- out/articles/test articles/test1.article | 96 ---- out/articles/test articles/test2.article | 96 ---- out/articles/test articles/test3.article | 96 ---- out/otherpage.html | 525 +++++++++++++++++- out/sig.css | 23 +- sigPlace.java | 66 +-- sitefiles/sig.css | 23 +- 15 files changed, 609 insertions(+), 653 deletions(-) create mode 100644 comments/test1.comment diff --git a/comments/curabitur%20vel%20tempus%20ex.comment b/comments/curabitur%20vel%20tempus%20ex.comment index 66d567a..aa324a3 100644 --- a/comments/curabitur%20vel%20tempus%20ex.comment +++ b/comments/curabitur%20vel%20tempus%20ex.comment @@ -1,7 +1,9 @@ -3 +4 New%20article%20test%20hype!

First! New%20article%20comment2022-07-27T20:28:16.622522Z[Etc/UTC];GREEN %5EI%5E%20*am*_%20now_~%20testing~%20%5Ball%5D%20the%20tags.%F0%9F%98%8A%F0%9F%98%94%F0%9F%91%8D%E2%9D%A4%EF%B8%8F%F0%9F%98%A1 Test%20Tags2022-07-28T18:35:21.171183Z[Etc/UTC];RED %5E%5EBold%20test%5E%5E 2022-07-28T19:02:38.122403Z[Etc/UTC];GREEN + +2022-07-29T15:47:26.100365Z[Etc/UTC];GREEN diff --git a/comments/test1.comment b/comments/test1.comment new file mode 100644 index 0000000..4671ae0 --- /dev/null +++ b/comments/test1.comment @@ -0,0 +1,3 @@ +1 +Yay!
%5D +It%20works!2022-07-29T17:10:26.580245Z[Etc/UTC];GREEN diff --git a/out/DIRECTORY_LISTING b/out/DIRECTORY_LISTING index dc05fce..cc5929a 100644 --- a/out/DIRECTORY_LISTING +++ b/out/DIRECTORY_LISTING @@ -17,14 +17,14 @@
-

Directory Listing for /

📁.. (Previous Directory)
📁articles 2022-07-28T20:17:22.327696Z gitpod 4096
-
🗎codeBackground 2022-07-28T20:17:22.167696Z gitpod 2635
-
📁images 2022-07-28T20:17:22.323696Z gitpod 58
-
🗎otherpage.html 2022-07-28T20:17:22.167696Z gitpod 939
-
🗎reset.css 2022-07-28T20:17:22.175696Z gitpod 1092
-
🗎sig.css 2022-07-28T20:17:22.195696Z gitpod 9300
-
🗎testfile.html 2022-07-28T20:17:22.211696Z gitpod 802
-
🗎uploadform.html 2022-07-28T20:17:22.211696Z gitpod 882
+

Directory Listing for /

📁.. (Previous Directory)
📁articles 2022-07-29T17:18:56.250075Z gitpod 4096
+
🗎codeBackground 2022-07-29T17:18:56.178076Z gitpod 2635
+
📁images 2022-07-29T17:18:56.246076Z gitpod 58
+
🗎otherpage.html 2022-07-29T17:18:56.206076Z gitpod 87545
+
🗎reset.css 2022-07-29T17:18:56.182076Z gitpod 1092
+
🗎sig.css 2022-07-29T17:18:56.190076Z gitpod 9358
+
🗎testfile.html 2022-07-29T17:18:56.206076Z gitpod 802
+
🗎uploadform.html 2022-07-29T17:18:56.210076Z gitpod 882
diff --git a/out/articles/DIRECTORY_LISTING b/out/articles/DIRECTORY_LISTING index 94fe205..e20e894 100644 --- a/out/articles/DIRECTORY_LISTING +++ b/out/articles/DIRECTORY_LISTING @@ -17,13 +17,13 @@
-

Directory Listing for /articles/

📁.. (Previous Directory)
🗎Love Live! Custom Arcade Controller.article 2022-07-28T20:17:21.651697Z gitpod 6726
-
🗎curabitur vel tempus ex.article 2022-07-28T20:17:21.687697Z gitpod 6935
-
🗎sigplace1.article 2022-07-28T20:17:22.155696Z gitpod 87035
-
📁test articles 2022-07-28T20:17:22.303696Z gitpod 147
-
🗎Love Live! Custom Arcade Controller.article.html 2022-07-28T20:17:22.227696Z gitpod 7443
-
🗎curabitur vel tempus ex.article.html 2022-07-28T20:17:22.243696Z gitpod 7652
-
🗎sigplace1.article.html 2022-07-28T20:17:22.263696Z gitpod 87752
+

Directory Listing for /articles/

📁.. (Previous Directory)
🗎Love Live! Custom Arcade Controller.article 2022-07-29T17:18:55.582076Z gitpod 497
+
🗎curabitur vel tempus ex.article 2022-07-29T17:18:55.610076Z gitpod 730
+
🗎sigplace1.article 2022-07-29T17:18:56.170076Z gitpod 80858
+
📁test articles 2022-07-29T17:18:56.238076Z gitpod 147
+
🗎Love Live! Custom Arcade Controller.article.html 2022-07-29T17:18:56.210076Z gitpod 7443
+
🗎curabitur vel tempus ex.article.html 2022-07-29T17:18:56.222076Z gitpod 7652
+
🗎sigplace1.article.html 2022-07-29T17:18:56.234076Z gitpod 87752
diff --git a/out/articles/Love Live! Custom Arcade Controller.article b/out/articles/Love Live! Custom Arcade Controller.article index 190d8c8..80fb2c3 100644 --- a/out/articles/Love Live! Custom Arcade Controller.article +++ b/out/articles/Love Live! Custom Arcade Controller.article @@ -5,99 +5,3 @@ For over a year since I first got into Love Live! School Idol Festival ~after


15 July 2022 1:53PM
%CONDITIONAL_EXPAND% -
- -
- Leave a comment!

-

-

- -
-
-  B  -  I  -  U  -  <code>  -  <http://>  -  ๐Ÿ˜Š  -  ๐Ÿ˜”  -  ๐Ÿ‘  -  โค๏ธ  -  ๐Ÿ˜ก  -
- -


- -


- - diff --git a/out/articles/curabitur vel tempus ex.article b/out/articles/curabitur vel tempus ex.article index ff64524..6e005a0 100644 --- a/out/articles/curabitur vel tempus ex.article +++ b/out/articles/curabitur vel tempus ex.article @@ -9,99 +9,3 @@ Curabitur vel tempus ex. Duis cursus sapien nisl, ut pulvinar dui porttitor ut.

29 Apr 2022 7:37PM
%CONDITIONAL_EXPAND% -
- -
- Leave a comment!

-

-

- -
-
-  B  -  I  -  U  -  <code>  -  <http://>  -  ๐Ÿ˜Š  -  ๐Ÿ˜”  -  ๐Ÿ‘  -  โค๏ธ  -  ๐Ÿ˜ก  -
- -


- -


- - diff --git a/out/articles/sigplace1.article b/out/articles/sigplace1.article index 47e68ae..19cd529 100644 --- a/out/articles/sigplace1.article +++ b/out/articles/sigplace1.article @@ -484,99 +484,3 @@ Here we demonstrate the love live logo. But wait, it's literally like in the mid

3 May 2022 10:25AM
%CONDITIONAL_EXPAND% -
- -
- Leave a comment!

-

-

- -
-
-  B  -  I  -  U  -  <code>  -  <http://>  -  ๐Ÿ˜Š  -  ๐Ÿ˜”  -  ๐Ÿ‘  -  โค๏ธ  -  ๐Ÿ˜ก  -
- -


- -


- - diff --git a/out/articles/test articles/DIRECTORY_LISTING b/out/articles/test articles/DIRECTORY_LISTING index cbbebe8..4f9d489 100644 --- a/out/articles/test articles/DIRECTORY_LISTING +++ b/out/articles/test articles/DIRECTORY_LISTING @@ -17,12 +17,12 @@
-

Directory Listing for /articles/test articles/

📁.. (Previous Directory)
🗎test1.article 2022-07-28T20:17:22.159696Z gitpod 7254
-
🗎test2.article 2022-07-28T20:17:22.159696Z gitpod 6950
-
🗎test3.article 2022-07-28T20:17:22.163696Z gitpod 7163
-
🗎test1.article.html 2022-07-28T20:17:22.271696Z gitpod 7971
-
🗎test2.article.html 2022-07-28T20:17:22.275696Z gitpod 7667
-
🗎test3.article.html 2022-07-28T20:17:22.303696Z gitpod 7880
+

Directory Listing for /articles/test articles/

📁.. (Previous Directory)
🗎test1.article 2022-07-29T17:18:56.174076Z gitpod 1085
+
🗎test2.article 2022-07-29T17:18:56.174076Z gitpod 781
+
🗎test3.article 2022-07-29T17:18:56.174076Z gitpod 994
+
🗎test1.article.html 2022-07-29T17:18:56.234076Z gitpod 7971
+
🗎test2.article.html 2022-07-29T17:18:56.234076Z gitpod 7667
+
🗎test3.article.html 2022-07-29T17:18:56.238076Z gitpod 7880
diff --git a/out/articles/test articles/test1.article b/out/articles/test articles/test1.article index 34dded5..19ef4fd 100644 --- a/out/articles/test articles/test1.article +++ b/out/articles/test articles/test1.article @@ -3,99 +3,3 @@ In dolor erat, malesuada at elit cursus, convallis imperdiet turpis. Ut aliquet magna tellus, at viverra mauris ullamcorper vehicula. Nam quis urna semper magna ornare elementum sed id mauris. Suspendisse faucibus nunc ante, ac rhoncus nisl tristique sed. Vestibulum pretium odio eget scelerisque vestibulum. Aliquam viverra ex ac vestibulum interdum. Donec ligula nunc, dignissim a purus vitae, fermentum laoreet diam. Quisque nec auctor urna. Vestibulum sit amet ligula ullamcorper, congue ipsum et, accumsan ante. Phasellus fermentum, sapien nec pulvinar blandit, elit purus pretium urna, et dapibus orci urna eu metus. Nunc molestie dictum pharetra. Suspendisse luctus felis et ante tristique, vitae commodo diam porttitor. Aliquam orci eros, placerat ac justo vitae, bibendum efficitur metus. Phasellus eget bibendum mauris.

2 May 2022 10:16AM
%CONDITIONAL_EXPAND% -
- -
- Leave a comment!

-

-

- -
-
-  B  -  I  -  U  -  <code>  -  <http://>  -  ๐Ÿ˜Š  -  ๐Ÿ˜”  -  ๐Ÿ‘  -  โค๏ธ  -  ๐Ÿ˜ก  -
- -


- -


- - diff --git a/out/articles/test articles/test2.article b/out/articles/test articles/test2.article index e23ab11..521b977 100644 --- a/out/articles/test articles/test2.article +++ b/out/articles/test articles/test2.article @@ -3,99 +3,3 @@ Sed lobortis nisi id nunc tincidunt volutpat. Mauris cursus felis quis condimentum posuere. Pellentesque vitae dolor et justo suscipit ultrices. Integer dapibus leo id felis varius, ut volutpat massa bibendum. Quisque sed nunc arcu. In sit amet faucibus magna, non venenatis massa. Cras sed placerat risus, id consectetur est. Pellentesque in nunc dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Quisque eget lorem ac urna posuere accumsan. Quisque sed imperdiet nisi.

1 May 2022 05:13AM
%CONDITIONAL_EXPAND% -
- -
- Leave a comment!

-

-

- -
-
-  B  -  I  -  U  -  <code>  -  <http://>  -  ๐Ÿ˜Š  -  ๐Ÿ˜”  -  ๐Ÿ‘  -  โค๏ธ  -  ๐Ÿ˜ก  -
- -


- -


- - diff --git a/out/articles/test articles/test3.article b/out/articles/test articles/test3.article index 257d33e..cf77fc7 100644 --- a/out/articles/test articles/test3.article +++ b/out/articles/test articles/test3.article @@ -3,99 +3,3 @@ Curabitur suscipit quam tellus, non rhoncus diam vehicula in. Aliquam ut dapibus tortor. Cras accumsan arcu vel ante maximus ornare. Nam tempus fermentum leo maximus euismod. Donec vehicula pretium est a ultrices. Nunc blandit nibh lorem, nec blandit leo posuere quis. Sed mauris ligula, euismod eu aliquam vel, rhoncus eget magna. Proin eget tortor ut ligula suscipit mattis. Integer rutrum aliquet eleifend. Suspendisse leo libero, placerat nec mi id, sagittis malesuada felis. Quisque euismod ante cursus elit lobortis, eu tempus ligula condimentum. Mauris viverra metus et dignissim efficitur. Ut placerat nunc nunc, eu tempus neque ultrices nec. Suspendisse et magna risus. Phasellus in ullamcorper tortor. Sed lobortis ut mi in blandit.

30 Apr 2022 6:14PM
%CONDITIONAL_EXPAND% -
- -
- Leave a comment!

-

-

- -
-
-  B  -  I  -  U  -  <code>  -  <http://>  -  ๐Ÿ˜Š  -  ๐Ÿ˜”  -  ๐Ÿ‘  -  โค๏ธ  -  ๐Ÿ˜ก  -
- -


- -


- - diff --git a/out/otherpage.html b/out/otherpage.html index 56d2d48..2b7352f 100644 --- a/out/otherpage.html +++ b/out/otherpage.html @@ -18,11 +18,526 @@
This is a different webpage.
-$ARTICLE_PREVIEW sigplace1 -$ARTICLE_PREVIEW test articles/test1 -$ARTICLE_PREVIEW test articles/test2 -$ARTICLE_PREVIEW test articles/test3 -$ARTICLE_PREVIEW curabitur vel tempus ex + +

Welcome to SigPlace!

๐Ÿ”—
+

+ This is a SigPlace article! It will contain information that is important (probably) and will be layed out as such. +

+

+ Paragraphs are automatically split up for readability and generated correctly via the parser. There's quite a bit of flexibility with the system and makes it easy to post updates should they be required. +

+

+ A lot of content management systems would do this by having a web interface and submitting content and managing it that way, but by coding my own management system and using the built-in OS' filesystem to handle the work, I save myself a lot of pains and headaches. +

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. In feugiat, urna ut sollicitudin luctus, nulla magna faucibus mauris, at semper nisl nisi ut mauris. Vestibulum cursus tortor velit, ut congue ex porta in. Nullam hendrerit risus sit amet neque euismod faucibus. Sed ac diam non lectus euismod pulvinar eu non mauris. Donec accumsan nisl efficitur, sodales lectus et, finibus quam. Sed vel consectetur leo. Cras ut condimentum quam. Aliquam molestie viverra congue. Donec scelerisque nibh ac nulla dictum semper. Aliquam id massa a massa bibendum finibus id ac sapien. Integer vitae ullamcorper enim, non semper massa. +

+
+

+Proin cursus sodales elit, vitae volutpat mi fermentum a. In vitae magna quis leo cursus accumsan id facilisis purus. Vestibulum accumsan iaculis turpis eu sollicitudin. Sed ultricies felis non elit suscipit interdum. Maecenas sollicitudin turpis justo, vel pretium sapien scelerisque eget. Nullam sagittis finibus risus ut aliquam. Praesent quam orci, dapibus ut ex ac, sodales dapibus nunc. +

+
+

+Fusce magna risus, iaculis non justo sit amet, semper sodales urna. Morbi eu eros lectus. Integer euismod venenatis eros a hendrerit. Nulla ultricies lectus nec quam condimentum fermentum. Quisque a turpis vitae orci pharetra ullamcorper. Nunc fringilla vitae nunc a aliquam. In aliquam gravida massa. Sed imperdiet dignissim sapien, ullamcorper rutrum lacus convallis ut. +

+
+

+Nunc tortor sem, dapibus mattis varius id, varius eu leo. Phasellus efficitur nulla a diam faucibus, id facilisis lacus malesuada. Nulla condimentum egestas erat a fermentum. Ut interdum dui id est condimentum, vel fermentum nisi ornare. Sed eu rhoncus magna, sit amet finibus eros. In a nibh tincidunt, suscipit tellus eleifend, faucibus mauris. Vestibulum sagittis nisi et efficitur ullamcorper. Donec sodales efficitur ligula id congue. Etiam egestas tristique interdum. Mauris at massa eget metus pellentesque fermentum nec non lacus. Nulla turpis nunc, feugiat vel euismod ac, maximus id est. Praesent cursus elit ac dolor hendrerit lacinia. +

+
+

+Vestibulum laoreet lorem consequat, mollis augue finibus, luctus libero. Praesent convallis sed velit vitae molestie. Vestibulum nec fringilla tellus, non dictum nulla. Donec tempor ac diam sit amet porta. Quisque mi ex, vulputate ac tincidunt vel, vestibulum vitae orci. Duis gravida mauris eget mauris pulvinar, lobortis tincidunt neque efficitur. Nunc blandit metus vitae faucibus vulputate. Curabitur rhoncus volutpat lorem, sit amet pulvinar ipsum. Fusce ultricies enim odio, a viverra quam tincidunt quis. Aliquam sollicitudin a sapien id efficitur. Proin at finibus elit, id gravida elit. Nulla facilisi. Ut tincidunt, ligula eu pulvinar dapibus, lorem nisl facilisis tellus, in ornare quam dolor quis libero. Pellentesque ut convallis orci. Donec volutpat nunc velit, tristique convallis purus lacinia sit amet. Maecenas porttitor cursus nisl sed porta. +

+
+
Hello there! You can see this is the Love Live logo indeed! It is quite smol right now but that's okay. Let's keep on going with the text. If the caption is really long and with commas, they will now be combined,,,,,see how that works? Amazing!
+

+Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on. +

+
+

+

+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.CopyOption;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+public class sigPlace {
+    /* Test giant multi-line comment ""
+    final static String ROOTDIR = "sitefiles";
+    final static String REFDIR = "ref";
+    final static String OUTDIR = "out";
+    final static String ARTICLESDIR = "articles";
+    final static String UPLOADSDIR = "uploads";
+    final static String COMMENTSDIR = "comments";
+    final static String DIRECTORYLISTING_FILENAME = "DIRECTORY_LISTING";
+    static int PORT = 8080;
+    */
+    static double COLOR_ROTATION = 0;
+    static boolean inCodeBlock = false;
+    static String storedCodeBlock = "";
+    final static HashMap<String,String> map = new HashMap<>(Map.ofEntries(
+        new AbstractMap.SimpleEntry<>("$SITENAME", "SigPlace"),
+        new AbstractMap.SimpleEntry<>("$SITE_BACKCOL", "#111"),
+        new AbstractMap.SimpleEntry<>("$TITLE_CONTENT_START", "<div class=\"contentWrapper\"><h1>"),
+        new AbstractMap.SimpleEntry<>("$TITLE_CONTENT_END", "</h1><div class=\"content\" %ID%>"),
+        new AbstractMap.SimpleEntry<>("$CONTENT_END", "</div>"),
+        new AbstractMap.SimpleEntry<>("$DATE_CONTENT_START", "<div class=\"datebar\"></div><div class=\"date\">")
+    ));
+    final static HashMap<String,Path> ops = new HashMap<>(Map.ofEntries(
+        new AbstractMap.SimpleEntry<>(
+            "%DEFAULT", Paths.get(REFDIR,"DEFAULT.html")),
+        new AbstractMap.SimpleEntry<>(
+            "%FOOTER", Paths.get(REFDIR,"FOOTER.html"))
+    ));
+    public static void main(String[] args) {
+        if (args.length>0&&args.length%2==0) {
+            int i=0;
+            while (i<args.length) {
+                String arg1=args[i];
+                String arg2=args[i+1];
+                i+=2;
+                if (arg1.equals("-p")) {
+                    PORT=Integer.parseInt(arg2);
+                    System.out.println("Port set to "+PORT+".");
+                } else {
+                    System.err.println("Invalid argument \""+arg1+"\".");
+                    return;
+                }
+            }
+        }
+        System.out.println("Copying files over to output directory...");
+        try {
+            copyDirectory("sitefiles","out");
+            Iterator<Path> items = Files.walk(Paths.get("out")).filter((p)->!p.toAbsolutePath().toString().contains("images/")).iterator();
+            ParseArticleFiles(items);
+            items = Files.walk(Paths.get("out")).iterator();
+            ConvertArticleReferences(items);
+            items = Files.walk(Paths.get("out","articles")).iterator();
+            GenerateArticleFiles(items);
+        }catch (IOException e) {
+            e.printStackTrace();
+            System.err.println("Copying files over failed!");
+            return;
+        }
+        System.out.println("Building directory listings...");
+        try {
+            buildDirectoryListings();
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.err.println("Failed to build directory listings!");
+            return;
+        }
+        System.out.println("Site has been built into the "+OUTDIR+" directory.");
+        ExportCodeFile();
+        System.out.println("\nStarting web server...");
+        new sigServer();
+    }
+    private static void ParseArticleFiles(Iterator<Path> items) {
+        while (items.hasNext()) {
+            Path f = items.next();
+            System.out.println(" Found "+f.getFileName());
+            if (Files.isRegularFile(f)) {
+                try {
+                    System.out.println("  Preparing "+f.getFileName());
+                    List<String> content = Files.readAllLines(f);
+                    if (isHTMLFile(f)) {
+                        content.addAll(0,Files.readAllLines(ops.get("%DEFAULT")));
+                        content.addAll(Files.readAllLines(ops.get("%FOOTER")));
+                    }
+                    System.out.println("  Parsing "+f.getFileName());
+                    for (int i=0;i<content.size();i++) {
+                        String s = content.get(i);
+                        //System.out.println(s);
+                        if (s.length()>0&&(isHTMLFile(f)||isArticleFile(f))) {
+                            if (!inCodeBlock) {
+                                if (s.contains("<pre>")) {
+                                    //System.out.println("Inside <pre>");
+                                    inCodeBlock=true;
+                                    storedCodeBlock="";
+                                    s=s.substring(0,s.indexOf("<pre>"));
+                                }
+                            }
+                            if (inCodeBlock&&s.contains("</pre>")) {
+                                inCodeBlock=false;
+                                boolean keyword=false;
+                                boolean inString=false;
+                                boolean inChar=false;
+                                boolean canBeNumericalConstant=false;
+                                int lengthOfConstant=0;
+                                storedCodeBlock+=s.substring(0,s.indexOf("</pre>"));
+                                storedCodeBlock=storedCodeBlock.replaceAll(Pattern.quote("<"),"<");
+                                s+="</pre>";
+                                storedCodeBlock="<pre>"+storedCodeBlock;
+                                int startPos=0;
+                                String endText=s.substring(s.indexOf("</pre>")+"</pre>".length(),s.length());
+                                s="";
+                                for (int j=0;j<storedCodeBlock.length();j++) {
+                                    if (storedCodeBlock.charAt(j)=='"') {
+                                        inString=!inString;
+                                        if (inString) {
+                                            s+=SPAN("string")+"\"";
+                                        } else {
+                                            s+="\"</span>";
+                                            startPos=j+1;
+                                        }
+                                    } else
+                                    if (!inString&&!inChar) {
+                                        if (canBeNumericalConstant&&validNumericalConstantCharacters(lengthOfConstant, j)) {
+                                            lengthOfConstant++;
+                                            System.out.println("Length of Constant now "+lengthOfConstant);
+                                        }
+                                        if (canBeNumericalConstant&&lengthOfConstant>0&&!(validNumericalConstantCharacters(lengthOfConstant, j))) {
+                                            s+=SPAN("number")+storedCodeBlock.substring(startPos,j)+"</span>"+storedCodeBlock.charAt(j);
+                                            //System.out.println("Setting "+storedCodeBlock.substring(startPos,j)+storedCodeBlock.charAt(j));
+                                            lengthOfConstant=0;
+                                            canBeNumericalConstant=false;
+                                            startPos=j+1;
+                                        } else
+                                        if (!canBeNumericalConstant&&storedCodeBlock.charAt(j)=='.') {
+                                            //Previous section was a member.
+                                            s+=SPAN("class")+storedCodeBlock.substring(startPos,j)+"</span>"+storedCodeBlock.charAt(j);
+                                            startPos=j+1;
+                                        } else 
+                                        if (j>3&&storedCodeBlock.substring(j-3,j+1).equals("true")&&!isAlphanumeric(j-4)&&!isAlphanumeric(j+1)) {
+                                            s+=SPAN("number")+storedCodeBlock.substring(startPos,j)+storedCodeBlock.charAt(j)+"</span>";
+                                            startPos=j+1;
+                                        } else 
+                                        if (j>4&&storedCodeBlock.substring(j-4,j+1).equals("false")&&!isAlphanumeric(j-5)&&!isAlphanumeric(j+1)) {
+                                            s+=SPAN("number")+storedCodeBlock.substring(startPos,j)+storedCodeBlock.charAt(j)+"</span>";
+                                            startPos=j+1;
+                                        } else 
+                                        if (storedCodeBlock.charAt(j)=='(') {
+                                            s+=SPAN("function")+storedCodeBlock.substring(startPos,j)+"</span>"+storedCodeBlock.charAt(j);
+                                            startPos=j+1;
+                                        } else 
+                                        if (j>0&&isAlphanumeric(j-1) && storedCodeBlock.charAt(j)==' '&&storedCodeBlock.charAt(j-1)!=' ') {
+                                            //Previous section was a keyword.
+                                            keyword=true;
+                                            s+=SPAN("keyword")+storedCodeBlock.substring(startPos,j)+"</span>"+storedCodeBlock.charAt(j);
+                                            startPos=j+1;
+                                        } else 
+                                        if (j>0&&isAlphanumeric(j-1) && (storedCodeBlock.charAt(j)==';'||storedCodeBlock.charAt(j)==':')) {
+                                            //Previous section was a keyword.
+                                            //keyword=true;
+                                            s+=SPAN("keyword")+storedCodeBlock.substring(startPos,j)+"</span>"+storedCodeBlock.charAt(j);
+                                            startPos=j+1;
+                                        } else 
+                                        if (keyword&&!(storedCodeBlock.charAt(j)>='0'&&storedCodeBlock.charAt(j)<='9'||storedCodeBlock.charAt(j)>='A'&&storedCodeBlock.charAt(j)<='Z'||storedCodeBlock.charAt(j)>='a'&&storedCodeBlock.charAt(j)<='z'||storedCodeBlock.charAt(j)==' ')) {
+                                            keyword=false;
+                                            s+=SPAN("variable")+storedCodeBlock.substring(startPos,j)+"</span>"+storedCodeBlock.charAt(j);
+                                            startPos=j+1;
+                                        } else
+                                        if (!isAlphanumeric(j)){
+                                            if (startPos<j) {
+                                                s+=storedCodeBlock.substring(startPos,j)+storedCodeBlock.charAt(j);
+                                            } else {
+                                                s+=storedCodeBlock.charAt(j);
+                                            }
+                                            startPos=j+1;
+                                        }
+                                    } else {
+                                        s+=storedCodeBlock.charAt(j);
+                                        startPos=j+1;
+                                    }
+                                    if (canBeNumericalConstant&&lengthOfConstant==0&&!(storedCodeBlock.charAt(j)>='0'&&storedCodeBlock.charAt(j)<='9')) {
+                                        canBeNumericalConstant=false;
+                                    }
+                                    if (!canBeNumericalConstant&&!isAlphanumeric(j)) {
+                                        canBeNumericalConstant=true;
+                                        lengthOfConstant=0;
+                                        System.out.println("Found "+storedCodeBlock.charAt(j)+", can be numeric...");
+                                    }
+                                }
+                                s+=endText;
+                                //System.out.println("Stored code block: "+storedCodeBlock);
+                            } else 
+                            if (inCodeBlock) {
+                                storedCodeBlock+=s+"\n";
+                                s=" ";
+                            }
+                        }
+                        if (s.length()>0&&isArticleFile(f)) {
+                            //Check for markdown pieces.
+                            if (s.charAt(0)=='-') {
+                                //Start of a title piece.
+                                s=s.replace("-",map.get("$TITLE_CONTENT_START"));
+                                s=s+map.get("$TITLE_CONTENT_END").replace("%ID%","id=\"content_"+f+"\"");
+                                //Use โคˆ if there's more text to be shown than can fit.
+                            } else
+                            if (s.contains("===")) {
+                                s=map.get("$CONTENT_END")+map.get("$DATE_CONTENT_START")+s.replace("===","")+map.get("$CONTENT_END")+"%CONDITIONAL_EXPAND%"+map.get("$CONTENT_END");
+                            } else 
+                            if (s.charAt(0)==':') {
+                                //Image with caption.
+                                //Format:
+                                //:<url>,<left|right|center>,<width>,<caption>
+                                String[] splitter = s.split(Pattern.quote(","));
+                                StringBuilder captionText = new StringBuilder(splitter[3]);
+                                for (int j=4;j<splitter.length;j++) {
+                                    captionText.append(",").append(splitter[j]);
+                                }
+                                s="<div><figure style=\"text-align:center;"+((splitter[1].equals("left")||splitter[1].equals("right"))?"width:"+splitter[2]+"%;float:"+splitter[1]+";":"")+"\"><img src=\"/"+splitter[0].substring(1)+"\" style=\"margin:auto;width:100%;\"><figcaption>"+captionText.toString()+"</figcaption></figure></div>";
+                            } else {
+                                //It's regular content, so add paragraphs.
+                                s="<p class=\"color"+(((int)(COLOR_ROTATION=(COLOR_ROTATION+0.4)%6))+1)+"\">"+s+"</p>";
+                            }
+                        } else 
+                        if (s.length()==0&&isArticleFile(f)) {
+                            s="<br/>"; //Setup a line break here.
+                        }
+                        for (String key : map.keySet()) {
+                            s=s.replaceAll(Pattern.quote(key),map.get(key));
+                        }
+                        content.set(i,s);
+                    }
+                    System.out.println("  Writing to "+f.toAbsolutePath());
+                    Files.write(f, content, Charset.defaultCharset(),StandardOpenOption.CREATE,StandardOpenOption.TRUNCATE_EXISTING,StandardOpenOption.WRITE);
+                    
+                    System.out.println(" "+f.getFileName() + " conversion complete!");
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+    private static boolean validNumericalConstantCharacters(int lengthOfConstant, int j) {
+        return storedCodeBlock.charAt(j)>='0'&&storedCodeBlock.charAt(j)<='9'||lengthOfConstant>0&&storedCodeBlock.charAt(j)=='.'||lengthOfConstant>0&&storedCodeBlock.charAt(j)>='A'&&lengthOfConstant>0&&storedCodeBlock.charAt(j)<='F'||lengthOfConstant>0&&storedCodeBlock.charAt(j)>='a'&&lengthOfConstant>0&&storedCodeBlock.charAt(j)<='f'||lengthOfConstant>0&&storedCodeBlock.charAt(j)=='x'||lengthOfConstant>0&&storedCodeBlock.charAt(j)=='X';
+    }
+    private static boolean isAlphanumeric(int j) {
+        return storedCodeBlock.charAt(j)>='0'&&storedCodeBlock.charAt(j)<='9'||storedCodeBlock.charAt(j)>='A'&&storedCodeBlock.charAt(j)<='Z'||storedCodeBlock.charAt(j)>='a'&&storedCodeBlock.charAt(j)<='z';
+    }
+    /**
+     * Writes a span tag with the included class.
+     * **/
+    private static String SPAN(String className) {
+        return "<span class=\""+className+"\">";
+    }
+    private static void GenerateArticleFiles(Iterator<Path> items){
+        System.out.println(" Generating article files...");
+        while (items.hasNext()) {
+            Path f = items.next();
+            try {
+                if (Files.isRegularFile(f)&&isArticleFile(f)) {
+                    System.out.println("  Creating article for "+f.getFileName());
+                    List<String> content = Files.readAllLines(f);
+                    List<String> preContent = Files.readAllLines(ops.get("%DEFAULT"));
+                    List<String> postContent = Files.readAllLines(ops.get("%FOOTER"));
+                    StringBuilder sb = new StringBuilder();
+                    for (String d : preContent) {
+                        for (String k : sigPlace.map.keySet()) {
+                            d=d.replaceAll(Pattern.quote(k),sigPlace.map.get(k));
+                        }
+                        sb.append(d).append("\n");
+                    }
+                    for (String d : content) {
+                        for (String k : sigPlace.map.keySet()) {
+                            d=d.replaceAll(Pattern.quote(k),sigPlace.map.get(k));
+                        }
+                        d=d.replaceFirst("div class=\"content\"","div class=\"expandedContent\"");
+                        d=d.replaceFirst("%CONDITIONAL_EXPAND%","");
+                        sb.append(d).append("\n");
+                    }
+                    for (String d : postContent) {
+                        for (String k : sigPlace.map.keySet()) {
+                            d=d.replaceAll(Pattern.quote(k),sigPlace.map.get(k));
+                        }
+                        sb.append(d).append("\n");
+                    }
+                    Files.write(Paths.get(f.getParent().toString(),f.getFileName()+".html"),sb.toString().getBytes());
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    private static void ConvertArticleReferences(Iterator<Path> items) {
+        while (items.hasNext()) {
+            Path f = items.next();
+            System.out.println(" Looking for Article References..."+f.getFileName());
+            boolean articleJavascriptIncluded=false;
+            if (Files.isRegularFile(f)&&isHTMLFile(f)) {
+                System.out.println("  Searching "+f.getFileName());
+                try {
+                    List<String> content = Files.readAllLines(f);
+                    for (int i=0;i<content.size();i++) {
+                        String s = content.get(i);
+                        if (s.length()>0&&s.contains("$ARTICLE_PREVIEW")) {
+                            String article = ARTICLESDIR+"/"+s.replace("$ARTICLE_PREVIEW ","")+".article";
+                            System.out.println("   Found article preview request in "+f.getFileName()+" for article "+article+".");
+                            Path file = Paths.get(OUTDIR,article);
+                            List<String> newData = Files.readAllLines(file);
+                            if (newData.size()>0) {
+                                content.set(i,newData.get(0));
+                                for (int j=1;j<newData.size();j++) {
+                                    content.add(i+j, newData.get(j));
+                                }
+                                String lastline=content.get(i+newData.size()-1);
+                                lastline=lastline.replace("%CONDITIONAL_EXPAND%","<div class=\"unexpanded\" id=\"expand_"+i+"\" onClick=\"expand(this,'"+Paths.get(OUTDIR,article.toString())+"')\"><br/><br/><br/><br/>⤈ Click to expand.</div>");
+                                content.set(i+newData.size()-1,lastline);//<div class=\"unexpanded\" id=\"expand_"+i+"\" onClick=\"expand("+i+")\"><br/><br/><br/><br/>⤈ Click to expand.</div>");
+                            } else {
+                                content.set(i,"");
+                            }
+                            if (!articleJavascriptIncluded) {
+                                List<String> articlejs = Files.readAllLines(Paths.get(REFDIR,"article.js"));
+                                for (int j=articlejs.size()-1;j>=0;j--) {
+                                    content.add(i,articlejs.get(j));
+                                }
+                                articleJavascriptIncluded=true;
+                            }
+                        }
+                    }
+                    Files.write(f,content);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+    static void copyDirectory(String sourceDirectoryLocation, String destinationDirectoryLocation) 
+    throws IOException {
+        Files.walk(Paths.get(sourceDirectoryLocation))
+        .forEach(source -> {
+            Path destination = Paths.get(destinationDirectoryLocation, source.toString()
+                .substring(sourceDirectoryLocation.length()));
+            try {
+                if (Files.isDirectory(destination)) {
+                    Files.createDirectories(destination);
+                } else {
+                    Files.copy(source, destination, new CopyOption[]{StandardCopyOption.COPY_ATTRIBUTES,StandardCopyOption.REPLACE_EXISTING});
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        });
+    }
+    static void buildDirectoryListings() 
+    throws IOException {
+        String startingPath=Paths.get(sigPlace.OUTDIR).toAbsolutePath().toString();
+        HashMap<String,List<Path>> map = new HashMap<>();
+        Iterator<Path> it = Files.walk(Paths.get(sigPlace.OUTDIR)).iterator();
+        map.put("/",new ArrayList<Path>());
+        while (it.hasNext()) {
+            Path f = it.next();
+            if (!f.getFileName().toString().equals(OUTDIR)) {
+                String myKey = f.toAbsolutePath().toString().replace(startingPath,"").replace(f.getFileName().toString(),"");
+                //System.out.println(myKey+","+f);
+                map.putIfAbsent(myKey,new ArrayList<Path>());
+                map.get(myKey).add(f);
+            }
+        }
+        System.out.println("Directory structure determined:");
+        System.out.println("    "+map);
+        for (String key : map.keySet()) {
+            System.out.println("Creating directory listing for "+key+"...");
+            StringBuilder sb = new StringBuilder("");
+            List<String> data = Files.readAllLines(ops.get("%DEFAULT"));
+            List<String> data2 = Files.readAllLines(ops.get("%FOOTER"));
+            for (String d : data) {
+                for (String k : sigPlace.map.keySet()) {
+                    d=d.replaceAll(Pattern.quote(k),sigPlace.map.get(k));
+                }
+                sb.append(d).append("\n");
+            }
+            sb.append("<h2>Directory Listing for "+key+"</h2>");
+            sb.append("<div class=\"folderlisting\"><a href=\"")
+            .append(key)
+            .append("..\" class=\"icon\">📁</a><a href=\"")
+            .append(key)
+            .append("..\">.. </a><a href=\"")
+            .append(key)
+            .append("..\" class=\"nounderline\">(Previous Directory)</a></div>");
+            for (Path f : map.get(key)) {
+                sb.append("<div class=\"").append((Files.isDirectory(f)?"folderlisting":"filelisting")).append("\">")
+                .append("<a href=\""+(f.toAbsolutePath().toString().replace(Paths.get(OUTDIR).toAbsolutePath().toString(),""))+"\" class=\"icon\">")
+                .append((Files.isDirectory(f)?"📁":"🗎"))
+                .append("</a>")
+                .append("<a href=\""+(f.toAbsolutePath().toString().replace(Paths.get(OUTDIR).toAbsolutePath().toString(),""))+"\">")
+                .append(f.getFileName())
+                .append("</a>\t")
+                .append(Files.getLastModifiedTime(f))
+                .append("\t")
+                .append(Files.getOwner(f))
+                .append("\t")
+                .append(Files.size(f))
+                .append("</div>\n");
+            }
+            for (String d : data2) {
+                for (String k : sigPlace.map.keySet()) {
+                    d=d.replaceAll(Pattern.quote(k),sigPlace.map.get(k));
+                }
+                sb.append(d).append("\n");
+            }
+            Path newf = Files.write(Paths.get(OUTDIR,key,DIRECTORYLISTING_FILENAME),sb.toString().getBytes());
+            System.out.println("  Added info for ("+map.size()+") files to "+newf.toAbsolutePath());
+        }
+    }
+    private static boolean isArticleFile(Path f) {
+        return f.getFileName().toString().contains(".article");
+    }
+    private static boolean isHTMLFile(Path f) {
+        return f.getFileName().toString().contains(".html");
+    }
+    private static void ExportCodeFile() {
+        try {
+            Path file = Paths.get("sigServer.java");
+            List<String> data = Files.readAllLines(file);
+            int i=0;
+            while (!data.get(i++).contains("sigServer()")&&i<data.size());
+            if (i<data.size()) {
+                Files.write(Paths.get(OUTDIR,"codeBackground"),data.subList(i, Math.min(i+40,data.size())),Charset.defaultCharset(),StandardOpenOption.CREATE,StandardOpenOption.TRUNCATE_EXISTING,StandardOpenOption.WRITE);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        
+    }
+}
+
+

+
3 May 2022 10:25AM




⤈ Click to expand.
+

A Test Title

๐Ÿ”—
+

+ In dolor erat, malesuada at elit cursus, convallis imperdiet turpis. Ut aliquet magna tellus, at viverra mauris ullamcorper vehicula. Nam quis urna semper magna ornare elementum sed id mauris. Suspendisse faucibus nunc ante, ac rhoncus nisl tristique sed. Vestibulum pretium odio eget scelerisque vestibulum. Aliquam viverra ex ac vestibulum interdum. Donec ligula nunc, dignissim a purus vitae, fermentum laoreet diam. Quisque nec auctor urna. Vestibulum sit amet ligula ullamcorper, congue ipsum et, accumsan ante. Phasellus fermentum, sapien nec pulvinar blandit, elit purus pretium urna, et dapibus orci urna eu metus. Nunc molestie dictum pharetra. Suspendisse luctus felis et ante tristique, vitae commodo diam porttitor. Aliquam orci eros, placerat ac justo vitae, bibendum efficitur metus. Phasellus eget bibendum mauris. +

+
2 May 2022 10:16AM




⤈ Click to expand.
+

Another test title

๐Ÿ”—
+

+ Sed lobortis nisi id nunc tincidunt volutpat. Mauris cursus felis quis condimentum posuere. Pellentesque vitae dolor et justo suscipit ultrices. Integer dapibus leo id felis varius, ut volutpat massa bibendum. Quisque sed nunc arcu. In sit amet faucibus magna, non venenatis massa. Cras sed placerat risus, id consectetur est. Pellentesque in nunc dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Quisque eget lorem ac urna posuere accumsan. Quisque sed imperdiet nisi. +

+
1 May 2022 05:13AM




⤈ Click to expand.
+

And More

๐Ÿ”—
+

+ Curabitur suscipit quam tellus, non rhoncus diam vehicula in. Aliquam ut dapibus tortor. Cras accumsan arcu vel ante maximus ornare. Nam tempus fermentum leo maximus euismod. Donec vehicula pretium est a ultrices. Nunc blandit nibh lorem, nec blandit leo posuere quis. Sed mauris ligula, euismod eu aliquam vel, rhoncus eget magna. Proin eget tortor ut ligula suscipit mattis. Integer rutrum aliquet eleifend. Suspendisse leo libero, placerat nec mi id, sagittis malesuada felis. Quisque euismod ante cursus elit lobortis, eu tempus ligula condimentum. Mauris viverra metus et dignissim efficitur. Ut placerat nunc nunc, eu tempus neque ultrices nec. Suspendisse et magna risus. Phasellus in ullamcorper tortor. Sed lobortis ut mi in blandit. +

+
30 Apr 2022 6:14PM




⤈ Click to expand.
+

Curabitur vel tempus ex

๐Ÿ”—
+

+Curabitur vel tempus ex. Duis cursus sapien nisl, ut pulvinar dui porttitor ut. Nullam odio purus, tristique non turpis sit amet, malesuada ultricies purus. Mauris ut nulla nisl. Aenean sit amet est egestas justo volutpat consequat. Suspendisse in sagittis augue, et mattis tortor. Nullam viverra metus et nibh fringilla iaculis. +

+
+

+

+<><Test>"</test></test2><test3>"
+
+

+
29 Apr 2022 7:37PM




⤈ Click to expand.
diff --git a/out/sig.css b/out/sig.css index 8d1dbe2..a1ecaea 100644 --- a/out/sig.css +++ b/out/sig.css @@ -10,15 +10,15 @@ a:hover{ color:white; font-size:0.8em; } - a.nounderline:link{ - text-decoration:none; - } - a.nounderline:visited{ - text-decoration:none; - } - a.nounderline:hover{ - text-decoration:none; - } +a.nounderline:link{ + text-decoration:none; +} +a.nounderline:visited{ + text-decoration:none; +} +a.nounderline:hover{ + text-decoration:none; +} h2{ font-size:3em; } @@ -382,3 +382,8 @@ textarea:disabled{ background-color:#a1a1a1; cursor:pointer; } +.contentWrapper .reallink{ + font-size:1.7em; + text-decoration: none; + color:white; +} diff --git a/sigPlace.java b/sigPlace.java index 3ff321e..306f4f5 100644 --- a/sigPlace.java +++ b/sigPlace.java @@ -301,20 +301,6 @@ public class sigPlace { } } - if (isArticleFile(f)) { - System.out.println(" Generating comment section for "+f+"."); - - Path ff = Paths.get(REFDIR,"COMMENT.html"); - List commentHTML = Files.readAllLines(ff); - for (int i=0;i commentHTML = Files.readAllLines(ff); + for (int i=0;i0&&s.contains("$ARTICLE_PREVIEW")) { String article = ARTICLESDIR+"/"+s.replace("$ARTICLE_PREVIEW ","")+".article"; - System.out.println(" Found article preview request in "+f.getFileName()+" for article "+article+"."); - Path file = Paths.get(OUTDIR,article); - List newData = Files.readAllLines(file); - if (newData.size()>0) { - content.set(i,newData.get(0)); - for (int j=1;j newData = Files.readAllLines(file); + if (newData.size()>0) { + content.set(i,newData.get(0) + .replace("

","

") + .replace("

","

๐Ÿ”—")); + for (int j=1;j



⤈ Click to expand."); + content.set(i+newData.size()-1,lastline);//




⤈ Click to expand.
"); + } else { + content.set(i,""); } - String lastline=content.get(i+newData.size()-1); - lastline=lastline.replace("%CONDITIONAL_EXPAND%","




⤈ Click to expand.
"); - content.set(i+newData.size()-1,lastline);//




⤈ Click to expand.
"); - } else { - content.set(i,""); - } - if (!articleJavascriptIncluded) { - List articlejs = Files.readAllLines(Paths.get(REFDIR,"article.js")); - for (int j=articlejs.size()-1;j>=0;j--) { - content.add(i,articlejs.get(j)); + if (!articleJavascriptIncluded) { + List articlejs = Files.readAllLines(Paths.get(REFDIR,"article.js")); + for (int j=articlejs.size()-1;j>=0;j--) { + content.add(i,articlejs.get(j)); + } + articleJavascriptIncluded=true; } - articleJavascriptIncluded=true; } } } diff --git a/sitefiles/sig.css b/sitefiles/sig.css index bd1cb8c..066eaae 100644 --- a/sitefiles/sig.css +++ b/sitefiles/sig.css @@ -13,16 +13,16 @@ a:hover{ font-size:0.8em; } - a.nounderline:link{ - text-decoration:none; - } +a.nounderline:link{ + text-decoration:none; +} - a.nounderline:visited{ - text-decoration:none; - } - a.nounderline:hover{ - text-decoration:none; - } +a.nounderline:visited{ + text-decoration:none; +} +a.nounderline:hover{ + text-decoration:none; +} h2{ font-size:3em; @@ -439,4 +439,9 @@ textarea:disabled{ .toolbarItem:hover{ background-color:#a1a1a1; cursor:pointer; +} +.contentWrapper .reallink{ + font-size:1.7em; + text-decoration: none; + color:white; } \ No newline at end of file