Jacek Kowalski
2019-06-21 f6f79198b6467435fd7caccd2067eb0a29c97787
Move mapping creation to a function in lib/output.php
3 files modified
42 ■■■■ changed files
lib/output.php 17 ●●●●● patch | view | raw | blame | history
parse.php 11 ●●●●● patch | view | raw | blame | history
regenerate.php 14 ●●●● patch | view | raw | blame | history
lib/output.php
@@ -1,4 +1,21 @@
<?php
function createMapping($db, $mapFunction, $saveConfig = FALSE) {
    $mapping = [];
    foreach($db->getAll() as $vehicle) {
        $mapping[$vehicle['id']] = $mapFunction($vehicle['num']);
    }
    if($saveConfig) {
        $json = json_encode($mapping);
        if(!file_put_contents($saveConfig['result_temp'], $json)) {
            throw new Exception('Result save failed');
        }
        rename($saveConfig['result_temp'], $saveConfig['result']);
    }
    return $mapping;
}
function createVehiclesList($trips, $mapping, $saveConfig = FALSE) {
    $lines = [];
    foreach($trips as $trip) {
parse.php
@@ -82,16 +82,7 @@
        
        $db->addMapping($mapping);
        
        $jsonContent = [];
        foreach($db->getAll() as $vehicle) {
            $jsonContent[$vehicle['id']] = $source['mapper']($vehicle['num']);
        }
        $json = json_encode($jsonContent);
        if(!file_put_contents($source['result_temp'], $json)) {
            throw new Exception('Result save failed');
        }
        rename($source['result_temp'], $source['result']);
        createMapping($db, $source['mapper'], $source);
        
        
        $logger->info('Creating vehicle list...');
regenerate.php
@@ -1,6 +1,7 @@
<?php
require_once(__DIR__.'/vendor/autoload.php');
require_once(__DIR__.'/lib/database.php');
require_once(__DIR__.'/lib/output.php');
require_once(__DIR__.'/lib/vehicle_types.php');
require_once(__DIR__.'/config.php');
@@ -8,19 +9,8 @@
    $logger = new Monolog\Logger('regenerate_'.$name);
    try {
        $logger->info('Regenerating '.$name.'...');
        $db = new Database($source['database']);
        $jsonContent = [];
        foreach($db->getAll() as $vehicle) {
            $jsonContent[$vehicle['id']] = $source['mapper']($vehicle['num']);
        }
        $json = json_encode($jsonContent);
        if(!file_put_contents($source['result_temp'], $json)) {
            throw new Exception('Result save failed');
        }
        rename($source['result_temp'], $source['result']);
        createMapping($db, $source['mapper'], $source);
        $logger->info('Finished');
    } catch(Throwable $e) {
        $logger->error($e->getMessage(), ['exception' => $e, 'exception_string' => (string)$e]);