13 changed files with 37 additions and 190 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
-output/
--- a/README.md
+++ b/README.md
@ -14,15 +14,9 @@ Synopsis: `isidore <command> [options]`

 Commands:

- `new [args] <dir>`: create a new project.
-  - `<dir>`: new project directory.
-  - `-i`: interactive mode.
- `build [args]`: build the website.
-  - `-j<n>`: number of jobs to run concurrently. With `0` it compiles all files
-    at once.
-  - `-v`: run with verbose output.
- `serve`, `server [args]`: run an HTTP server of the output (default port 8080).
-  - `-p <port>`: port number to bind server to.
+- `new <dir> <name>`: create a new project directory `<dir>` with project name
+  `<name>`.
+- `build`: build the website (default).
 - `clean`: cleans build files.
 - `help`: show help information.
 - `version`: show Isidore version number.
@ -53,7 +47,7 @@ please take a look at what needs to be done in the [roadmap](/ROADMAP.md), or
 check if there are any to-do comments in the code:

 ```bash
-grep "TODO" isidore.sh
+grep -r "TODO" src/
 ```

 ## License & Copyright
--- a/ROADMAP.md
+++ b/ROADMAP.md
@ -4,7 +4,7 @@
  - New project subcommand
  - Basic project compilation
 - v0.2
+  - Don't compile already compiled files
  - Multi-thread compiling
-  - Helper functions & variables
 - v0.3
  - Markdown support
--- a/example/.isidore-version
+++ b/example/.isidore-version
@ -1 +0,0 @@
-0.1.0
--- a/example/config.php
+++ b/example/config.php
@ -1,5 +0,0 @@
-<?php
-$site_name = "New Project";
-$site_author = "Nicolás A. Ortega Froysa";
-$site_url = "http://example.com/";
-?>
--- a/example/site/blog.html.php
+++ b/example/site/blog.html.php
@ -1,23 +0,0 @@
-<?php
-$title = "Blog";
-include("templates/header.html.php");
-?>
-
-<p>
-Welcome to my blog page! Here's a list of my current entries:
-</p>
-
-<ul>
-<?php
-foreach(glob("site/blog/*.cfg.php") as $i)
-{
-	include($i);
-	$entry_file = substr($i, 4, -8) . '.html';
-	echo "<li><a href='$entry_file'>$blog_date - $blog_title</a></li>";
-}
-?>
-</ul>
-
-<?php
-include("templates/footer.html.php");
-?>
--- a/example/site/blog/000-first.cfg.php
+++ b/example/site/blog/000-first.cfg.php
@ -1,4 +0,0 @@
-<?php
-$blog_title = "My First Post";
-$blog_date = "2022-11-07";
-?>
--- a/example/site/blog/000-first.html.php
+++ b/example/site/blog/000-first.html.php
@ -1,9 +0,0 @@
-<?php
-include("site/blog/000-first.cfg.php");
-$title = $blog_title;
-include("templates/header.html.php");
-?>
-<p>My first blog post.</p>
-<?php
-include("templates/footer.html.php");
-?>
--- a/example/site/index.html.php
+++ b/example/site/index.html.php
@ -1,10 +0,0 @@
-<?php
-$title = "Home";
-include("templates/header.html.php");
-?>
-<p>
-Hello, World! This is an example page.
-</p>
-<?php
-include("templates/footer.html.php");
-?>
--- a/example/site/static-file.txt
+++ b/example/site/static-file.txt
@ -1 +0,0 @@
-A test file.
--- a/example/templates/footer.html.php
+++ b/example/templates/footer.html.php
@ -1,2 +0,0 @@
-	</body>
-</html>
--- a/example/templates/header.html.php
+++ b/example/templates/header.html.php
@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title><?= $title ?> | <?= $site_name?></title>
-	</head>
-	<body>
-		<h1><?= $title ?></h1>
--- a/isidore.sh
+++ b/isidore.sh
@ -26,11 +26,6 @@ ISIDORE_AUTHOR_NAME=""
 PROG_NAME=$0
 PROJECT_NAME="Isidore"

-SOURCE_DIR="site/"
-OUTPUT_DIR="output/"
-TEMPLATE_DIR="templates/"
-PROJECT_CONFIG_FILE="config.php"
-
 ##
 # Create the configuration file. This function is called if it does not already
 # exist.
@ -92,11 +87,9 @@ function print_help()
 	print_usage
 	echo -e "\nCOMMANDS:
  new [-i] <dir>
-    Create a new Isidore project
-  build [-v] [-j<n>]
+    Create a new Isidore project (use interactive mode with '-i')
+  build
    Build the project rooted in the current directory
-  serve | server [-p <port>]
-    Serve a local HTTP server of the output directory
  clean
    Clean the built files
  version
@ -110,7 +103,7 @@ function print_help()
 ##
 function check_in_project()
 {
-	if ! [ -f "$PROJECT_CONFIG_FILE" ] || ! [ -f "./.isidore-version" ]
+	if ! [ -f "./config.php" ] || ! [ -f "./.isidore-version" ]
 	then
 		echo "ERROR: You are not currently in the root of an Isidore project."
 		exit 1
@ -128,9 +121,9 @@ function new_project()
 {
 	echo "$PROJECT_NAME v$ISIDORE_VERSION"

-	local NEW_PROJECT_DIR=$1
-	local NEW_PROJECT_NAME="New Project"
-	local NEW_PROJECT_URL="http://example.com/"
+	NEW_PROJECT_DIR=$1
+	NEW_PROJECT_NAME="New Project"
+	NEW_PROJECT_URL="http://example.com/"
 	if [ $2 == 1 ]
 	then
 		echo -n "Project name: "
@ -139,19 +132,19 @@ function new_project()
 		read NEW_PROJECT_URL
 	fi
 	mkdir $NEW_PROJECT_DIR
-	mkdir -p $NEW_PROJECT_DIR/$SOURCE_DIR
-	mkdir -p $NEW_PROJECT_DIR/$TEMPLATE_DIR
+	mkdir -p $NEW_PROJECT_DIR/site/
+	mkdir -p $NEW_PROJECT_DIR/templates/
 	echo \
 "<?php
 \$site_name = \"$NEW_PROJECT_NAME\";
 \$site_author = \"$ISIDORE_AUTHOR_NAME\";
 \$site_url = \"$NEW_PROJECT_URL\";
-?>" >> $NEW_PROJECT_DIR/$PROJECT_CONFIG_FILE
+?>" >> $NEW_PROJECT_DIR/config.php
 	echo "$ISIDORE_VERSION" > $NEW_PROJECT_DIR/.isidore-version

 	echo "New project created."
 	[ $2 == 0 ] &&
-		echo "Consider taking a look at the $NEW_PROJECT_DIR/$PROJECT_CONFIG_FILE file."
+		echo "Consider taking a look at the $NEW_PROJECT_DIR/config.php file."
 }

 ##
@ -160,76 +153,43 @@ function new_project()
 function clean_project()
 {
 	check_in_project
-	if [ -d "$OUTPUT_DIR" ]
+	if [ -d "./output/" ]
 	then
-		rm -r $OUTPUT_DIR
+		rm -r ./output/
 	fi
 	echo "Project cleaned."
 }

 ##
 # Build the project.
-#
-# Params:
-#  $1 - Verbose flag
-#  $2 - Maximum number of jobs to run
 ##
 function build_project()
 {
 	check_in_project

-	mkdir -p $OUTPUT_DIR
-
-	for i in $(find $SOURCE_DIR -type d)
+	mkdir -p ./output/
+	WORKDESK="/tmp/isidore-workdesk"
+	CFG_HEADER_FILE="$WORKDESK/config-header.php"
+	mkdir -p $WORKDESK
+	for i in $(find site/ -name '*.php')
 	do
-		mkdir -p $OUTPUT_DIR/${i:${#SOURCE_DIR}}
+		echo "<?php include getcwd() . '/config.php'; ?>" > $CFG_HEADER_FILE
+		mkdir -p $WORKDESK/${i%/*}
+		cat $CFG_HEADER_FILE $i > $WORKDESK/$i
+		# the 4 offset is to avoid including `site/`
+		: ${i:4}
+		OUT_DIR="./output/${_%/*}"
+		mkdir -p $OUT_DIR
+		: ${i: :-4}
+		OUT_FILE="$OUT_DIR/${_##*/}"
+		php $WORKDESK/$i > $OUT_FILE
 	done

-	# number of current jobs
-	local NUM_JOBS="\j"
-
-	for i in $(find site -type f -regextype posix-extended -not -regex '.*\.(cfg|CFG)\.(php|PHP)')
-	do
-		while (( $2 != 0 )) && (( ${NUM_JOBS@P} >= $2 ))
-		do
-			wait -n
-		done
-
-		# parallel block
-		(
-			if [[ $i =~ .*\.(php|PHP) ]]
-			then
-				: ${i:${#SOURCE_DIR}}
-				local OUT_FILE="$OUTPUT_DIR/${_: :-4}"
-				if [ $1 == 1 ]
-				then
-					echo "Building $OUT_FILE ..."
-				fi
-				cat $PROJECT_CONFIG_FILE $i | php > $OUT_FILE
-			else
-				local OUT_FILE="$OUTPUT_DIR/${i:${#SOURCE_DIR}}"
-				if [ $1 == 1 ]
-				then
-					echo "Copying $OUT_FILE ..."
-				fi
-				cp $i $OUT_FILE
-			fi
-		) &
-	done
-
-	# wait for jobs to finish
-	wait -n
+	rm -r $WORKDESK
 }

 set_config_vars

-if [ $# -lt 1 ]
-then
-	echo "No subcommand was specified. Use the 'help' subcommand."
-	print_usage
-	exit 1
-fi
-
 case $1 in
 	new)
 		if [ $# -lt 2 ]
@ -250,59 +210,15 @@ case $1 in
 					then
 						NEW_DIR="$i"
 					else
-						echo "Unknown argument for new '$i'. Use the 'help' subcommand."
+						echo "Unknown argument for new '$i'. Use the 'help' command."
 						print_usage
 						exit 1
-					fi;;
+					fi
 			esac
 		done
 		new_project $NEW_DIR $INTERACTIVE;;
 	build)
-		VERBOSE=0
-		JOBS=1
-		for i in ${@:2}
-		do
-			case $i in
-				-v)
-					VERBOSE=1;;
-				-j*)
-					if ! [[ "$i" =~ ^-j[0-9]+$ ]]
-					then
-						echo "Argument '$i' badly formatted. Should be '-j<n>' where <n> is a number."
-						print_usage
-						exit 1
-					fi
-					JOBS=${i:2};;
-				*)
-					echo "Unknown argument for build '$i'. Use the 'help' subcommand."
-					print_usage
-					exit 1;;
-			esac
-		done
-		build_project $VERBOSE $JOBS;;
-	serve|server)
-		PORT=8080
-		shift
-		while getopts "p:" opt
-		do
-			case $opt in
-				p)
-					if ! [[ "$OPTARG" =~ ^[0-9]+$ ]]
-					then
-						echo "Invalid port $OPTARG. Please enter a number."
-						exit 1
-					fi
-					PORT=$OPTARG;;
-				?)
-					echo "Invalid argument $OPTARG. Use the 'help' subcommand."
-					print_usage
-					exit 1;;
-				:)
-					echo "Option -$OPTARG requires an argument."
-					exit 1;;
-			esac
-		done
-		php -S localhost:$PORT -t $OUTPUT_DIR/;;
+		build_project;;
 	clean)
 		clean_project;;
 	help)
@ -310,7 +226,7 @@ case $1 in
 	version)
 		echo "$PROJECT_NAME v$ISIDORE_VERSION";;
 	*)
-		echo "Unknown command $1. Use the 'help' subcommand."
+		echo "Unknown command $1. Use the 'help' command."
 		print_usage
 		exit 1;;
 esac