github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 13:54:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Minor improvements (#1481)

Browse source 
* Minor improvements

* Updated

* Update functions.php

* Updated

* Update .gitignore

* Updated

* Update CHANGELOG.md
This commit is contained in:
Roman Kelesidis 2024-05-22 14:21:07 +07:00 • committed by GitHub
commit f584cf5d29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 10 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/includes/cron/cron_run.php
View file

@ -83,7 +83,7 @@ foreach ($cron_jobs as $job) {
$msg .= LOG_LF . '------=-------=----------=------=-------=----------';
bb_log($msg . LOG_LF, CRON_LOG_DIR . '/' . CRON_LOG_FILE);
if (is_countable($cron_runtime_log)) {
if (is_array($cron_runtime_log)) {
$runtime_log_file = ($job['log_file']) ?: $job['cron_script'];
$cron_runtime_log[] = '';
bb_log($cron_runtime_log, CRON_LOG_DIR . '/' . basename($runtime_log_file));

82
library/includes/cron/jobs/update_geolite_db.php
View file

@ -1,82 +0,0 @@
<?php
/**
* TorrentPier – Bull-powered BitTorrent tracker engine
*
* @copyright Copyright (c) 2005-2024 TorrentPier (https://torrentpier.com)
* @link https://github.com/torrentpier/torrentpier for the canonical source repository
* @license https://github.com/torrentpier/torrentpier/blob/master/LICENSE MIT License
*/
if (!defined('BB_ROOT')) {
die(basename(__FILE__));
}
set_time_limit(600);
global $cron_runtime_log;
$save_path = INT_DATA_DIR . '/GeoLite2-City.mmdb';
$old_file_path = INT_DATA_DIR . '/GeoLite2-City.mmdb.old';
$repo_link = 'https://api.github.com/repos/P3TERX/GeoLite.mmdb/releases/latest';
if (is_file($old_file_path) && unlink($old_file_path)) {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Old GeoLite file successfully removed (First step)";
}
if (is_file($save_path)) {
if (rename($save_path, $old_file_path)) {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Successfully created old GeoLite file";
} else {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Cannot create old GeoLite file";
}
} else {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Cannot find GeoLite file (It's okay)";
}
$context = stream_context_create(['http' => ['header' => 'User-Agent: ' . APP_NAME]]);
$repo_content = file_get_contents($repo_link, context: $context);
$json_response = false;
if ($repo_content !== false) {
$json_response = json_decode(utf8_encode($repo_content), true);
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Successfully connected to: " . $repo_link;
} else {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Cannot access to: " . $repo_link;
}
if (is_array($json_response) && !empty($json_response)) {
$download_link = $json_response['assets'][1]['browser_download_url'];
$file_date = $json_response['name'] ?? '';
if (!empty($download_link)) {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Link to download is valid: " . $download_link;
$get_file = file_get_contents($download_link);
$get_file_md5 = md5_file($download_link);
if ($get_file !== false) {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- GeoLite file obtained. MD5: $get_file_md5";
file_put_contents($save_path, $get_file); // Save new GeoLite file!
if (is_file($save_path) && ($get_file_md5 === md5_file($save_path))) {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- GeoLite file successfully saved ($file_date). MD5 hashes are identical";
if (is_file($old_file_path) && unlink($old_file_path)) {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Old GeoLite file successfully removed (Second step)";
}
} else {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Reverting all changes...";
if (is_file($old_file_path)) {
if (rename($old_file_path, $save_path)) {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Successfully reverted";
} else {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Cannot revert changes, because cannot rename old file";
}
} else {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Cannot revert changes, old file not found";
}
}
} else {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- GeoLite file not obtained";
}
} else {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Cannot find link to download";
}
} else {
$cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Invalid response from server: " . $json_response;
}