Fix bug where parent directory is omitted

.gitignore

@@ -3,3 +3,4 @@ php/psalm.xml
 php/vendor
 
 php.log
+config.json

config.default.json

@@ -0,0 +1,6 @@
+{
+	"ROOT_URL": "http://localhost/",
+	"ROOT_DIR": "/var/www/html/",
+	"IMG_DIR": "img/",
+	"THUMBNAIL_DIR": "thumbnails/"
+}

php/cors.php

@@ -0,0 +1,40 @@
+<?php
+include_once __DIR__ . "/logging.php";
+/**
+ *  An example CORS-compliant method.  It will allow any GET, POST, or OPTIONS requests from any
+ *  origin.
+ *
+ *  In a production environment, you probably want to be more restrictive, but this gives you
+ *  the general idea of what is involved.  For the nitty-gritty low-down, read:
+ *
+ *  - https://developer.mozilla.org/en/HTTP_access_control
+ *  - https://fetch.spec.whatwg.org/#http-cors-protocol
+ *
+ */
+function cors() {
+
+    // Allow from any origin
+    if (isset($_SERVER['HTTP_ORIGIN'])) {
+		log_print("HTTP_ORIGIN: ".$_SERVER['HTTP_ORIGIN']);
+        // Decide if the origin in $_SERVER['HTTP_ORIGIN'] is one
+        // you want to allow, and if so:
+		#if ($_SERVER['HTTP_ORIGIN'] !== 'http://app1.localhost') return;
+        header("Access-Control-Allow-Origin: {$_SERVER['HTTP_ORIGIN']}");
+        header('Access-Control-Allow-Credentials: true');
+        header('Access-Control-Max-Age: 86400');    // cache for 1 day
+    }
+    
+    // Access-Control headers are received during OPTIONS requests
+    if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
+        
+        if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD']))
+            // may also be using PUT, PATCH, HEAD etc
+            header("Access-Control-Allow-Methods: GET, POST, OPTIONS");
+        
+        if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']))
+            header("Access-Control-Allow-Headers: {$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']}");
+    
+        exit(0);
+    }
+}
+?>

php/get.php

@@ -1,10 +1,13 @@
 <?php
 include_once __DIR__ . "/logging.php";
+include_once __DIR__ . "/cors.php";
+cors();
 
-define("ROOT_URL", "http://localhost/");
-define("ROOT_DIR", "/var/www/localhost/");
-define("IMG_DIR", "img/");
-define("THUMBNAIL_DIR", "thumbnails/");
+$config_data = get_config();
+define("ROOT_URL", $config_data["ROOT_URL"]);
+define("ROOT_DIR", $config_data["ROOT_DIR"]);
+define("IMG_DIR", $config_data["IMG_DIR"]);
+define("THUMBNAIL_DIR", $config_data["THUMBNAIL_DIR"]);
 define("THUMBNAIL_SCRIPT", __DIR__ . "/../scripts/resize-img");
 
 define("IMAGE_EXTENSIONS", [
@@ -24,8 +27,6 @@ define("VIDEO_EXTENSIONS", [
 
 define("FILE_EXTENSIONS", array_merge(IMAGE_EXTENSIONS, VIDEO_EXTENSIONS));
 
-main();
-
 function main(): void {
 	$data = json_decode(file_get_contents('php://input'), true);
 	$array = [];
@@ -37,20 +38,23 @@ function main(): void {
 	foreach (scandir($directory) as $file) {
 		if ($file === ".") continue;
 		if ($category === "" && $file === "..") continue;
+		if (substr($file, 0, 1) === "." && $file !== "..") continue;
 
 		$path = add_seperator_ab("/", $category, $file);
 		$is_dir = is_dir(ROOT_DIR.IMG_DIR.$path);
 		if (!$is_dir && !is_valid_file_type($file)) continue;
 
+		$url = ROOT_URL.IMG_DIR.$path;
+		$thumbnail_url = null;
+
+		if (!$is_dir) {
+			$thumbnail_url = create_thumbnail($category, $file);
+		}
+
 		$file_item = [];
 		$file_item["is_dir"] = $is_dir;
-		if ($is_dir) {
-			$file_item["url"] = ROOT_URL.IMG_DIR.$path;
-			$file_item["thumbnail_url"] = null;
-		} else {
-			$file_item["url"] = ROOT_URL.IMG_DIR.$path;
-			$file_item["thumbnail_url"] = create_thumbnail($category, $file);
-		}
+		$file_item["url"] = $url;
+		$file_item["thumbnail_url"] = $thumbnail_url;
 		array_push($array, $file_item);
 	}
 
@@ -63,11 +67,15 @@ function create_thumbnail(string $category, string $file): string | null {
 
 	$path = add_seperator_ab("/", $category, $file);
 	$original_file = ROOT_DIR.IMG_DIR.$path;
-	$thumbnail_directory = ROOT_DIR.THUMBNAIL_DIR.IMG_DIR.add_seperator_ab("/", $category, "");
-	$thumbnail_file = $thumbnail_directory.$file;
+	# use fast hashing algo, see: https://github.com/Cyan4973/xxHash
+	$hash = hash_file("xxh3", $original_file);
+
+	$thumbnail_directory = ROOT_DIR.THUMBNAIL_DIR;
+	$thumbnail_name = "$hash.jpg";
+	$thumbnail_file = $thumbnail_directory.$thumbnail_name;
 
 	if (file_exists($thumbnail_file)) {
-		log_print("$thumbnail_file exists, skipping gneeration");
+		log_print("thumbnail for $original_file exists, skipping generation");
 		goto return_thumbnail;
 	}
 
@@ -78,16 +86,17 @@ function create_thumbnail(string $category, string $file): string | null {
 		log_error($e->getMessage());
 	}
 
-	log_print(THUMBNAIL_SCRIPT." '$original_file' '$thumbnail_file'");
+	log_print("generating thumbnail for $original_file");
 	$output = shell_exec(THUMBNAIL_SCRIPT." '$original_file' '$thumbnail_file' 2>&1");
-	log_print($output);
-	if ($output === false) {
+	if ($output) log_print($output);
+	if (substr_count(strtolower((string) $output), "error")) {
 		log_error("Thumbnail failed");
+		log_print(ROOT_URL.IMG_DIR.$path);
 		return ROOT_URL.IMG_DIR.$path;
 	}
 
 	return_thumbnail:
-	return ROOT_URL.THUMBNAIL_DIR.IMG_DIR.$path;
+	return ROOT_URL.THUMBNAIL_DIR.$thumbnail_name;
 }
 
 function add_seperator_ab(string $separator, string $a, string $b): string {
@@ -108,5 +117,41 @@ function is_image_file_type(string $filename): bool {
 	}
 	return false;
 }
-?>
 
+function get_config(): array {
+	$config_data = file_exists(__DIR__ . "/../config.json") ?
+		json_decode(file_get_contents(__DIR__ . "/../config.json"), true) : null;
+
+	if (!is_valid_config_data($config_data)) {
+		log_error("Config invalid, falling back to default. Please check config.json");
+
+		$config_data = json_decode(file_get_contents(__DIR__ . "/../config.default.json"), true);
+		if (!is_valid_config_data($config_data))
+			log_error("Default config invalid. Please check or create config.json");
+	}
+	return $config_data;
+}
+
+
+function is_valid_config_data(?array $data): bool {
+	if (!$data) return false;
+	$keys = ["ROOT_URL", "ROOT_DIR", "IMG_DIR", "THUMBNAIL_DIR"];
+	foreach ($keys as $key) {
+		if (!isset($data[$key])) return false;
+		switch ($key) {
+		case "ROOT_URL":
+		case "THUMBNAIL_DIR":
+			break;
+		case "ROOT_DIR":
+			if (!is_dir($data[$key])) return false;
+			break;
+		case "IMG_DIR":
+			if (!is_dir($data["ROOT_DIR"].$data[$key])) return false;
+			break;
+		}
+	}
+	return true;
+}
+
+main();
+?>

scripts/resize-img

@@ -4,15 +4,12 @@ import sys
 
 
 def main():
-    target_width = 2048
-
     argn = len(sys.argv)
-
     if argn == 1:
-        print("You must specify an input file")
+        print_error("You must specify an input file")
         exit(1)
     elif argn == 2:
-        print("You must specify an output file")
+        print_error("You must specify an output file")
         exit(1)
 
     input_image_path = sys.argv[1]
@@ -21,10 +18,12 @@ def main():
     try:
         image = Image.open(input_image_path)
     except IOError:
-        print(f"Cannot open image file {input_image_path}")
+        print_error(f"Cannot open image file {input_image_path}")
+        image.close()
         exit(1)
 
     width, height = image.size
+    target_width = int(max(width/2, 1280))
     new_height = int(target_width * height / width)
 
     image = image.resize((target_width, new_height), Image.Resampling.BICUBIC)
@@ -37,10 +36,15 @@ def main():
     try:
         image.save(output_image_path, **kwargs)
     except IOError:
-        print(f"Cannot save file {output_image_path}")
+        print_error(f"Cannot save file {output_image_path}")
+        image.close()
         exit(1)
 
 
+def print_error(string):
+    print(f"resize-img Error: {string}")
+
+
 def rotate_image(image):
     exif = image.getexif()
     if exif is None: