From 7b473ba06fb4aad1829b7fb095ca1b6751308ef1 Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Sun, 17 Nov 2013 13:02:41 +0100
Subject: [PATCH] Low-level refactor to core.php

---
 config.ini                         |  1 -
 lib/chibi-core                     |  2 +-
 public_html/dispatch.php           |  3 +--
 scripts/find-posts.php             |  1 -
 scripts/process-detached-files.php | 10 ++++----
 src/Views/layout-normal.phtml      |  2 +-
 src/core.php                       | 39 +++++-------------------------
 7 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/config.ini b/config.ini
index b7b3d13f..dcd60ff6 100644
--- a/config.ini
+++ b/config.ini
@@ -1,5 +1,4 @@
 [chibi]
-userCodeDir=./src/
 prettyPrint=1
 
 [main]
diff --git a/lib/chibi-core b/lib/chibi-core
index 0ec5cbda..bf824e78 160000
--- a/lib/chibi-core
+++ b/lib/chibi-core
@@ -1 +1 @@
-Subproject commit 0ec5cbda4b34f6273e2e02196cf6c16379623bb3
+Subproject commit bf824e781c520a85a82394622a5fefd5c178379f
diff --git a/public_html/dispatch.php b/public_html/dispatch.php
index f43c0e39..40413c81 100644
--- a/public_html/dispatch.php
+++ b/public_html/dispatch.php
@@ -1,7 +1,6 @@
 <?php
 chdir('..');
 require_once 'src/core.php';
-require_once 'src/Bootstrap.php';
 
 $query = $_SERVER['REQUEST_URI'];
-\Chibi\Facade::run($query, configFactory(), new Bootstrap());
+\Chibi\Facade::run($query, new Bootstrap());
diff --git a/scripts/find-posts.php b/scripts/find-posts.php
index 0744c735..ab2b3678 100644
--- a/scripts/find-posts.php
+++ b/scripts/find-posts.php
@@ -1,6 +1,5 @@
 <?php
 require_once __DIR__ . '/../src/core.php';
-\Chibi\Registry::setConfig(configFactory());
 
 function usage()
 {
diff --git a/scripts/process-detached-files.php b/scripts/process-detached-files.php
index 726078c6..652ff148 100644
--- a/scripts/process-detached-files.php
+++ b/scripts/process-detached-files.php
@@ -1,5 +1,6 @@
 <?php
 require_once __DIR__ . '/../src/core.php';
+$config = \Chibi\Registry::getConfig();
 
 function usage()
 {
@@ -30,23 +31,23 @@ switch ($action)
 			mkdir($dir, 0755, true);
 		if (!is_dir($dir))
 			die($dir . ' is not a dir' . PHP_EOL);
-		$func = function($name) use ($dir)
+		$func = function($name) use ($dir, $config)
 		{
 			echo $name . PHP_EOL;
 			static $filesPath = null;
 			if ($filesPath == null)
-				$filesPath = configFactory()->main->filesPath;
+				$filesPath = $config->main->filesPath;
 			rename($filesPath . DS . $name, $dir . DS . $name);
 		};
 		break;
 
 	case '-purge':
-		$func = function($name) use ($dir)
+		$func = function($name) use ($dir, $config)
 		{
 			echo $name . PHP_EOL;
 			static $filesPath = null;
 			if ($filesPath == null)
-				$filesPath = configFactory()->main->filesPath;
+				$filesPath = $config->main->filesPath;
 			unlink($filesPath . DS . $name);
 		};
 		break;
@@ -62,7 +63,6 @@ foreach (R::findAll('post') as $post)
 }
 $names = array_flip($names);
 
-$config = configFactory();
 $filesPath = $config->main->filesPath;
 foreach (glob($filesPath . DS . '*') as $name)
 {
diff --git a/src/Views/layout-normal.phtml b/src/Views/layout-normal.phtml
index 7536d9dc..92b5478f 100644
--- a/src/Views/layout-normal.phtml
+++ b/src/Views/layout-normal.phtml
@@ -96,7 +96,7 @@
 
 		<footer>
 			<div class="main-wrapper">
-				<span>Load: <?php echo sprintf('%.05f', microtime(true) - trueStartTime()) ?>s</span>
+				<span>Load: <?php echo sprintf('%.05f', microtime(true) - $this->context->startTime) ?>s</span>
 				<span>Queries: <?php echo count(queryLogger()->getLogs()) ?></span>
 				<?php if ($this->config->misc->debugQueries): ?>
 					<pre class="debug"><?php echo join('<br>', array_map(function($x) { return preg_replace('/\s+/', ' ', $x); }, queryLogger()->getLogs())) ?></pre>
diff --git a/src/core.php b/src/core.php
index 55e3c1fb..87eb71ae 100644
--- a/src/core.php
+++ b/src/core.php
@@ -2,14 +2,7 @@
 define('SZURU_VERSION', '0.3.0');
 define('SZURU_LINK', 'http://github.com/rr-/szurubooru');
 
-function trueStartTime()
-{
-	static $time = null;
-	if ($time === null)
-		$time = microtime(true);
-	return $time;
-}
-trueStartTime();
+$startTime = microtime(true);
 
 $requiredExtensions = ['pdo', 'pdo_sqlite', 'gd', 'openssl'];
 foreach ($requiredExtensions as $ext)
@@ -24,38 +17,18 @@ define('DS', DIRECTORY_SEPARATOR);
 require_once __DIR__ . '/../lib/php-markdown/Michelf/Markdown.php';
 require_once __DIR__ . '/../lib/redbean/RedBean/redbean.inc.php';
 require_once __DIR__ . '/../lib/chibi-core/Facade.php';
-require_once __DIR__ . '/../lib/chibi-core/Registry.php';
 
-function configFactory()
-{
-	static $config = null;
+\Chibi\AutoLoader::init(__DIR__);
+\Chibi\Facade::init();
+$config = \Chibi\Registry::getConfig();
+$context = \Chibi\Registry::getContext();
+$context->startTime = $startTime;
 
-	if ($config === null)
-	{
-		$config = new \Chibi\Config();
-		$configPaths =
-		[
-			__DIR__ . DS . '../config.ini',
-			__DIR__ . DS . '../local.ini',
-		];
-		$configPaths = array_filter($configPaths, 'file_exists');
-
-		foreach ($configPaths as $path)
-		{
-			$config->loadIni($path);
-		}
-
-	}
-	return $config;
-}
-
-$config = configFactory();
 R::setup('sqlite:' . $config->main->dbPath);
 R::freeze(true);
 R::dependencies(['tag' => ['post'], 'favoritee' => ['post', 'user'], 'comment' => ['post', 'user']]);
 
 //wire models
-\Chibi\AutoLoader::init([__DIR__ . '/../' . $config->chibi->userCodeDir, __DIR__]);
 foreach (\Chibi\AutoLoader::getAllIncludablePaths() as $path)
 	if (preg_match('/Model/', $path))
 		\Chibi\AutoLoader::safeInclude($path);