diff --git a/app/Traits/Sofascore/GrappingEvent.php b/app/Traits/Sofascore/GrappingEvent.php index cf9e4c47..8e4c427f 100644 --- a/app/Traits/Sofascore/GrappingEvent.php +++ b/app/Traits/Sofascore/GrappingEvent.php @@ -17,10 +17,10 @@ trait GrappingEvent if ($day_tournament->tournament_id == $tournament['sofa_score_tournament_id']) { if ($this->debug) { - Notice::note("$day - " . $tournament['tournament']['name'] . ' - ' . $tournament['sofa_score_tournament_id'], 'bb'); + Notice::note("$day - ".$tournament['tournament']['name'].' - '.$tournament['sofa_score_tournament_id'], 'bb'); } - $url = $this->base_url . 'api/v1/unique-tournament/' . $tournament['sofa_score_tournament_id'] . "/scheduled-events/$day"; + $url = $this->base_url.'api/v1/unique-tournament/'.$tournament['sofa_score_tournament_id']."/scheduled-events/$day"; if ($this->debug) { Notice::note($url, 'p'); @@ -36,27 +36,27 @@ trait GrappingEvent foreach ($data['events'] as $event) { - $base_check_string = $day . '-' . $event['tournament']['category']['slug'] . '-' . $event['tournament']['slug'] . '/' . $event['slug']; + $base_check_string = $day.'-'.$event['tournament']['category']['slug'].'-'.$event['tournament']['slug'].'/'.$event['slug']; $res = SofaScoreEventGrapped::where('id', (int) $event['id'])->where('grapper_id', $this->task_id)->first(); if (! $res) { - $base_check_string = $day . '-' . $event['tournament']['category']['slug'] . '-' . $event['tournament']['slug'] . '/' . $event['slug']; + $base_check_string = $day.'-'.$event['tournament']['category']['slug'].'-'.$event['tournament']['slug'].'/'.$event['slug']; // chinese-super-league if (! $this->restart && SofaScoreEventGrapped::where('grapper_id', $this->task_id)->where('id', (int) $event['id'])->exists()) { if ($this->debug) { - Notice::note('DB - Allready grapped at ' . $day . ' - ' . $event['homeTeam']['name'] . ' vs ' . $event['awayTeam']['name'], 'b'); + Notice::note('DB - Allready grapped at '.$day.' - '.$event['homeTeam']['name'].' vs '.$event['awayTeam']['name'], 'b'); } } else { if ($this->debug) { - Notice::note("$day - " . $event['homeTeam']['name'] . ' vs ' . $event['awayTeam']['name'], 'g'); + Notice::note("$day - ".$event['homeTeam']['name'].' vs '.$event['awayTeam']['name'], 'g'); } - $folder = strtolower("$this->data_dir/$day/$day-" . $event['tournament']['category']['slug'] . '-' . $event['tournament']['slug'] . '/' . $event['slug']); + $folder = strtolower("$this->data_dir/$day/$day-".$event['tournament']['category']['slug'].'-'.$event['tournament']['slug'].'/'.$event['slug']); File::makeDirectory($folder, 0775, true, true); @@ -72,9 +72,9 @@ trait GrappingEvent $event_id = $event['id']; - if (! $this->grapped($base_check_string . '/statistics.json')) { + if (! $this->grapped($base_check_string.'/statistics.json')) { - $url = $this->base_url . "api/v1/event/$event_id/statistics"; + $url = $this->base_url."api/v1/event/$event_id/statistics"; if ($this->debug) { Notice::note($url, 'b'); @@ -97,9 +97,9 @@ trait GrappingEvent * EVENT lineups *********************************/ - if (! $this->grapped($base_check_string . '/lineups.json')) { + if (! $this->grapped($base_check_string.'/lineups.json')) { - $url = $this->base_url . "api/v1/event/$event_id/lineups"; + $url = $this->base_url."api/v1/event/$event_id/lineups"; if ($this->debug) { Notice::note($url, 'b'); @@ -122,9 +122,9 @@ trait GrappingEvent * EVENT odds *********************************/ - if (! $this->grapped($base_check_string . '/odds.json')) { + if (! $this->grapped($base_check_string.'/odds.json')) { - $url = $this->base_url . "api/v1/event/$event_id/odds/1/all"; + $url = $this->base_url."api/v1/event/$event_id/odds/1/all"; if ($this->debug) { Notice::note($url, 'b'); @@ -146,9 +146,9 @@ trait GrappingEvent * EVENT incidents *********************************/ - if (! $this->grapped($base_check_string . '/incidents.json')) { + if (! $this->grapped($base_check_string.'/incidents.json')) { - $url = $this->base_url . "api/v1/event/$event_id/incidents"; + $url = $this->base_url."api/v1/event/$event_id/incidents"; if ($this->debug) { Notice::note($url, 'b'); @@ -175,14 +175,14 @@ trait GrappingEvent 'grapper_id' => $this->task_id, 'day' => $day, 'liga' => $event['tournament']['name'], - 'name' => $event['homeTeam']['name'] . ' vs ' . $event['awayTeam']['name'], + 'name' => $event['homeTeam']['name'].' vs '.$event['awayTeam']['name'], 'url' => $url, 'starttime' => $starttime->toDateTimeString(), ]); } } else { if ($this->debug) { - Notice::note('grapped: ' . $base_check_string, 'p'); + Notice::note('allready in db event grapped: '.$base_check_string, 'p'); } } } @@ -192,7 +192,7 @@ trait GrappingEvent } } if ($this->debug) { - Notice::note($day . ' - ' . $tournament['tournament']['name'] . ' no events', 'y'); + Notice::note($day.' - '.$tournament['tournament']['name'].' no events', 'y'); } } } diff --git a/app/Traits/Sofascore/GrappingSofascore.php b/app/Traits/Sofascore/GrappingSofascore.php index 70920c91..5fbd8a76 100644 --- a/app/Traits/Sofascore/GrappingSofascore.php +++ b/app/Traits/Sofascore/GrappingSofascore.php @@ -139,7 +139,7 @@ trait GrappingSofascore $this->speed = $this->ask_speed(); - $this->debug = $this->ask_debug(); + $this->debug = $this->ask_debug() == 'yes' ? 1 : 0; $daily_way = $this->select_daily_days(); @@ -252,12 +252,17 @@ trait GrappingSofascore $this->restart = 1; SofaScoreTaskDay::where('grapper_id', (int) $this->task_id)->delete(); + + SofaScoreEventGrapped::truncate(); + break; case 'clear': if ($this->confirm_delete() == 'Yes') { $this->restart = 1; $this->clear_folder($folder, 'all'); + SofaScoreEventGrapped::truncate(); + SofaScoreTaskDay::where('grapper_id', (int) $this->task_id)->delete(); } break; @@ -283,6 +288,9 @@ trait GrappingSofascore Notice::note("$day Events allready grapped", 'br'); } } else { + + $this->grapped_files = $this->get_tree($this->data_dir.'/'.$day); + $this->grap_tournaments_for_day($day); foreach ($this->tournaments_requested as $tournament) { @@ -403,14 +411,14 @@ trait GrappingSofascore ); } - protected function ask_debug(): int + protected function ask_debug(): string { return select( label: 'Show debubing?', - default: 1, + default: 'yes', options: [ - 0 => 'No', - 1 => 'Yes', + 'no' => 'No', + 'yes' => 'Yes', ] ); }