salam/nuhodds_fi4
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
salam committed 2026-08-06 10:43:04 +02:00
1 parent 78917241ad
commit f098ba9b00
18 files changed
+244 -218
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Console/Commands/Grap.php
+53 -34
View File
@@ -6,6 +6,7 @@ use App\Console\Commands\Grapper\Sofascore\Grapper;
use App\Console\Commands\Grapper\Sofascore\Helper\SetStorage; use App\Console\Commands\Grapper\Sofascore\Helper\SetStorage;
use App\Console\Commands\Grapper\Sofascore\MakeExcel; use App\Console\Commands\Grapper\Sofascore\MakeExcel;
use App\Console\Commands\Grapper\Sofascore\PlayerPerSeason; use App\Console\Commands\Grapper\Sofascore\PlayerPerSeason;
use App\Console\Commands\Grapper\Sofascore\SendMail;
use App\Console\Commands\Grapper\Sofascore\SettingsToLocal; use App\Console\Commands\Grapper\Sofascore\SettingsToLocal;
use App\Utilities\Notice; use App\Utilities\Notice;
use Illuminate\Console\Command; use Illuminate\Console\Command;
@@ -20,63 +21,83 @@ class Grap extends Command
public static string $folder; public static string $folder;
public static $id = 0;
public static string $useragent = '4'; public static string $useragent = '4';
protected $signature = 'grp {id=0} {task=0} {--d} {--r} {--f}'; protected $signature = 'grp {id=0} {day=0} {--folder=} {--d} {--r} {--f}';
public function handle() public function handle()
{ {
self::$options = $this->options(); self::$options = $this->options();
self::$options['id'] = (int) $this->argument('id');
self::$options['task'] = $this->argument('task'); self::$options['day'] = (int) $this->argument('day');
self::$options['base_url'] = 'https://www.sofascore.com/'; self::$options['base_url'] = 'https://www.sofascore.com/';
$id = $this->argument('id'); if (! self::$options['id']) {
if (!$id) {
$txt = 'PARAMETERS'.PHP_EOL; $txt = 'PARAMETERS'.PHP_EOL;
$txt .= '--d debug'.PHP_EOL; $txt .= '--d debug'.PHP_EOL;
$txt .= '--r restart range'.PHP_EOL; $txt .= '--r restart range'.PHP_EOL;
$txt .= '--f force'.PHP_EOL; $txt .= '--f force'.PHP_EOL;
$txt .= '--folder'.PHP_EOL;
$txt .= '-----------------------------------------------------------'.PHP_EOL; $txt .= '-----------------------------------------------------------'.PHP_EOL;
$txt .= 'FUNCTION'.PHP_EOL; $txt .= 'FUNCTION'.PHP_EOL;
$txt .= " 1\tPlayerPerSeason" . PHP_EOL; $txt .= ' 1 grapper daily & subDays ( default 3)'.PHP_EOL;
$txt .= " 2\tSettingsToLocal" . PHP_EOL; $txt .= ' 2 grapper date'.PHP_EOL;
$txt .= '-----------------------------------------------------------' . PHP_EOL; $txt .= ' 3 grapper range'.PHP_EOL;
$txt .= 'TASK' . PHP_EOL; $txt .= ' 4 grapper rose'.PHP_EOL;
$txt .= " 1\tgrapper daily" . PHP_EOL; // $txt .= " 1\tPlayerPerSeason".PHP_EOL;
$txt .= " 2\tgrapper" . PHP_EOL; // $txt .= " 1\tPlayerPerSeason".PHP_EOL;
// $txt .= " 1\tPlayerPerSeason".PHP_EOL;
// $txt .= " 2\tSettingsToLocal".PHP_EOL;
Notice::note($txt, 'b', 1); Notice::note($txt, 'b', 1);
} }
switch ($id) { Notice::note('Id '.self::$options['id'], 'bb');
sleep(2);
switch (self::$options['id']) {
case 1: case 1:
Notice::note('PlayerPerSeason sleep 5', 'bb'); // SettingsToLocal::run();
sleep(5);
SetStorage::set(1);
// Grapper::load(1);
// MakeExcel::create();
SendMail::run(1);
PlayerPerSeason::run();
break; break;
// case 2:
// SetStorage::set();
case 2: // Grapper::load(2);
Notice::note('SettingsToLocal sleep 5', 'bb'); // break;
sleep(5); // case 3:
// SetStorage::set();
SettingsToLocal::run(); // Grapper::load(3);
break; // break;
// case 4:
// SetStorage::set();
case 3: // Grapper::load(4);
SetStorage::set(); // break;
Grapper::load(); // case 5:
break;
case 4: // PlayerPerSeason::run();
SetStorage::set(); // break;
MakeExcel::create();
break; // case 6:
// SettingsToLocal::run();
// break;
// case 7:
// SetStorage::set();
// MakeExcel::create();
// break;
// case 'zip': // case 'zip':
// self::setStorage(); // self::setStorage();
@@ -97,8 +118,6 @@ class Grap extends Command
// SqlMover::run(); // SqlMover::run();
// break; // break;
// case 'torunament_teams': // case 'torunament_teams':
// TournamentTeams::get(); // TournamentTeams::get();
// break; // break;
app/Console/Commands/Grapper/Sofascore/DaysTournament.php
+8 -9
View File
@@ -2,9 +2,9 @@
namespace App\Console\Commands\Grapper\Sofascore; namespace App\Console\Commands\Grapper\Sofascore;
use App\Console\Commands\Grap;
use App\Console\Commands\Grapper\Sofascore\Helper\CurlSofa; use App\Console\Commands\Grapper\Sofascore\Helper\CurlSofa;
use App\Console\Commands\Grapper\Sofascore\Helper\Sleeper; use App\Console\Commands\Grapper\Sofascore\Helper\Sleeper;
use App\Console\Commands\Grap;
use App\Models\Country; use App\Models\Country;
use App\Models\SofaScoreCategory; use App\Models\SofaScoreCategory;
use App\Models\SofaScoreDayTournament; use App\Models\SofaScoreDayTournament;
@@ -23,23 +23,21 @@ class DaysTournament
* Spa La Liga 15-08-2025 - 24-05-2026 * Spa La Liga 15-08-2025 - 24-05-2026
* Fra Liggue 15-08-2025 - 17-05-2026 * Fra Liggue 15-08-2025 - 17-05-2026
*/ */
public static function get(array $d) public static function get(string $day)
{ {
$debug = Grap::$options['d'] ?? 0; $debug = Grap::$options['d'] ?? 0;
$tournaments_counter = 0; $tournaments_counter = 0;
$sport_id = $d['sport_id']; $has = SofaScoreDayTournament::where('day', $day)->first();
$day = $d['day']; $sport = [];
$sport[1] = 'football';
$slug = $d['slug'];
$has = SofaScoreDayTournament::where('day', $day)->where('sport_id', $sport_id)->first();
foreach ($sport as $sport_id => $slug) {
if ($has) { if ($has) {
if ($debug) { if ($debug) {
Notice::note("Tournaments $day for " . strtoupper($slug) . " allready grapped", 'bb'); Notice::note("Tournaments $day for ".strtoupper($slug).' allready grapped', 'bb');
} }
} else { } else {
@@ -170,6 +168,7 @@ class DaysTournament
} }
} }
} }
}
if ($debug) { if ($debug) {
Notice::note('days tournament done', 'g'); Notice::note('days tournament done', 'g');
} }
app/Console/Commands/Grapper/Sofascore/Grapper.php
+24 -25
View File
@@ -3,20 +3,20 @@
namespace App\Console\Commands\Grapper\Sofascore; namespace App\Console\Commands\Grapper\Sofascore;
use App\Console\Commands\Grap; use App\Console\Commands\Grap;
use App\Utilities\Notice;
use Illuminate\Support\Carbon;
use App\Models\SofaScoreTaskDay;
use Illuminate\Support\Facades\File;
use App\Models\SofaScoreEventGrapped;
use App\Models\SofaScoreDayTournament;
use App\Models\SofaScoreTaskTournament;
use App\Console\Commands\Grapper\Sofascore\Helper\Sleeper;
use App\Console\Commands\Grapper\Sofascore\Helper\CurlSofa; use App\Console\Commands\Grapper\Sofascore\Helper\CurlSofa;
use App\Console\Commands\Grapper\Sofascore\Helper\LoadDays; use App\Console\Commands\Grapper\Sofascore\Helper\LoadDays;
use App\Console\Commands\Grapper\Sofascore\Helper\Sleeper;
use App\Models\SofaScoreDayTournament;
use App\Models\SofaScoreEventGrapped;
use App\Models\SofaScoreTaskDay;
use App\Models\SofaScoreTaskTournament;
use App\Utilities\Notice;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\File;
class Grapper class Grapper
{ {
public static function load() public static function load(int $task_id)
{ {
/** /**
* , JSON_PRETTY_PRINT * , JSON_PRETTY_PRINT
@@ -25,12 +25,12 @@ class Grapper
$debug = Grap::$options['d'] ?? 0; $debug = Grap::$options['d'] ?? 0;
$restart = Grap::$options['r'] ?? 0; $restart = Grap::$options['r'] ?? 0;
$force = Grap::$options['f'] ?? 0; $force = Grap::$options['f'] ?? 0;
$task_id = Grap::$options['task'] ?? 0;
if (!$task_id) if (! $task_id) {
Notice::note('task id missing', 'r', 1); Notice::note('task id missing', 'r', 1);
}
$days = LoadDays::load(); $days = LoadDays::load($task_id);
$count = 0; $count = 0;
@@ -39,18 +39,21 @@ class Grapper
/** /**
* daily restart always * daily restart always
*/ */
if ($task_id == 1) SofaScoreEventGrapped::where('grapper_id', $task_id)->delete(); if ($task_id == 1) {
SofaScoreEventGrapped::where('grapper_id', $task_id)->delete();
}
/** /**
* Restart RANGE call
* empty grapping folder * empty grapping folder
* empty mailing text * empty mail text
*/ */
if ($restart) { if ($restart) {
SofaScoreEventGrapped::where('grapper_id', $task_id)->delete(); SofaScoreEventGrapped::where('grapper_id', $task_id)->delete();
foreach ($days as $d) { foreach ($days as $day) {
SofaScoreTaskDay::where('grapper_id', (int) $task_id) SofaScoreTaskDay::where('grapper_id', (int) $task_id)
->where('day', $d['day']) ->where('day', $day)
->update(['done' => 0]); ->update(['done' => 0]);
} }
@@ -63,14 +66,12 @@ class Grapper
} }
} }
foreach ($days as $d) { foreach ($days as $day) {
DaysTournament::get($d); DaysTournament::get($day);
foreach ($active_tournaments as $tournament) { foreach ($active_tournaments as $tournament) {
$day = $d['day'];
if ($debug) { if ($debug) {
Notice::note('START '.$tournament->tournament->name, 'p'); Notice::note('START '.$tournament->tournament->name, 'p');
} }
@@ -218,12 +219,10 @@ class Grapper
$count++; $count++;
Notice::note($count . ' DAYS DONE', 'bb'); if ($debug) {
Notice::note($count.' days done', 'bb');
}
// if ($count > 20)
// Notice::note($count . ' DAYS DONE', 'br', 1);
// else
// Notice::note($count . ' DAYS DONE', 'bb');
} }
} }
} }
app/Console/Commands/Grapper/Sofascore/Helper/FileType.php
+19
View File
@@ -0,0 +1,19 @@
<?php
namespace App\Console\Commands\Grapper\Sofascore\Helper;
class FileType
{
public static function filter(array $files, string $type = 'json')
{
$filtered = [];
foreach ($files as $file) {
$path_parts = pathinfo($file);
if (isset($path_parts['extension']) && $path_parts['extension'] == $type) {
$filtered[] = $file;
}
}
return $filtered;
}
}
app/Console/Commands/Grapper/Sofascore/Helper/LoadDays.php
+10 -47
View File
@@ -2,28 +2,25 @@
namespace App\Console\Commands\Grapper\Sofascore\Helper; namespace App\Console\Commands\Grapper\Sofascore\Helper;
use App\Utilities\Notice;
use App\Console\Commands\Grap; use App\Console\Commands\Grap;
use App\Models\SofaScoreTask; use App\Models\SofaScoreTask;
use Illuminate\Support\Carbon;
use App\Models\SofaScoreTaskDay; use App\Models\SofaScoreTaskDay;
use App\Utilities\Notice;
use Illuminate\Support\Carbon;
class LoadDays class LoadDays
{ {
public static function load() public static function load(int $task_id)
{ {
$debug = Grap::$options['d'] ?? 0; $debug = Grap::$options['d'] ?? 0;
$restart = Grap::$options['restart'] ?? 0; $restart = Grap::$options['restart'] ?? 0;
$task_id = Grap::$options['task'] ?? 0;
$folder = Grap::$options['folder'] ?? 0;
$dates = []; $dates = [];
if (! $task_id) { if (! $task_id) {
Notice::note('no task id', 'br'); Notice::note('no task id', 'br');
return []; return [];
} }
@@ -36,32 +33,16 @@ class LoadDays
switch ($task->mode) { switch ($task->mode) {
case 'daily': case 'daily':
if ($folder) { $dates[] = ValidateDate::get(Grap::$folder);
$dates[] = [
'day' => $folder,
'slug' => $task->sport->ss_slug,
'sport_id' => $task->sport_id,
];
} else {
$dates[] = [
'day' => Carbon::now()->subDays(3)->format('Y-m-d'),
'slug' => $task->sport->ss_slug,
'sport_id' => $task->sport_id,
];
}
break; break;
case 'date': case 'date':
$dates[] = [ $dates[] = ValidateDate::get($task->day_from);
'day' => self::validateDate($task->day_from),
'slug' => $task->sport->ss_slug,
'sport_id' => $task->sport_id,
];
break; break;
case 'range': case 'range':
$from = self::validateDate($task->day_from); $from = ValidateDate::get($task->day_from);
$to = self::validateDate($task->day_to); $to = ValidateDate::get($task->day_to);
$from = Carbon::createFromDate($from); $from = Carbon::createFromDate($from);
$to = Carbon::createFromDate($to); $to = Carbon::createFromDate($to);
@@ -75,11 +56,7 @@ class LoadDays
if ($restart) { if ($restart) {
// get all days // get all days
while ($from <= $to) { while ($from <= $to) {
$dates[] = [ $dates[] = $from->format('Y-m-d');
'day' => $from->format('Y-m-d'),
'slug' => $task->sport->ss_slug,
'sport_id' => $task->sport_id,
];
$from->addDay(); $from->addDay();
} }
} else { } else {
@@ -89,11 +66,7 @@ class LoadDays
$res = SofaScoreTaskDay::firstOrNew(['grapper_id' => (int) $task_id, 'day' => $from->format('Y-m-d')]); $res = SofaScoreTaskDay::firstOrNew(['grapper_id' => (int) $task_id, 'day' => $from->format('Y-m-d')]);
if (! $res->done) { if (! $res->done) {
$dates[] = [ $dates[] = $from->format('Y-m-d');
'day' => $from->format('Y-m-d'),
'slug' => $task->sport->ss_slug,
'sport_id' => $task->sport_id,
];
} }
$from->addDay(); $from->addDay();
} }
@@ -110,16 +83,6 @@ class LoadDays
// remove when element in array is double (day and slug) // remove when element in array is double (day and slug)
$dates = array_unique($dates, SORT_REGULAR); $dates = array_unique($dates, SORT_REGULAR);
return $dates; return $dates;
} }
public static function validateDate(string $date)
{
if (Carbon::createFromDate($date) !== false) {
return $date;
} else {
Notice::note('Wrong date format', 'r', 1);
}
}
} }
app/Console/Commands/Grapper/Sofascore/Helper/SetStorage.php
+9 -4
View File
@@ -9,12 +9,16 @@ use Illuminate\Support\Carbon;
class SetStorage class SetStorage
{ {
public static function set() public static function set(int $task_id)
{ {
$task = Grap::$options['task'] ?? 1;
$debug = Grap::$options['d']; $debug = Grap::$options['d'];
$folder = Grap::$options['folder'] ?? ''; $folder = Grap::$options['folder'] ?? '';
$task = SofaScoreTask::where('id', $task)->first();
$day = Grap::$options['day'] == 0 ? 3 : Grap::$options['day'];
// 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) { if ($task) {
@@ -23,7 +27,7 @@ class SetStorage
switch ($task->id) { switch ($task->id) {
case 1: case 1:
Grap::$storage = $sofascore_data.$storage_name; Grap::$storage = $sofascore_data.$storage_name;
Grap::$folder = Carbon::now()->subDays(3)->format('Y-m-d'); Grap::$folder = Carbon::now()->subDays($day)->format('Y-m-d');
break; break;
case 2: case 2:
Grap::$storage = $sofascore_data.$storage_name.'/'.$task->day_from; Grap::$storage = $sofascore_data.$storage_name.'/'.$task->day_from;
@@ -50,6 +54,7 @@ class SetStorage
if ($debug) { 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);
} }
} }
} }
app/Console/Commands/Grapper/Sofascore/Helper/ValidateDate.php
+18
View File
@@ -0,0 +1,18 @@
<?php
namespace App\Console\Commands\Grapper\Sofascore\Helper;
use App\Utilities\Notice;
use Illuminate\Support\Carbon;
class ValidateDate
{
public static function get(string $date)
{
if (Carbon::createFromDate($date) !== false) {
return $date;
} else {
Notice::note('Wrong date format', 'r', 1);
}
}
}
app/Console/Commands/Grapper/Sofascore/Helper/ZipFolder.php
+6 -6
View File
@@ -2,28 +2,28 @@
namespace App\Console\Commands\Grapper\Sofascore\Helper; namespace App\Console\Commands\Grapper\Sofascore\Helper;
use App\Console\Commands\Grap;
use RecursiveDirectoryIterator; use RecursiveDirectoryIterator;
use RecursiveIteratorIterator; use RecursiveIteratorIterator;
use ZipArchive; use ZipArchive;
use App\Console\Commands\Grapper\Sofascore;
class ZipFolder class ZipFolder
{ {
public static function create() public static function create()
{ {
$zip = new ZipArchive(); $zip = new ZipArchive;
if ($zip->open(Sofascore::$zipfile, ZipArchive::CREATE | ZipArchive::OVERWRITE) === true) { if ($zip->open(Grap::$zipfile, ZipArchive::CREATE | ZipArchive::OVERWRITE) === true) {
if (is_dir(Sofascore::$storage)) { if (is_dir(Grap::$storage)) {
$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(Sofascore::$storage)); $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(Grap::$storage));
foreach ($files as $file) { foreach ($files as $file) {
if (! $file->isDir()) { if (! $file->isDir()) {
$filePath = $file->getRealPath(); $filePath = $file->getRealPath();
$relativePath = substr($filePath, strlen(Sofascore::$storage) + 1); $relativePath = substr($filePath, strlen(Grap::$storage) + 1);
$zip->addFile($filePath, $relativePath); $zip->addFile($filePath, $relativePath);
} }
} }
app/Console/Commands/Grapper/Sofascore/MakeExcel.php
+6 -19
View File
@@ -3,7 +3,7 @@
namespace App\Console\Commands\Grapper\Sofascore; namespace App\Console\Commands\Grapper\Sofascore;
use App\Console\Commands\Grap; use App\Console\Commands\Grap;
use App\Console\Commands\Grapper\Grap\Helper\ZipFolder; use App\Console\Commands\Grapper\Sofascore\Helper\FileType;
use App\Console\Commands\Grapper\Sofascore\Helper\ReadDir; use App\Console\Commands\Grapper\Sofascore\Helper\ReadDir;
use App\Console\Commands\Nuh; use App\Console\Commands\Nuh;
use App\Utilities\Notice; use App\Utilities\Notice;
@@ -18,15 +18,17 @@ class MakeExcel
public static function create() public static function create()
{ {
ini_set("memory_limit", -1); ini_set('memory_limit', -1);
$debug = Nuh::$options['d'] ?? 0; $debug = Nuh::$options['d'] ?? 0;
if ($debug) { 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 = self::load_files(); $files = ReadDir::get_tree(Grap::$storage.'/'.Grap::$folder);
$files = array_chunk(FileType::filter($files), self::$max);
foreach ($files as $key => $value) { foreach ($files as $key => $value) {
@@ -74,19 +76,4 @@ class MakeExcel
self::$filesToMail[] = Grap::$storage.'/'.$filename; self::$filesToMail[] = Grap::$storage.'/'.$filename;
} }
} }
public static function load_files()
{
$files = ReadDir::get_tree(Grap::$storage . '/' . Grap::$folder);
$filtered = [];
foreach ($files as $file) {
$path_parts = pathinfo($file);
if (isset($path_parts['extension']) && $path_parts['extension'] == 'json') {
$filtered[] = $file;
}
}
return array_chunk($filtered, self::$max);
}
} }
app/Console/Commands/Grapper/Sofascore/SendMail.php
+20 -30
View File
@@ -2,72 +2,62 @@
namespace App\Console\Commands\Grapper\Sofascore; namespace App\Console\Commands\Grapper\Sofascore;
use App\Console\Commands\Nuh; use App\Console\Commands\Grap;
use App\Console\Commands\Grapper\Sofascore\Helper\FileType;
use App\Console\Commands\Grapper\Sofascore\Helper\ReadDir;
use App\Mail\SofaScoreDataMail; use App\Mail\SofaScoreDataMail;
use App\Models\SofaScoreEventGrapped; use App\Models\SofaScoreEventGrapped;
use App\Utilities\Notice;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Mail;
use App\Console\Commands\Grapper\Sofascore;
use App\Models\SofaScoreTask; use App\Models\SofaScoreTask;
use App\Utilities\Notice;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\Mail;
class SendMail class SendMail
{ {
public static function run() public static function run(int $task_id)
{ {
$debug = Nuh::$options['d'] ?? 0; $debug = Grap::$options['d'] ?? 0;
$task_id = Nuh::$options['task'] ?? 0;
$task = SofaScoreTask::where('id', $task_id)->first(); $task = SofaScoreTask::where('id', $task_id)->first();
$zip_file = Sofascore::$storage . Sofascore::$archive_name; $files = ReadDir::get_tree(Grap::$storage);
$sendfiles = FileType::filter($files, 'xlsx');
$header = self::createHeader($task); $header = self::createHeader($task);
$message = self::createMessage($task); $table = self::createTable($task);
if (File::exists($zip_file)) {
Mail::to('hermann.telser@gmail.com') Mail::to('hermann.telser@gmail.com')
->cc('ubaldo.perrucci@gmail.com') ->cc('ubaldo.perrucci@gmail.com')
->send( ->send(
new SofaScoreDataMail($header, $message) new SofaScoreDataMail($header, $table, $sendfiles)
); );
if ($debug) { if ($debug) {
Notice::note('Mail: '.$header); Notice::note('Mail: '.$header);
} }
} else {
if ($debug) { if ($debug) {
Notice::note('zip not found ' . $zip_file, 'r', 1); Notice::note('mail send', 'g');
} }
} }
if ($debug) { public static function createTable(SofaScoreTask $task)
Notice::note('Mail send', 'g');
}
}
public static function createMessage(SofaScoreTask $task)
{ {
$res = SofaScoreEventGrapped::where('grapper_id', $task->id)->get(); $res = SofaScoreEventGrapped::where('grapper_id', $task->id)->get();
$text = ' $table = '';
';
foreach ($res as $value) { foreach ($res as $value) {
$text .= $value->liga . ' - ' . $value->name . ' - ' . $value->starttime; $table .= '|'.$value->liga.'|'.$value->name.'|'.$value->starttime.'|
$text .= '
'; ';
} }
return $text;
return $table;
} }
public static function createHeader(SofaScoreTask $task) public static function createHeader(SofaScoreTask $task)
{ {
$text = "## "; $text = '## ';
switch ($task->mode) { switch ($task->mode) {
case 'daily': case 'daily':
$text = $task->name.' - '.Carbon::now()->subDays(3)->format('Y-m-d'); $text = $task->name.' - '.Carbon::now()->subDays(3)->format('Y-m-d');
app/Console/Commands/Nuh.php
+10 -10
View File
@@ -2,19 +2,19 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Utilities\Notice; use App\Console\Commands\DbMapper\AutoMapper;
use App\Models\Supervisor;
use Illuminate\Console\Command;
use App\Utilities\Supervisorctl;
use Illuminate\Support\Facades\DB;
use App\Console\Commands\Grapper\Betica; use App\Console\Commands\Grapper\Betica;
use App\Console\Commands\Grapper\Magloo;
use App\Console\Commands\Grapper\TxOdds;
use App\Console\Commands\Grapper\Betsapi; use App\Console\Commands\Grapper\Betsapi;
use App\Console\Commands\Grapper\Goldbet; use App\Console\Commands\Grapper\Goldbet;
use App\Console\Commands\Services\Services;
use App\Console\Commands\Grapper\Logifuture; use App\Console\Commands\Grapper\Logifuture;
use App\Console\Commands\DbMapper\AutoMapper; use App\Console\Commands\Grapper\Magloo;
use App\Console\Commands\Grapper\TxOdds;
use App\Console\Commands\Services\Services;
use App\Models\Supervisor;
use App\Utilities\Notice;
use App\Utilities\Supervisorctl;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\DB;
class Nuh extends Command class Nuh extends Command
{ {
@@ -22,7 +22,7 @@ class Nuh extends Command
public static $id = 0; public static $id = 0;
protected $signature = 'nuh {process=help} {--folder=} {--id=0} {--gid=} {--p} {--d} {--x} {--t} {--y} {--m} {--l} {--w} {--a} {--r} {--s} {--g} {--t} {--q} {--f} {--b} {--e} {--z}'; protected $signature = 'nuh {process=help} {--id=0} {--gid=} {--p} {--d} {--x} {--t} {--y} {--m} {--l} {--w} {--a} {--r} {--s} {--g} {--t} {--q} {--f} {--b} {--e} {--z}';
public function handle() public function handle()
{ {
app/Mail/SofaScoreDataMail.php
+11 -14
View File
@@ -8,7 +8,6 @@ use Illuminate\Mail\Mailables\Attachment;
use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Content;
use Illuminate\Mail\Mailables\Envelope; use Illuminate\Mail\Mailables\Envelope;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use App\Console\Commands\Grapper\Sofascore;
class SofaScoreDataMail extends Mailable class SofaScoreDataMail extends Mailable
{ {
@@ -17,13 +16,7 @@ class SofaScoreDataMail extends Mailable
/** /**
* Create a new message instance. * Create a new message instance.
*/ */
public function __construct(string $header, string $message) public function __construct(public string $header, public string $table, public array $sendfiles) {}
{
$this->header = $header;
$this->message = $message;
$this->archive_name = Sofascore::$archive_name;
$this->zip_file = Sofascore::$storage . Sofascore::$archive_name;
}
/** /**
* Get the message envelope. * Get the message envelope.
@@ -43,7 +36,8 @@ class SofaScoreDataMail extends Mailable
return new Content( return new Content(
markdown: 'mail.user.sofascore_data', markdown: 'mail.user.sofascore_data',
with: [ with: [
'message' => $this->message, 'message' => $this->header,
'table' => $this->table,
], ],
); );
} }
@@ -52,13 +46,16 @@ class SofaScoreDataMail extends Mailable
* Get the attachments for the message. * Get the attachments for the message.
* *
* @return array<int, Attachment> * @return array<int, Attachment>
* ->withMime('application/x-zip-compressed');
*/ */
public function attachments(): array public function attachments(): array
{ {
return [ $attachments = [];
Attachment::fromPath($this->zip_file) foreach ($this->sendfiles as $sendfile) {
->as($this->archive_name) $attachments[] = Attachment::fromPath($sendfile)
->withMime('application/x-zip-compressed') ->withMime('application/vnd.openxmlformats-officedocument.spreadsheetml.template');
]; }
return $attachments;
} }
} }
resources/views/mail/user/sofascore_data.blade.php
+11 -3
View File
@@ -1,3 +1,11 @@
<x-mail::message> @component('mail::message')
{{ $message }} # {{ $message }}
</x-mail::message>
@component('mail::table')
| Liga | Event | Starttime |
|:------------- |:-------------| --------:|
{{ $table }}
@endcomponent
@endcomponent
resources/views/vendor/mail/html/header.blade.php
Vendored
+29 -10
View File
@@ -1,18 +1,37 @@
<tr> <tr>
<td class="header"> <td class="header">
<div style="display: inline-block;"> <div style="display: inline-block;">
<svg width="100%" height="100%" viewBox="0 0 600 169" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"> <svg width="100%" height="100%" viewBox="0 0 600 169" version="1.1" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/"
style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(0.1,0,0,-0.172449,0,169)"> <g transform="matrix(0.1,0,0,-0.172449,0,169)">
<path d="M146,877C78,788 54,665 85,569C95,539 123,475 148,425C187,348 194,326 194,275C194,211 174,160 124,101C110,83 100,67 103,64C113,54 393,60 405,70C430,90 469,178 481,238C497,321 484,379 420,509C393,563 367,626 362,648C346,718 372,798 436,878L463,910L171,910L146,877Z" style="fill-rule:nonzero;" /> <path
<path d="M510,910L510,730L700,730L700,60L960,60L960,729L1037,732L1113,735L1136,820C1149,867 1160,906 1160,908C1160,909 1014,910 835,910L510,910Z" style="fill-rule:nonzero;" /> d="M146,877C78,788 54,665 85,569C95,539 123,475 148,425C187,348 194,326 194,275C194,211 174,160 124,101C110,83 100,67 103,64C113,54 393,60 405,70C430,90 469,178 481,238C497,321 484,379 420,509C393,563 367,626 362,648C346,718 372,798 436,878L463,910L171,910L146,877Z"
<path d="M1237,853C1165,691 1145,560 1154,321C1157,224 1163,127 1168,105L1175,65L1308,62C1380,61 1440,63 1440,67C1440,71 1434,109 1426,150C1418,191 1410,256 1408,293L1405,361L1615,361L1612,293C1609,231 1597,139 1583,82L1578,59L1844,65L1852,104C1867,174 1875,389 1868,496C1860,614 1832,737 1791,838L1763,905L1513,908L1263,910L1237,853ZM1543,783C1566,731 1610,579 1610,551C1610,544 1575,540 1510,540C1445,540 1410,544 1410,551C1410,604 1492,840 1510,840C1514,840 1529,814 1543,783Z" style="fill-rule:nonzero;" /> style="fill-rule:nonzero;" />
<path d="M1900,910L1900,730L2080,730L2080,60L2340,60L2340,730L2498,730L2519,808C2531,851 2540,892 2540,898C2540,907 2459,910 2220,910L1900,910Z" style="fill-rule:nonzero;" /> <path
<path d="M2600,911L2600,60L2870,60L2868,483L2865,905L2733,908L2600,911Z" style="fill-rule:nonzero;" /> d="M510,910L510,730L700,730L700,60L960,60L960,729L1037,732L1113,735L1136,820C1149,867 1160,906 1160,908C1160,909 1014,910 835,910L510,910Z"
<path d="M3023,862C2986,808 2972,774 2960,708C2946,638 2963,571 3025,440C3069,347 3080,315 3080,275C3080,218 3055,156 3009,99L2978,60L3286,60L3317,113C3358,180 3373,244 3368,323C3365,375 3353,409 3302,516C3254,615 3240,655 3240,690C3240,740 3272,818 3313,866C3328,884 3340,901 3340,904C3340,907 3276,910 3198,910L3055,910L3023,862Z" style="fill-rule:nonzero;" /> style="fill-rule:nonzero;" />
<path d="M3400,910L3400,730L3580,730L3580,60L3840,60L3840,730L3997,730L4018,809C4030,852 4040,892 4040,899C4040,907 3951,910 3720,910L3400,910Z" style="fill-rule:nonzero;" /> <path
d="M1237,853C1165,691 1145,560 1154,321C1157,224 1163,127 1168,105L1175,65L1308,62C1380,61 1440,63 1440,67C1440,71 1434,109 1426,150C1418,191 1410,256 1408,293L1405,361L1615,361L1612,293C1609,231 1597,139 1583,82L1578,59L1844,65L1852,104C1867,174 1875,389 1868,496C1860,614 1832,737 1791,838L1763,905L1513,908L1263,910L1237,853ZM1543,783C1566,731 1610,579 1610,551C1610,544 1575,540 1510,540C1445,540 1410,544 1410,551C1410,604 1492,840 1510,840C1514,840 1529,814 1543,783Z"
style="fill-rule:nonzero;" />
<path
d="M1900,910L1900,730L2080,730L2080,60L2340,60L2340,730L2498,730L2519,808C2531,851 2540,892 2540,898C2540,907 2459,910 2220,910L1900,910Z"
style="fill-rule:nonzero;" />
<path d="M2600,911L2600,60L2870,60L2868,483L2865,905L2733,908L2600,911Z"
style="fill-rule:nonzero;" />
<path
d="M3023,862C2986,808 2972,774 2960,708C2946,638 2963,571 3025,440C3069,347 3080,315 3080,275C3080,218 3055,156 3009,99L2978,60L3286,60L3317,113C3358,180 3373,244 3368,323C3365,375 3353,409 3302,516C3254,615 3240,655 3240,690C3240,740 3272,818 3313,866C3328,884 3340,901 3340,904C3340,907 3276,910 3198,910L3055,910L3023,862Z"
style="fill-rule:nonzero;" />
<path
d="M3400,910L3400,730L3580,730L3580,60L3840,60L3840,730L3997,730L4018,809C4030,852 4040,892 4040,899C4040,907 3951,910 3720,910L3400,910Z"
style="fill-rule:nonzero;" />
<rect x="4100" y="60" width="260" height="850" style="fill-rule:nonzero;" /> <rect x="4100" y="60" width="260" height="850" style="fill-rule:nonzero;" />
<path d="M4470,910L4470,60L4730,60L4730,450L4753,450C4788,450 4835,416 4854,375C4875,332 4890,240 4890,153C4890,55 4883,60 5037,60L5171,60L5166,118C5163,149 5158,209 5155,250C5146,358 5122,436 5086,474C5069,492 5048,510 5040,513C5028,517 5031,523 5053,540C5109,584 5124,632 5128,778L5132,910L4862,910L4858,773C4855,614 4841,572 4785,546C4767,537 4747,530 4741,530C4733,530 4730,589 4730,720L4730,910L4470,910Z" style="fill-rule:nonzero;" /> <path
<path d="M5300,858C5259,763 5240,670 5234,535C5227,381 5244,261 5291,139L5321,60L5868,60L5889,110C5937,221 5945,274 5945,480C5945,686 5937,731 5880,864L5861,910L5322,910L5300,858ZM5626,786C5640,756 5657,701 5665,663C5682,585 5685,388 5670,309C5658,244 5611,110 5600,110C5590,110 5540,223 5523,284C5502,363 5495,518 5510,607C5523,691 5575,840 5591,840C5597,840 5612,816 5626,786Z" style="fill-rule:nonzero;" /> d="M4470,910L4470,60L4730,60L4730,450L4753,450C4788,450 4835,416 4854,375C4875,332 4890,240 4890,153C4890,55 4883,60 5037,60L5171,60L5166,118C5163,149 5158,209 5155,250C5146,358 5122,436 5086,474C5069,492 5048,510 5040,513C5028,517 5031,523 5053,540C5109,584 5124,632 5128,778L5132,910L4862,910L4858,773C4855,614 4841,572 4785,546C4767,537 4747,530 4741,530C4733,530 4730,589 4730,720L4730,910L4470,910Z"
style="fill-rule:nonzero;" />
<path
d="M5300,858C5259,763 5240,670 5234,535C5227,381 5244,261 5291,139L5321,60L5868,60L5889,110C5937,221 5945,274 5945,480C5945,686 5937,731 5880,864L5861,910L5322,910L5300,858ZM5626,786C5640,756 5657,701 5665,663C5682,585 5685,388 5670,309C5658,244 5611,110 5600,110C5590,110 5540,223 5523,284C5502,363 5495,518 5510,607C5523,691 5575,840 5591,840C5597,840 5612,816 5626,786Z"
style="fill-rule:nonzero;" />
</g> </g>
</svg> </svg>
<br /> <br />
resources/views/vendor/mail/html/layout.blade.php
Vendored
+9 -3
View File
@@ -1,5 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ str_replace('_', '-', app()->getLocale()) }}"> <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head> <head>
<title>{{ config('app.name') }}</title> <title>{{ config('app.name') }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -25,6 +27,7 @@ width: 100% !important;
</style> </style>
{!! $head ?? '' !!} {!! $head ?? '' !!}
</head> </head>
<body> <body>
<table class="wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation"> <table class="wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
@@ -35,8 +38,10 @@ width: 100% !important;
<!-- Email Body --> <!-- Email Body -->
<tr> <tr>
<td class="body" width="100%" cellpadding="0" cellspacing="0" style="border: hidden !important;"> <td class="body" width="100%" cellpadding="0" cellspacing="0"
<table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation"> style="border: hidden !important;">
<table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0"
role="presentation">
<!-- Body content --> <!-- Body content -->
<tr> <tr>
<td class="content-cell"> <td class="content-cell">
@@ -55,4 +60,5 @@ width: 100% !important;
</tr> </tr>
</table> </table>
</body> </body>
</html> </html>
resources/views/vendor/mail/html/message.blade.php
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
{{-- Header --}} {{-- Header --}}
<x-slot:header> <x-slot:header>
<x-mail::header :url="config('app.url')"> <x-mail::header :url="config('app.url')">
by New-Odds Market Monitoring by NUH-Odds Gmbh - Market Monitoring
</x-mail::header> </x-mail::header>
</x-slot:header> </x-slot:header>
resources/views/vendor/mail/html/panel.blade.php
Vendored
-1
View File
@@ -11,4 +11,3 @@
</td> </td>
</tr> </tr>
</table> </table>
resources/views/vendor/mail/html/table.blade.php
Vendored
-2
View File
@@ -1,3 +1 @@
<div class="table">
{{ Illuminate\Mail\Markdown::parse($slot) }} {{ Illuminate\Mail\Markdown::parse($slot) }}
</div>