mirrors/Speedtest-Tracker
1
0
Fork 0
mirror of https://github.com/henrywhitaker3/Speedtest-Tracker.git synced 2025-12-21 13:23:04 +01:00
Code Issues Projects Releases Wiki Activity

Added General settings section & min value on widgets

Browse Source
This commit is contained in:
Henry Whitaker
2020-09-11 00:51:27 +01:00
parent 9028ffb7cd
commit 334623454d
8 changed files with 244 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/Helpers/SettingsHelper.php
View File

@@ -7,7 +7,8 @@ use App\Setting;
use Cache;
use Carbon\Carbon;
class SettingsHelper {
class SettingsHelper
{
/**
* Get a Setting object by name
@@ -19,9 +20,9 @@ class SettingsHelper {
{
$name = Setting::where('name', $name)->get();
if(sizeof($name) == 0) {
if (sizeof($name) == 0) {
return false;
} else if(sizeof($name) == 1) {
} else if (sizeof($name) == 1) {
return $name[0];
} else {
$name = $name->keyBy('name');
@@ -40,11 +41,11 @@ class SettingsHelper {
{
$setting = SettingsHelper::get($name);
if($value === false) {
if ($value === false) {
$value = "0";
}
if($setting !== false) {
if ($setting !== false) {
$setting->value = $value;
$setting->save();
} else {
@@ -54,7 +55,7 @@ class SettingsHelper {
]);
}
if($name == 'show_failed_tests_on_graph') {
if ($name == 'show_failed_tests_on_graph') {
Cache::flush();
}
@@ -69,13 +70,13 @@ class SettingsHelper {
public static function getBase()
{
$base = env('BASE_PATH', '/');
if($base == '') {
if ($base == '') {
$base = '/';
} else {
if($base[0] != '/') {
if ($base[0] != '/') {
$base = '/' . $base;
}
if($base[-1] != '/') {
if ($base[-1] != '/') {
$base = $base . '/';
}
}
@@ -95,7 +96,7 @@ class SettingsHelper {
// Try exact key
$val = exec('echo $' . $key);
if($val == "") {
if ($val == "") {
array_push($results, true);
} else {
array_push($results, false);
@@ -104,25 +105,25 @@ class SettingsHelper {
// Try key all caps
$val = exec('echo $' . strtoupper($key));
if($val == "") {
if ($val == "") {
array_push($results, true);
} else {
array_push($results, false);
}
if(env($key, false) == false) {
if (env($key, false) == false) {
array_push($results, true);
} else {
array_push($results, false);
}
if(env(strtoupper($key), false) == false) {
if (env(strtoupper($key), false) == false) {
array_push($results, true);
} else {
array_push($results, false);
}
if(in_array(false, $results)) {
if (in_array(false, $results)) {
return false;
}
@@ -138,6 +139,11 @@ class SettingsHelper {
{
return [
'base' => SettingsHelper::getBase(),
'widgets' => [
'show_average' => (bool)SettingsHelper::get('show_average')->value,
'show_max' => (bool)SettingsHelper::get('show_max')->value,
'show_min' => (bool)SettingsHelper::get('show_min')->value,
],
'graphs' => [
'download_upload_graph_enabled' => SettingsHelper::get('download_upload_graph_enabled'),
'download_upload_graph_width' => SettingsHelper::get('download_upload_graph_width'),
@@ -163,15 +169,15 @@ class SettingsHelper {
*/
public static function testNotification($agent = true)
{
$agents = [ 'slack', 'telegram' ];
$agents = ['slack', 'telegram'];
if($agent === true) {
if ($agent === true) {
event(new TestNotificationEvent($agents));
return true;
}
if(in_array($agent, $agents)) {
event(new TestNotificationEvent([ $agent ]));
if (in_array($agent, $agents)) {
event(new TestNotificationEvent([$agent]));
return true;
}
@@ -188,14 +194,14 @@ class SettingsHelper {
'telegram_chat_id' => SettingsHelper::get('telegram_chat_id')->value,
];
foreach($settings as $key => $value) {
foreach ($settings as $key => $value) {
$key = 'integrations.' . $key;
if($value === "") {
if ($value === "") {
$value = null;
}
config()->set([ $key => $value ]);
config()->set([$key => $value]);
}
}
}

78
app/Http/Controllers/SpeedtestController.php
View File

@@ -18,9 +18,9 @@ class SpeedtestController extends Controller
{
public function __construct()
{
if((bool)SettingsHelper::get('auth')->value === true) {
if ((bool)SettingsHelper::get('auth')->value === true) {
$this->middleware('auth:api')
->only([ 'run', 'delete', 'deleteAll' ]);
->only(['run', 'delete', 'deleteAll']);
}
}
@@ -32,7 +32,7 @@ class SpeedtestController extends Controller
public function index()
{
$data = Speedtest::orderBy('created_at', 'desc')
->paginate();
->paginate();
return response()->json([
'method' => 'index of speedtests',
@@ -49,12 +49,12 @@ class SpeedtestController extends Controller
public function time($days)
{
$rule = [
'days' => [ 'required', 'integer' ],
'days' => ['required', 'integer'],
];
$validator = Validator::make([ 'days' => $days ], $rule);
$validator = Validator::make(['days' => $days], $rule);
if($validator->fails()) {
if ($validator->fails()) {
return response()->json([
'method' => 'get speedtests in last x days',
'error' => $validator->errors(),
@@ -65,16 +65,16 @@ class SpeedtestController extends Controller
$data = Cache::remember('speedtest-days-' . $days, $ttl, function () use ($days) {
$showFailed = (bool)SettingsHelper::get('show_failed_tests_on_graph')->value;
if($showFailed === true) {
if ($showFailed === true) {
return Speedtest::where('created_at', '>=', Carbon::now()->subDays($days))
->orderBy('created_at', 'asc')
->get();
->orderBy('created_at', 'asc')
->get();
}
return Speedtest::where('created_at', '>=', Carbon::now()->subDays($days))
->where('failed', false)
->orderBy('created_at', 'asc')
->get();
->where('failed', false)
->orderBy('created_at', 'asc')
->get();
});
return response()->json([
@@ -93,12 +93,12 @@ class SpeedtestController extends Controller
public function fail($days)
{
$rule = [
'days' => [ 'required', 'integer' ],
'days' => ['required', 'integer'],
];
$validator = Validator::make([ 'days' => $days ], $rule);
$validator = Validator::make(['days' => $days], $rule);
if($validator->fails()) {
if ($validator->fails()) {
return response()->json([
'method' => 'get speedtests in last x days',
'error' => $validator->errors(),
@@ -122,20 +122,38 @@ class SpeedtestController extends Controller
public function latest()
{
$data = SpeedtestHelper::latest();
$avg = Speedtest::select(DB::raw('AVG(ping) as ping, AVG(download) as download, AVG(upload) as upload'))
->where('failed', false)
->get();
$max = Speedtest::select(DB::raw('MAX(ping) as ping, MAX(download) as download, MAX(upload) as upload'))
->where('failed', false)
->get();
if($data) {
return response()->json([
'method' => 'get latest speedtest',
'data' => $data,
'average' => $avg[0],
'max' => $max[0],
], 200);
$response = [
'method' => 'get latest speedtest',
'data' => $data,
];
if (SettingsHelper::get('show_average')) {
$avg = Speedtest::select(DB::raw('AVG(ping) as ping, AVG(download) as download, AVG(upload) as upload'))
->where('failed', false)
->first()
->toArray();
$response['average'] = $avg;
}
if (SettingsHelper::get('show_max')) {
$max = Speedtest::select(DB::raw('MAX(ping) as ping, MAX(download) as download, MAX(upload) as upload'))
->where('failed', false)
->first()
->toArray();
$response['maximum'] = $max;
}
if (SettingsHelper::get('show_average')) {
$min = Speedtest::select(DB::raw('MIN(ping) as ping, MIN(download) as download, MIN(upload) as upload'))
->where('failed', false)
->first()
->toArray();
$response['minimum'] = $min;
}
if ($data) {
return response()->json($response, 200);
} else {
return response()->json([
'method' => 'get latest speedtest',
@@ -158,7 +176,7 @@ class SpeedtestController extends Controller
'method' => 'run speedtest',
'data' => 'a new speedtest has been added to the queue'
], 200);
} catch(Exception $e) {
} catch (Exception $e) {
return response()->json([
'method' => 'run speedtest',
'error' => $e
@@ -175,7 +193,7 @@ class SpeedtestController extends Controller
{
$ret = SpeedtestHelper::deleteAll();
if($ret['success']) {
if ($ret['success']) {
return response()->json([
'method' => 'delete all speedtests from the database',
'success' => true