From c8cf1edaf4fbc369dfa864fe2e43308c682544af Mon Sep 17 00:00:00 2001 From: salam Date: Thu, 6 Aug 2026 15:47:30 +0200 Subject: [PATCH] wip --- app/Console/Commands/Grap.php | 118 +++++++++--------- .../Grapper/Sofascore/Helper/SetStorage.php | 25 ++-- .../Commands/Grapper/Sofascore/MakeExcel.php | 16 +-- 3 files changed, 83 insertions(+), 76 deletions(-) diff --git a/app/Console/Commands/Grap.php b/app/Console/Commands/Grap.php index 35127817..fe97c638 100644 --- a/app/Console/Commands/Grap.php +++ b/app/Console/Commands/Grap.php @@ -33,18 +33,19 @@ class Grap extends Command self::$options['base_url'] = 'https://www.sofascore.com/'; if (! self::$options['id']) { - $txt = 'PARAMETERS'.PHP_EOL; - $txt .= '--d debug'.PHP_EOL; - $txt .= '--r restart range'.PHP_EOL; - $txt .= '--f force'.PHP_EOL; - $txt .= '--folder'.PHP_EOL; - $txt .= '-----------------------------------------------------------'.PHP_EOL; - $txt .= 'FUNCTION'.PHP_EOL; - $txt .= ' 1 grapper daily & subDays ( default 3)'.PHP_EOL; - $txt .= ' 2 grapper date'.PHP_EOL; - $txt .= ' 3 grapper range'.PHP_EOL; - $txt .= ' 4 grapper rose'.PHP_EOL; - $txt .= ' 5 playeer/season'.PHP_EOL; + $txt = 'PARAMETERS' . PHP_EOL; + $txt .= '--d debug' . PHP_EOL; + $txt .= '--r restart range' . PHP_EOL; + $txt .= '--f force' . PHP_EOL; + $txt .= '--folder' . PHP_EOL; + $txt .= '-----------------------------------------------------------' . PHP_EOL; + $txt .= 'FUNCTION' . PHP_EOL; + $txt .= ' 1 grapper daily & subDays ( default 3)' . PHP_EOL; + $txt .= ' 2 grapper date' . PHP_EOL; + $txt .= ' 3 grapper range' . PHP_EOL; + $txt .= ' 4 grapper rose' . PHP_EOL; + $txt .= ' 5 make ecxel from folder' . PHP_EOL; + $txt .= ' 5 playeer/season' . PHP_EOL; // $txt .= " 1\tPlayerPerSeason".PHP_EOL; // $txt .= " 1\tPlayerPerSeason".PHP_EOL; // $txt .= " 1\tPlayerPerSeason".PHP_EOL; @@ -52,7 +53,7 @@ class Grap extends Command Notice::note($txt, 'b', 1); } - Notice::note('Id '.self::$options['id'], 'bb'); + Notice::note('Id ' . self::$options['id'], 'bb'); sleep(2); switch (self::$options['id']) { @@ -70,65 +71,70 @@ class Grap extends Command break; case 5: + SetStorage::set(5); + + MakeExcel::create(); + break; + case 6: PlayerPerSeason::run(); break; - // case 2: - // SetStorage::set(); + // case 2: + // SetStorage::set(); - // Grapper::load(2); - // break; - // case 3: - // SetStorage::set(); + // Grapper::load(2); + // break; + // case 3: + // SetStorage::set(); - // Grapper::load(3); - // break; - // case 4: - // SetStorage::set(); + // Grapper::load(3); + // break; + // case 4: + // SetStorage::set(); - // Grapper::load(4); - // break; - // case 5: + // Grapper::load(4); + // break; + // case 5: - // PlayerPerSeason::run(); - // break; + // PlayerPerSeason::run(); + // break; - // case 6: + // case 6: - // SettingsToLocal::run(); - // break; + // SettingsToLocal::run(); + // break; - // case 7: + // case 7: - // SetStorage::set(); - // MakeExcel::create(); - // break; + // SetStorage::set(); + // MakeExcel::create(); + // break; - // case 'zip': - // self::setStorage(); - // ZipFolder::create(); - // break; + // case 'zip': + // self::setStorage(); + // ZipFolder::create(); + // break; - // case 'mail': - // self::setStorage(); - // SendMail::run(); - // break; + // case 'mail': + // self::setStorage(); + // SendMail::run(); + // break; - // case 'rose': - // self::setStorage(); - // Rose::run(); - // break; + // case 'rose': + // self::setStorage(); + // Rose::run(); + // break; - // case 'sql_mover': - // SqlMover::run(); - // break; + // case 'sql_mover': + // SqlMover::run(); + // break; - // case 'torunament_teams': - // TournamentTeams::get(); - // break; + // case 'torunament_teams': + // TournamentTeams::get(); + // break; - // case 'set_to_production': - // SettingsToProduction::run(); - // break; + // case 'set_to_production': + // SettingsToProduction::run(); + // break; default: Notice::note('function not implemented yet', 'br', 1); diff --git a/app/Console/Commands/Grapper/Sofascore/Helper/SetStorage.php b/app/Console/Commands/Grapper/Sofascore/Helper/SetStorage.php index 82064282..78a20b14 100644 --- a/app/Console/Commands/Grapper/Sofascore/Helper/SetStorage.php +++ b/app/Console/Commands/Grapper/Sofascore/Helper/SetStorage.php @@ -20,31 +20,30 @@ class SetStorage // must be connectet to task for activated ligas $task = SofaScoreTask::where('id', $task_id)->first(); - $sofascore_data = storage_path('sofascore_data').'/'; + $sofascore_data = storage_path('sofascore_data') . '/'; if ($task) { $storage_name = Strings::clean($task->name); switch ($task->id) { case 1: - Grap::$storage = $sofascore_data.$storage_name; + Grap::$storage = $sofascore_data . $storage_name; Grap::$folder = Carbon::now()->subDays($day)->format('Y-m-d'); break; case 2: - Grap::$storage = $sofascore_data.$storage_name.'/'.$task->day_from; - Grap::$zipfile = $sofascore_data.$storage_name.'/'.$task->day_from.'.zip'; + Grap::$storage = $sofascore_data . $storage_name . '/' . $task->day_from; + Grap::$zipfile = $sofascore_data . $storage_name . '/' . $task->day_from . '.zip'; break; case 3: - Grap::$storage = $sofascore_data.$storage_name.'-'.$task->day_from.'-'.$task->day_to; - Grap::$zipfile = $sofascore_data.$storage_name.'-'.$task->day_from.'-'.$task->day_to.'.zip'; + Grap::$storage = $sofascore_data . $storage_name . '-' . $task->day_from . '-' . $task->day_to; + Grap::$zipfile = $sofascore_data . $storage_name . '-' . $task->day_from . '-' . $task->day_to . '.zip'; break; case 4: - Grap::$storage = $sofascore_data.$storage_name.'/rosa-'.Carbon::now()->format('Y-m-d'); - Grap::$zipfile = $sofascore_data.$storage_name.'/rosa-'.Carbon::now()->format('Y-m-d').'.zip'; + Grap::$storage = $sofascore_data . $storage_name . '/rosa-' . Carbon::now()->format('Y-m-d'); + Grap::$zipfile = $sofascore_data . $storage_name . '/rosa-' . Carbon::now()->format('Y-m-d') . '.zip'; break; - - default: - Grap::$storage = $sofascore_data.$storage_name; - Grap::$zipfile = $sofascore_data.$storage_name.'/archive.zip'; + case 5: + Grap::$storage = $sofascore_data; + Grap::$folder = $folder; break; } } elseif ($folder) { @@ -53,7 +52,7 @@ class SetStorage } if ($debug) { - Notice::note("Task: $task->name\n".'Storage: '.Grap::$storage."\nFolder: ".Grap::$folder); + Notice::note("Task: $task->name\n" . 'Storage: ' . Grap::$storage . "\nFolder: " . Grap::$folder); sleep(2); } } diff --git a/app/Console/Commands/Grapper/Sofascore/MakeExcel.php b/app/Console/Commands/Grapper/Sofascore/MakeExcel.php index 05d2f270..7ecfce01 100644 --- a/app/Console/Commands/Grapper/Sofascore/MakeExcel.php +++ b/app/Console/Commands/Grapper/Sofascore/MakeExcel.php @@ -23,10 +23,10 @@ class MakeExcel $debug = Nuh::$options['d'] ?? 0; if ($debug) { - Notice::note('Make Excel folder to import: '.Grap::$folder."\nmaximum files in excel: ".self::$max, 'b'); + Notice::note('Make Excel folder to import: ' . Grap::$folder . "\nmaximum files in excel: " . self::$max, 'b'); } - $files = ReadDir::get_tree(Grap::$storage.'/'.Grap::$folder); + $files = ReadDir::get_tree(Grap::$storage . '/' . Grap::$folder); $files = array_chunk(FileType::filter($files), self::$max); @@ -49,7 +49,7 @@ class MakeExcel $to = $key * self::$max + $has; } - $filename = Grap::$folder.'-'.$from.'-'.$to.'.xlsx'; + $filename = Grap::$folder . '-' . $from . '-' . $to . '.xlsx'; $spreadsheet = new Spreadsheet; $spreadsheet->getProperties()->setTitle($filename); $activeWorksheet = $spreadsheet->getActiveSheet(); @@ -62,18 +62,20 @@ class MakeExcel $arr = explode(PHP_EOL, $json_string); $row = 0; - foreach ($arr as $val) { + foreach ($arr as $string) { $row++; - $activeWorksheet->setCellValue([$column, $row], $val); + $replacedString = preg_replace("/\\\\u([0-9abcdef]{4})/", "&#x$1;", $string); + $utf8string = mb_convert_encoding($replacedString, 'UTF-8', 'HTML-ENTITIES'); + $activeWorksheet->setCellValue([$column, $row], $utf8string); } $column++; } $spreadsheet->setActiveSheetIndex(0); $writer = IOFactory::createWriter($spreadsheet, 'Xlsx'); - $writer->save(Grap::$storage.'/'.$filename); + $writer->save(Grap::$storage . '/' . $filename); - self::$filesToMail[] = Grap::$storage.'/'.$filename; + self::$filesToMail[] = Grap::$storage . '/' . $filename; } } }