diff --git a/NOTES.md b/NOTES.md index 6fcbd034..4b4e21f1 100644 --- a/NOTES.md +++ b/NOTES.md @@ -1,3 +1,11 @@ +## REMOTE DB SETTING +# make port changes in .env file to forward +# use remote db with mariadb +ssh -L 13306:127.0.0.1:3306 -p 58371 root@162.55.242.190 + +# use remote db with mongodb +ssh -L 27027:127.0.0.1:27017 -p 58371 root@162.55.242.190 + importing https://github.com/christophrumpel/laravel-import-million-rows diff --git a/app/Console/Commands/Curl.php b/app/Console/Commands/Curl.php index cd0f4255..1a70e515 100644 --- a/app/Console/Commands/Curl.php +++ b/app/Console/Commands/Curl.php @@ -17,7 +17,7 @@ class Curl if ($debug) { if ($proxy) { - Notice::note($url.PHP_EOL.Nuh::$options['proxy'], 'b'); + Notice::note($url . PHP_EOL . Nuh::$options['proxy'], 'b'); } else { Notice::note($url, 'g'); } @@ -27,7 +27,7 @@ class Curl if ($debug) { Notice::note('data read localy', 'g'); } - $filename = app_path().self::$testfiles.strtolower(str_replace(' ', '_', Nuh::$options['name'])).'.json'; + $filename = app_path() . self::$testfiles . strtolower(str_replace(' ', '_', Nuh::$options['name'])) . '.json'; $file = file_get_contents($filename); @@ -37,7 +37,7 @@ class Curl $file = self::fetch_data_with_retries($url, $_config); if ($save) { - $filename = app_path().self::$testfiles.strtolower(str_replace(' ', '_', Nuh::$options['name'])).'.json'; + $filename = app_path() . self::$testfiles . strtolower(str_replace(' ', '_', Nuh::$options['name'])) . '.json'; file_put_contents($filename, $file); @@ -125,20 +125,17 @@ class Curl $attempt++; $curl_errorno = curl_errno($ch); if ($debug && $curl_errorno) { - Notice::note('curl_errorno: '.self::curlerrorcode($curl_errorno)); + Notice::note('curl_errorno: ' . self::curlerrorcode($curl_errorno)); } if ($debug) { echo "Attempt $attempt failed. Retrying...\n"; } sleep(2); // Optional: Sleep between retries } else { - curl_close($ch); - return $response; } } echo "All attempts failed.\n"; - curl_close($ch); return null; // Return null if all retries fail } diff --git a/app/Console/Commands/Grapper/Sofascore/Events.php b/app/Console/Commands/Grapper/Sofascore/Events.php index d21c2bfa..28cbdf48 100644 --- a/app/Console/Commands/Grapper/Sofascore/Events.php +++ b/app/Console/Commands/Grapper/Sofascore/Events.php @@ -32,7 +32,11 @@ class Events // to grap event id // https://www.sofascore.com/api/v1/unique-tournament/2480/scheduled-events/2022-05-19 + // https://www.sofascore.com/api/v1/unique-tournament/2480/scheduled-events/2026-05-31 + // per event + // https://www.sofascore.com/api/v1/event/16198485/statistics + // https://www.sofascore.com/api/v1/event/16198485/odds/1/all $years_back = 7; $dates = Carbon::now()->subYears($years_back); diff --git a/app/Console/Commands/Grapper/Sofascore/Tournament.php b/app/Console/Commands/Grapper/Sofascore/Tournament.php index ceb76034..3fcb041c 100644 --- a/app/Console/Commands/Grapper/Sofascore/Tournament.php +++ b/app/Console/Commands/Grapper/Sofascore/Tournament.php @@ -18,24 +18,32 @@ class Tournament { public static function load() { + $days = 1; + $debug = Nuh::$options['d'] ?? 0; + $force = Nuh::$options['f'] ?? 0; + $sport_id = Nuh::$options['sport_id']; $sport = Sport::where('id', $sport_id)->first(); - $dates = Carbon::now(); + // start yesterday + $grapping_date = Carbon::now()->subDay(); - while ($dates >= Carbon::now()->subYears($sport->ss_grap_years)) { + $days++; + $days_back = Carbon::now()->subDays($days); + + while ($grapping_date >= $days_back) { $tournaments_counter = 0; - $day = $dates->format('Y-m-d'); + $day = $grapping_date->format('Y-m-d'); /** * grap only one time/sport check */ - if (! SofaScoreDay::where('day', $day)->where($sport->ss_slug, 1)->first()) { + if ($force || ! SofaScoreDay::where('day', $day)->where($sport->ss_slug, 1)->first()) { if ($debug) { Notice::note('Grapping Sport: ' . Nuh::$options['sport'] . ' Day: ' . $day, 'g'); @@ -168,7 +176,7 @@ class Tournament Notice::note('Having Sport: ' . Nuh::$options['sport'] . ' Day: ' . $day, 'b'); } } - $dates->subDay(); + $grapping_date->subDay(); } } } diff --git a/app/Console/Commands/Xml.php b/app/Console/Commands/Xml.php index 5f7285b1..036126e9 100644 --- a/app/Console/Commands/Xml.php +++ b/app/Console/Commands/Xml.php @@ -16,14 +16,14 @@ class Xml $save = Nuh::$options['s'] ?? 0; $read = Nuh::$options['r'] ?? 0; - $filename = app_path().'/Console/Commands/TestFiles/'.strtolower(str_replace(' ', '_', Nuh::$options['name'])).'.xml'; + $filename = app_path() . '/Console/Commands/TestFiles/' . strtolower(str_replace(' ', '_', Nuh::$options['name'])) . '.xml'; if ($debug) { - Notice::note("Loading URL\n".$url); + Notice::note("Loading URL\n" . $url); } if ($save || $read) { - Notice::note("FILE NAME\n".$filename); + Notice::note("FILE NAME\n" . $filename); } if ($read) { @@ -96,16 +96,14 @@ class Xml echo "Attempt $attempt failed. Retrying...\n"; sleep(2); // Optional: Sleep between retries } else { - curl_close($ch); if (mb_substr($response, 0, 1) != '<') { - Log::debug('INVALID XML '.$url.'----'.$response); + Log::debug('INVALID XML ' . $url . '----' . $response); } else { return new SimpleXMLElement($response); } } } echo "All attempts failed.\n"; - curl_close($ch); return null; // Return null if all retries fail } diff --git a/config/database.php b/config/database.php index 4a53648a..b0d55e29 100644 --- a/config/database.php +++ b/config/database.php @@ -42,25 +42,25 @@ return [ 'synchronous' => null, ], - 'mysql' => [ - 'driver' => 'mysql', - 'url' => env('DB_URL'), - 'host' => env('DB_HOST', '127.0.0.1'), - 'port' => env('DB_PORT', '3306'), - 'database' => env('DB_DATABASE', 'laravel'), - 'username' => env('DB_USERNAME', 'root'), - 'password' => env('DB_PASSWORD', ''), - 'unix_socket' => env('DB_SOCKET', ''), - 'charset' => env('DB_CHARSET', 'utf8mb4'), - 'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'), - 'prefix' => '', - 'prefix_indexes' => true, - 'strict' => false, - 'engine' => null, - 'options' => extension_loaded('pdo_mysql') ? array_filter([ - PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), - ]) : [], - ], + // 'mysql' => [ + // 'driver' => 'mysql', + // 'url' => env('DB_URL'), + // 'host' => env('DB_HOST', '127.0.0.1'), + // 'port' => env('DB_PORT', '3306'), + // 'database' => env('DB_DATABASE', 'laravel'), + // 'username' => env('DB_USERNAME', 'root'), + // 'password' => env('DB_PASSWORD', ''), + // 'unix_socket' => env('DB_SOCKET', ''), + // 'charset' => env('DB_CHARSET', 'utf8mb4'), + // 'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'), + // 'prefix' => '', + // 'prefix_indexes' => true, + // 'strict' => false, + // 'engine' => null, + // 'options' => extension_loaded('pdo_mysql') ? array_filter([ + // PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + // ]) : [], + // ], 'mariadb' => [ 'driver' => 'mariadb', @@ -78,39 +78,6 @@ return [ 'prefix_indexes' => true, 'strict' => false, 'engine' => null, - 'options' => extension_loaded('pdo_mysql') ? array_filter([ - PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), - ]) : [], - ], - - 'pgsql' => [ - 'driver' => 'pgsql', - 'url' => env('DB_URL'), - 'host' => env('DB_HOST', '127.0.0.1'), - 'port' => env('DB_PORT', '5432'), - 'database' => env('DB_DATABASE', 'laravel'), - 'username' => env('DB_USERNAME', 'root'), - 'password' => env('DB_PASSWORD', ''), - 'charset' => env('DB_CHARSET', 'utf8'), - 'prefix' => '', - 'prefix_indexes' => true, - 'search_path' => 'public', - 'sslmode' => 'prefer', - ], - - 'sqlsrv' => [ - 'driver' => 'sqlsrv', - 'url' => env('DB_URL'), - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', '1433'), - 'database' => env('DB_DATABASE', 'laravel'), - 'username' => env('DB_USERNAME', 'root'), - 'password' => env('DB_PASSWORD', ''), - 'charset' => env('DB_CHARSET', 'utf8'), - 'prefix' => '', - 'prefix_indexes' => true, - // 'encrypt' => env('DB_ENCRYPT', 'yes'), - // 'trust_server_certificate' => env('DB_TRUST_SERVER_CERTIFICATE', 'false'), ], 'mongodb' => [ @@ -119,6 +86,7 @@ return [ 'database' => env('MONGODB_DATABASE', 'nuhodds'), ], + // ssh -L 27017:127.0.0.1:27017 ssh -p 58371 root@162.55.242.190 ], /* @@ -154,7 +122,7 @@ return [ 'options' => [ 'cluster' => env('REDIS_CLUSTER', 'redis'), - 'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')).'-database-'), + 'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')) . '-database-'), 'persistent' => env('REDIS_PERSISTENT', false), ],