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
+499 -473
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Console/Commands/Grapper/Sofascore/DaysTournament.php
+119 -120
View File
@@ -2,9 +2,9 @@
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\Sleeper;
use App\Console\Commands\Grap;
use App\Models\Country;
use App\Models\SofaScoreCategory;
use App\Models\SofaScoreDayTournament;
@@ -16,157 +16,156 @@ class DaysTournament
{
/**
* a Grap --d --f 67 --fun=4 --task=1
*
*
* Ita Serie-A-Saison 23-08-2025 - 24-05-2026
* Ger Bundesliga 22-08-2025 – 16-05-2026
* Eng Premier league 15-08-2025 - 24-05-2026
* Spa La Liga 15-08-2025 - 24-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;
$tournaments_counter = 0;
$sport_id = $d['sport_id'];
$has = SofaScoreDayTournament::where('day', $day)->first();
$day = $d['day'];
$sport = [];
$sport[1] = 'football';
$slug = $d['slug'];
foreach ($sport as $sport_id => $slug) {
if ($has) {
if ($debug) {
Notice::note("Tournaments $day for ".strtoupper($slug).' allready grapped', 'bb');
}
} else {
$has = SofaScoreDayTournament::where('day', $day)->where('sport_id', $sport_id)->first();
if ($has) {
if ($debug) {
Notice::note("Tournaments $day for " . strtoupper($slug) . " allready grapped", 'bb');
}
} else {
if ($debug) {
Notice::note("$day\ngrappig", 'g');
}
$page = 1;
while ($page) {
$url = Grap::$options['base_url'] . "api/v1/sport/$slug/scheduled-tournaments/$day/page/$page";
Sleeper::rand();
$data = CurlSofa::load($url);
if ($data['hasNextPage']) {
$page++;
} else {
$page = false;
if ($debug) {
Notice::note("$day\ngrappig", 'g');
}
foreach ($data['scheduled'] as $row) {
$page = 1;
if (isset($row['tournament']['uniqueTournament'])) {
$tournament = $row['tournament']['uniqueTournament'];
while ($page) {
$url = Grap::$options['base_url']."api/v1/sport/$slug/scheduled-tournaments/$day/page/$page";
Sleeper::rand();
$data = CurlSofa::load($url);
if ($data['hasNextPage']) {
$page++;
} else {
$tournament = $row['tournament'];
$page = false;
}
$category = $tournament['category'];
foreach ($data['scheduled'] as $row) {
if ($sport_id == 5) {
$country_id = 470;
} else {
if (isset($row['tournament']['uniqueTournament'])) {
$tournament = $row['tournament']['uniqueTournament'];
} else {
$tournament = $row['tournament'];
}
$category = $tournament['category'];
if ($sport_id == 5) {
$country_id = 470;
} else {
/**
* CATEGORY
*/
$find = [
'Amateur',
'Bosnia & Herzegovina',
'Czechia',
'DR Congo',
'Netherlands',
'North & Central America',
'Bonaire',
'Sao Tome and Principe',
'Cape Verde',
'Macao',
'Saint Kitts and Nevis',
'Eswatini',
'Timor Leste',
'Laos',
'Congo Republic',
];
$replace = [
'',
'Bosnia Herzegovina',
'Czech Republic',
'Congo DR',
'Holland',
'North America',
'Bonaire, Sint Eustatius and Saba',
'Sao Tome e Principe',
'Cape Verde Islands',
'Macau',
'St. Kitts and Nevis',
'Swaziland',
'East Timor',
'Lao Peoples\'s Democratic Republic',
'Congo DR',
];
$country_id = Country::where('name', trim(str_replace($find, $replace, $category['name'])))->value('id');
}
// dd($category, $country_id);
if (! $country_id) {
// platzhalter fix later sofa_score_categories => txodds countries
// CATEGORY find <-> replace
Log::channel('sofascore')->info($tournament);
$sofa_score_category_id = 10000000;
} else {
$call = SofaScoreCategory::updateOrCreate([
'id' => (int) $category['id'],
'country_id' => (int) $country_id,
'slug' => $category['slug'],
], [
'name' => $category['name'],
]);
$sofa_score_category_id = $call->id;
}
/**
* CATEGORY
* TOURNAMENT
*/
$find = [
'Amateur',
'Bosnia & Herzegovina',
'Czechia',
'DR Congo',
'Netherlands',
'North & Central America',
'Bonaire',
'Sao Tome and Principe',
'Cape Verde',
'Macao',
'Saint Kitts and Nevis',
'Eswatini',
'Timor Leste',
'Laos',
'Congo Republic',
];
$replace = [
'',
'Bosnia Herzegovina',
'Czech Republic',
'Congo DR',
'Holland',
'North America',
'Bonaire, Sint Eustatius and Saba',
'Sao Tome e Principe',
'Cape Verde Islands',
'Macau',
'St. Kitts and Nevis',
'Swaziland',
'East Timor',
'Lao Peoples\'s Democratic Republic',
'Congo DR',
];
$country_id = Country::where('name', trim(str_replace($find, $replace, $category['name'])))->value('id');
}
// dd($category, $country_id);
if (! $country_id) {
// platzhalter fix later sofa_score_categories => txodds countries
// CATEGORY find <-> replace
Log::channel('sofascore')->info($tournament);
$sofa_score_category_id = 10000000;
} else {
$call = SofaScoreCategory::updateOrCreate([
'id' => (int) $category['id'],
'country_id' => (int) $country_id,
'slug' => $category['slug'],
SofaScoreTournament::updateOrCreate([
'sport_id' => (int) $sport_id,
'tournament_id' => (int) $tournament['id'],
'sofa_score_category_id' => (int) $sofa_score_category_id,
], [
'name' => $category['name'],
'name' => $tournament['name'],
'slug' => $tournament['slug'],
]);
$sofa_score_category_id = $call->id;
}
/**
* TOURNAMENT
*/
SofaScoreTournament::updateOrCreate([
'sport_id' => (int) $sport_id,
'tournament_id' => (int) $tournament['id'],
'sofa_score_category_id' => (int) $sofa_score_category_id,
], [
'name' => $tournament['name'],
'slug' => $tournament['slug'],
]);
$tournaments_counter++;
$tournaments_counter++;
// if ($debug) {
// Notice::note('tournament: ' . $tournament['name'], 'p');
// }
/**
* DAY TOURNAMENT
*/
SofaScoreDayTournament::updateOrCreate([
'tournament_id' => (int) $tournament['id'],
'sport_id' => (int) $sport_id,
'day' => $day,
]);
}
/**
* DAY TOURNAMENT
*/
SofaScoreDayTournament::updateOrCreate([
'tournament_id' => (int) $tournament['id'],
'sport_id' => (int) $sport_id,
'day' => $day,
]);
}
if ($debug) {
Notice::note("tournaments: $tournaments_counter", 'p');
if ($debug) {
Notice::note("tournaments: $tournaments_counter", 'p');
}
}
}
}
app/Console/Commands/Grapper/Sofascore/Grapper.php
+45 -46
View File
@@ -3,20 +3,20 @@
namespace App\Console\Commands\Grapper\Sofascore;
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\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
{
public static function load()
public static function load(int $task_id)
{
/**
* , JSON_PRETTY_PRINT
@@ -25,12 +25,12 @@ class Grapper
$debug = Grap::$options['d'] ?? 0;
$restart = Grap::$options['r'] ?? 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);
}
$days = LoadDays::load();
$days = LoadDays::load($task_id);
$count = 0;
@@ -39,18 +39,21 @@ class Grapper
/**
* 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 mailing text
* empty mail text
*/
if ($restart) {
SofaScoreEventGrapped::where('grapper_id', $task_id)->delete();
foreach ($days as $d) {
foreach ($days as $day) {
SofaScoreTaskDay::where('grapper_id', (int) $task_id)
->where('day', $d['day'])
->where('day', $day)
->update(['done' => 0]);
}
@@ -63,16 +66,14 @@ class Grapper
}
}
foreach ($days as $d) {
foreach ($days as $day) {
DaysTournament::get($d);
DaysTournament::get($day);
foreach ($active_tournaments as $tournament) {
$day = $d['day'];
if ($debug) {
Notice::note('START ' . $tournament->tournament->name, 'p');
Notice::note('START '.$tournament->tournament->name, 'p');
}
$res = SofaScoreDayTournament::whereDate('day', '=', $day)->where('tournament_id', $tournament->sofa_score_tournament_id)->first();
@@ -83,7 +84,7 @@ class Grapper
Notice::note($day, 'g');
}
$url = Grap::$options['base_url'] . "api/v1/unique-tournament/$tournament->sofa_score_tournament_id/scheduled-events/$day";
$url = Grap::$options['base_url']."api/v1/unique-tournament/$tournament->sofa_score_tournament_id/scheduled-events/$day";
Sleeper::rand(1);
@@ -95,9 +96,9 @@ class Grapper
Grap::$useragent = rand(1, 6);
if (!$force && SofaScoreEventGrapped::where('id', (int) $event['id'])->exists()) {
if (! $force && SofaScoreEventGrapped::where('id', (int) $event['id'])->exists()) {
if ($debug) {
Notice::note('Grapped ' . $day . ' - ' . $event['homeTeam']['name'] . ' vs ' . $event['awayTeam']['name'], 'g');
Notice::note('Grapped '.$day.' - '.$event['homeTeam']['name'].' vs '.$event['awayTeam']['name'], 'g');
}
} else {
@@ -112,18 +113,18 @@ class Grapper
Sleeper::rand(1);
if ($debug) {
Notice::note($day . ' - ' . $event['homeTeam']['name'] . ' vs ' . $event['awayTeam']['name'], 'bg');
Notice::note($day.' - '.$event['homeTeam']['name'].' vs '.$event['awayTeam']['name'], 'bg');
}
$grapped = SofaScoreEventGrapped::firstOrNew(['id' => $event['id']]);
$grapped->grapper_id = $task_id;
$grapped->day = $day;
$grapped->liga = $event['tournament']['name'];
$grapped->name = $event['homeTeam']['name'] . ' vs ' . $event['awayTeam']['name'];
$grapped = SofaScoreEventGrapped::firstOrNew(['id' => $event['id']]);
$grapped->grapper_id = $task_id;
$grapped->day = $day;
$grapped->liga = $event['tournament']['name'];
$grapped->name = $event['homeTeam']['name'].' vs '.$event['awayTeam']['name'];
$grapped->url = $url;
$grapped->starttime = $starttime->toDateTimeString();
$folder = Grap::$storage . '/' . $day . '/' . $day . '-' . $event['tournament']['slug'] . '/' . $event['slug'];
$folder = Grap::$storage.'/'.$day.'/'.$day.'-'.$event['tournament']['slug'].'/'.$event['slug'];
File::makeDirectory($folder, 0775, true, true);
@@ -131,7 +132,7 @@ class Grapper
* EVENT event
*********************************/
File::put($folder . '/event.json', json_encode($event));
File::put($folder.'/event.json', json_encode($event));
/*********************************
* EVENT statistics
@@ -139,7 +140,7 @@ class Grapper
$event_id = $event['id'];
$url = Grap::$options['base_url'] . "api/v1/event/$event_id/statistics";
$url = Grap::$options['base_url']."api/v1/event/$event_id/statistics";
Sleeper::rand();
@@ -147,7 +148,7 @@ class Grapper
$data['id'] = $event_id;
File::put($folder . '/statistics.json', json_encode($data));
File::put($folder.'/statistics.json', json_encode($data));
$grapped->got_statistics = 1;
@@ -155,7 +156,7 @@ class Grapper
* EVENT lineups
*********************************/
$url = Grap::$options['base_url'] . "api/v1/event/$event_id/lineups";
$url = Grap::$options['base_url']."api/v1/event/$event_id/lineups";
Sleeper::rand();
@@ -163,7 +164,7 @@ class Grapper
$data['id'] = $event_id;
File::put($folder . '/lineups.json', json_encode($data));
File::put($folder.'/lineups.json', json_encode($data));
$grapped->got_lineups = 1;
@@ -171,7 +172,7 @@ class Grapper
* EVENT odds
*********************************/
$url = Grap::$options['base_url'] . "api/v1/event/$event_id/odds/1/all";
$url = Grap::$options['base_url']."api/v1/event/$event_id/odds/1/all";
Sleeper::rand();
@@ -179,7 +180,7 @@ class Grapper
$data['id'] = $event_id;
File::put($folder . '/odds.json', json_encode($data));
File::put($folder.'/odds.json', json_encode($data));
$grapped->got_odds = 1;
@@ -187,7 +188,7 @@ class Grapper
* EVENT incidents
*********************************/
$url = Grap::$options['base_url'] . "api/v1/event/$event_id/incidents";
$url = Grap::$options['base_url']."api/v1/event/$event_id/incidents";
Sleeper::rand();
@@ -195,7 +196,7 @@ class Grapper
$data['id'] = $event_id;
File::put($folder . '/incidents.json', json_encode($data));
File::put($folder.'/incidents.json', json_encode($data));
$grapped->got_incidents = 1;
@@ -206,7 +207,7 @@ class Grapper
}
}
if ($debug) {
Notice::note('END ' . $tournament->tournament->name, 'p');
Notice::note('END '.$tournament->tournament->name, 'p');
}
}
SofaScoreTaskDay::updateOrCreate([
@@ -218,12 +219,10 @@ class Grapper
$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
+14 -51
View File
@@ -2,66 +2,47 @@
namespace App\Console\Commands\Grapper\Sofascore\Helper;
use App\Utilities\Notice;
use App\Console\Commands\Grap;
use App\Models\SofaScoreTask;
use Illuminate\Support\Carbon;
use App\Models\SofaScoreTaskDay;
use App\Utilities\Notice;
use Illuminate\Support\Carbon;
class LoadDays
{
public static function load()
public static function load(int $task_id)
{
$debug = Grap::$options['d'] ?? 0;
$restart = Grap::$options['restart'] ?? 0;
$task_id = Grap::$options['task'] ?? 0;
$folder = Grap::$options['folder'] ?? 0;
$dates = [];
if (!$task_id) {
if (! $task_id) {
Notice::note('no task id', 'br');
return [];
}
$task = SofaScoreTask::with('sport')->where('id', $task_id)->first();
if ($debug) {
Notice::note('Task id:' . $task->id . ', mode:' . $task->mode . ', sport:' . $task->sport->name);
Notice::note('Task id:'.$task->id.', mode:'.$task->mode.', sport:'.$task->sport->name);
}
switch ($task->mode) {
case 'daily':
if ($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,
];
}
$dates[] = ValidateDate::get(Grap::$folder);
break;
case 'date':
$dates[] = [
'day' => self::validateDate($task->day_from),
'slug' => $task->sport->ss_slug,
'sport_id' => $task->sport_id,
];
$dates[] = ValidateDate::get($task->day_from);
break;
case 'range':
$from = self::validateDate($task->day_from);
$to = self::validateDate($task->day_to);
$from = ValidateDate::get($task->day_from);
$to = ValidateDate::get($task->day_to);
$from = Carbon::createFromDate($from);
$to = Carbon::createFromDate($to);
@@ -75,25 +56,17 @@ class LoadDays
if ($restart) {
// get all days
while ($from <= $to) {
$dates[] = [
'day' => $from->format('Y-m-d'),
'slug' => $task->sport->ss_slug,
'sport_id' => $task->sport_id,
];
$dates[] = $from->format('Y-m-d');
$from->addDay();
}
} else {
// remove days done
// remove days done
while ($from <= $to) {
$res = SofaScoreTaskDay::firstOrNew(['grapper_id' => (int) $task_id, 'day' => $from->format('Y-m-d')]);
if (!$res->done) {
$dates[] = [
'day' => $from->format('Y-m-d'),
'slug' => $task->sport->ss_slug,
'sport_id' => $task->sport_id,
];
if (! $res->done) {
$dates[] = $from->format('Y-m-d');
}
$from->addDay();
}
@@ -110,16 +83,6 @@ class LoadDays
// remove when element in array is double (day and slug)
$dates = array_unique($dates, SORT_REGULAR);
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
+22 -17
View File
@@ -9,47 +9,52 @@ use Illuminate\Support\Carbon;
class SetStorage
{
public static function set()
public static function set(int $task_id)
{
$task = Grap::$options['task'] ?? 1;
$debug = Grap::$options['d'];
$folder = Grap::$options['folder'] ?? '';
$task = SofaScoreTask::where('id', $task)->first();
$sofascore_data = storage_path('sofascore_data') . '/';
$folder = Grap::$options['folder'] ?? '';
$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').'/';
if ($task) {
$storage_name = Strings::clean($task->name);
switch ($task->id) {
case 1:
Grap::$storage = $sofascore_data . $storage_name;
Grap::$folder = Carbon::now()->subDays(3)->format('Y-m-d');
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';
Grap::$storage = $sofascore_data.$storage_name;
Grap::$zipfile = $sofascore_data.$storage_name.'/archive.zip';
break;
}
} else if ($folder) {
} elseif ($folder) {
Grap::$storage = $sofascore_data;
Grap::$folder = $folder;
}
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
+7 -7
View File
@@ -2,28 +2,28 @@
namespace App\Console\Commands\Grapper\Sofascore\Helper;
use App\Console\Commands\Grap;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use ZipArchive;
use App\Console\Commands\Grapper\Sofascore;
class ZipFolder
{
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) {
if (!$file->isDir()) {
if (! $file->isDir()) {
$filePath = $file->getRealPath();
$relativePath = substr($filePath, strlen(Sofascore::$storage) + 1);
$relativePath = substr($filePath, strlen(Grap::$storage) + 1);
$zip->addFile($filePath, $relativePath);
}
}
app/Console/Commands/Grapper/Sofascore/MakeExcel.php
+12 -25
View File
@@ -3,7 +3,7 @@
namespace App\Console\Commands\Grapper\Sofascore;
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\Nuh;
use App\Utilities\Notice;
@@ -18,27 +18,29 @@ class MakeExcel
public static function create()
{
ini_set("memory_limit", -1);
ini_set('memory_limit', -1);
$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 = self::load_files();
$files = ReadDir::get_tree(Grap::$storage.'/'.Grap::$folder);
$files = array_chunk(FileType::filter($files), self::$max);
foreach ($files as $key => $value) {
$has = count($value);
if (!$key && $has < self::$max) {
if (! $key && $has < self::$max) {
$from = 1;
$to = $has;
} else if (!$key) {
} elseif (! $key) {
$from = 1;
$key++;
$to = $key * self::$max;
} else if ($has == self::$max) {
} elseif ($has == self::$max) {
$from = $key * self::$max + 1;
$key++;
$to = $key * self::$max;
@@ -47,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();
@@ -69,24 +71,9 @@ class MakeExcel
$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;
}
}
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
+29 -39
View File
@@ -2,81 +2,71 @@
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\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\Utilities\Notice;
use Carbon\Carbon;
use Illuminate\Support\Facades\Mail;
class SendMail
{
public static function run()
public static function run(int $task_id)
{
$debug = Nuh::$options['d'] ?? 0;
$task_id = Nuh::$options['task'] ?? 0;
$debug = Grap::$options['d'] ?? 0;
$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);
$message = self::createMessage($task);
$table = self::createTable($task);
if (File::exists($zip_file)) {
Mail::to('hermann.telser@gmail.com')
->cc('ubaldo.perrucci@gmail.com')
->send(
new SofaScoreDataMail($header, $message)
);
if ($debug) {
Notice::note('Mail: ' . $header);
}
} else {
if ($debug) {
Notice::note('zip not found ' . $zip_file, 'r', 1);
}
Mail::to('hermann.telser@gmail.com')
->cc('ubaldo.perrucci@gmail.com')
->send(
new SofaScoreDataMail($header, $table, $sendfiles)
);
if ($debug) {
Notice::note('Mail: '.$header);
}
if ($debug) {
Notice::note('Mail send', 'g');
Notice::note('mail send', 'g');
}
}
public static function createMessage(SofaScoreTask $task)
public static function createTable(SofaScoreTask $task)
{
$res = SofaScoreEventGrapped::where('grapper_id', $task->id)->get();
$text = '
';
$table = '';
foreach ($res as $value) {
$text .= $value->liga . ' - ' . $value->name . ' - ' . $value->starttime;
$text .= '
';
$table .= '|'.$value->liga.'|'.$value->name.'|'.$value->starttime.'|
';
}
return $text;
return $table;
}
public static function createHeader(SofaScoreTask $task)
{
$text = "## ";
$text = '## ';
switch ($task->mode) {
case 'daily':
$text = $task->name . ' - ' . Carbon::now()->subDays(3)->format('Y-m-d');
$text = $task->name.' - '.Carbon::now()->subDays(3)->format('Y-m-d');
break;
case 'date':
$text = $task->name . ' - ' . $task->day_from;
$text = $task->name.' - '.$task->day_from;
break;
case 'range':
$text = $task->name . ' - ' . $task->day_from . ' - ' . $task->day_to;
$text = $task->name.' - '.$task->day_from.' - '.$task->day_to;
break;
default: