Require .json.md extension for compound pages

Author: Ragnis

lib/gitdata/compound.php

@@ -27,7 +27,7 @@ public static function load ($paths)
 		{
 			$ret = null;
 
-			if (substr($paths[$i], -3) === '.md')
+			if (substr($paths[$i], -8) === '.json.md')
 			{
 				$ret = self::load_compound($paths[$i]);
 			}

lib/gitdata/models/page.php

@@ -64,7 +64,7 @@ public function __construct ($compound)
 
 		if (isset($compound->info->_filename))
 		{
-			$this->permalink .= '/' . preg_replace('/\..*$/', '', $compound->info->_filename);
+			$this->permalink .= '/' . preg_replace('/\.json\.md$/', '', $compound->info->_filename);
 		}
 
 		if ($compound->content)
@@ -90,10 +90,11 @@ public function __construct ($compound)
 	public static function find_by_path ($path)
 	{
 		$path = preg_replace('/^\//', '', $path);
+		$path = preg_replace('/\/$/', '', $path);
+
 		$compound = \GitData\Compound::load(array(
 			'pages/' . $path . '/info.json',
-			'pages/' . $path . '/content.md',
-			'pages/' . $path . '.md'
+			'pages/' . $path . '.json.md'
 		));
 
 		if ($compound)
@@ -147,6 +148,12 @@ private static function get_blog_index_by_year ($year)
 		git_tree_walk($tree, GIT_TREEWALK_PRE, function ($_1, $entry, &$index) use ($year)
 		{
 			$path = 'blog/' . $year . '/' . git_tree_entry_name($entry);
+
+			if (substr($path, -8) === '.json.md')
+			{
+				$path = substr($path, 0, -8);
+			}
+
 			$page = Page::find_by_path($path);
 
 			if ($page)

lib/gitdata/models/wiki_page.php

@@ -52,11 +52,12 @@ public function __construct ($compound)
 			$this->toc = $compound->content->get_toc();
 		}
 
-		$this->permalink = preg_replace('/^wiki/', '', $compound->info->_basedir);
+		$this->permalink = preg_replace('/^wiki/', '/', $compound->info->_basedir);
+		$this->permalink = preg_replace('/[\/]+/', '/', $this->permalink);
 
-		if (isset($info->_filename))
+		if (isset($compound->info->_filename))
 		{
-			$this->permalink .= preg_replace('/\..*$/', '', $compound->info->_filename);
+			$this->permalink .= preg_replace('/\.json\.md$/', '', $compound->info->_filename);
 		}
 
 		$this->github_history_url = 'https://github.com/axr/website-data';
@@ -84,7 +85,7 @@ public static function find_by_path ($path)
 		$path = preg_replace('/^\//', '', $path);
 		$compound = \GitData\Compound::load(array(
 			'wiki/' . $path . '/info.json',
-			'wiki/' . $path . '.md'
+			'wiki/' . $path . '.json.md'
 		));
 
 		if ($compound)
@@ -119,7 +120,7 @@ public static function list_all ($path)
 			}
 
 			$item = preg_replace('/[\/]+/', '/', $path . '/' . $entry_name);
-			$item = preg_replace('/(^\/|\.md$)/', '', $item);
+			$item = preg_replace('/(^\/|(\.json)?\.md$)/', '', $item);
 
 			$page = WikiPage::find_by_path($item);
 
@@ -166,8 +167,7 @@ public static function tree_entry_is_category ($entry)
 			$filemode = git_tree_entry_filemode($entry);
 			$name = git_tree_entry_name($entry);
 
-			if ($filemode == GIT_FILEMODE_BLOB &&
-				substr($name, -4) == '.md' && $name != 'content.md')
+			if ($filemode == GIT_FILEMODE_BLOB && substr($name, -8) == '.json.md')
 			{
 				$ret = true;
 				return -1;