';
- array_map(function ($var) {
- var_dump($var);
- }, func_get_args());
- echo '';
- exit(0);
+ echo '';
+ array_map(function ($var) {
+ var_dump($var);
+ }, func_get_args());
+ echo '';
+ exit(0);
}
+
function do_log($log, $level = 'info')
{
global $CURUSER;
@@ -177,7 +178,7 @@ function getLogFile()
if (!is_null($logFile)) {
return $logFile;
}
- $config = config('nexus');
+ $config = nexus_config('nexus');
$logFile = sys_get_temp_dir() . '/nexus_' . date('Y-m-d') . '.log';
if (!empty($config['log_file'])) {
$logFile = $config['log_file'];
@@ -208,26 +209,30 @@ function getLogFile()
}
-function config($key, $default = null)
+function nexus_config($key, $default = null)
{
- static $configs;
- if (is_null($configs)) {
- //get all configuration from config file
- $files = glob(ROOT_PATH . 'config/*.php');
- foreach ($files as $file) {
- $basename = basename($file);
- if ($basename == 'allconfig.php') {
- //exclude the NexusPHP default config file
- continue;
- }
- $values = require $file;
- $configPrefix = strstr($basename, '.php', true);
- $configs[$configPrefix] = $values;
- }
- }
- return arr_get($configs, $key, $default);
+ static $configs;
+ if (is_null($configs)) {
+ //get all configuration from config file
+// $files = glob(ROOT_PATH . 'config/*.php');
+ $files = [
+ ROOT_PATH . 'config/nexus.php',
+ ];
+ foreach ($files as $file) {
+ $basename = basename($file);
+ if ($basename == 'allconfig.php') {
+ //exclude the NexusPHP default config file
+ continue;
+ }
+ $values = require $file;
+ $configPrefix = strstr($basename, '.php', true);
+ $configs[$configPrefix] = $values;
+ }
+ }
+ return arr_get($configs, $key, $default);
}
+
/**
* get setting for given name and prefix
*
@@ -257,24 +262,23 @@ function get_setting($name = null)
return arr_get($settings, $name);
}
-function env($key = null, $default = null)
+function nexus_env($key = null, $default = null)
{
- static $env;
- if (is_null($env)) {
- $envFile = ROOT_PATH . '.env';
- $env = readEnvFile($envFile);
- }
- if (is_null($key)) {
- return $env;
+ static $env;
+ if (is_null($env)) {
+ $envFile = defined('ROOT_PATH') ? ROOT_PATH . '.env' : base_path('.env');
+ $env = readEnvFile($envFile);
}
- return $env[$key] ?? $default;
-
+ if (is_null($key)) {
+ return $env;
+ }
+ return $env[$key] ?? $default;
}
function readEnvFile($envFile)
{
if (!file_exists($envFile)) {
- throw new \RuntimeException("env file is not exists in the root path.");
+ throw new \RuntimeException("env file : $envFile is not exists in the root path.");
}
$env = [];
$fp = fopen($envFile, 'r');
@@ -423,3 +427,68 @@ function getBaseUrl()
}
return trim($url, '/');
}
+
+function api(...$args)
+{
+ if (!isset($args[2])) {
+ //参数少于3个时，默认为错误状态。
+ $ret = -1;
+ $msg = isset($args[0]) ? $args[0] : 'ERROR';
+ $data = isset($args[1]) ? $args[1] : [];
+ } else {
+ $ret = $args[0];
+ $msg = $args[1];
+ $data = $args[2];
+ }
+
+ if (defined('LARAVEL_START')) {
+ $start = LARAVEL_START;
+ if ($data instanceof \Illuminate\Http\Resources\Json\ResourceCollection || $data instanceof \Illuminate\Http\Resources\Json\JsonResource) {
+ $data = $data->response()->getData(true);
+ if (isset($data['data']) && count($data) == 1) {
+ //单纯的集合，无分页等其数据
+ $data = $data['data'];
+ }
+ }
+ } elseif (defined('NEXUS_START')) {
+ $start = NEXUS_START;
+ } else {
+ throw new \RuntimeException("no constant START is defined.");
+ }
+ return [
+ 'ret' => (int)$ret,
+ 'msg' => (string)$msg,
+ 'data' => $data,
+ 'timeuse' => (float)number_format(microtime(true) - $start, 3),
+ ];
+}
+
+function success(...$args)
+{
+ $ret = 0;
+ $msg = 'OK';
+ $data = [];
+ $argumentCount = func_num_args();
+ if ($argumentCount == 1) {
+ $data = $args[0];
+ } elseif ($argumentCount == 2) {
+ $msg = $args[0];
+ $data = $args[1];
+ }
+ return api($ret, $msg, $data);
+}
+
+function fail(...$args)
+{
+ $ret = -1;
+ $msg = 'ERROR';
+ $data = [];
+ $argumentCount = func_num_args();
+ if ($argumentCount == 1) {
+ $data = $args[0];
+ } elseif ($argumentCount == 2) {
+ $msg = $args[0];
+ $data = $args[1];
+ }
+ return api($ret, $msg, $data);
+}
diff --git a/nexus/Database/DB.php b/nexus/Database/DB.php
index 76514a67..ec2c3105 100644
--- a/nexus/Database/DB.php
+++ b/nexus/Database/DB.php
@@ -61,7 +61,7 @@ class DB
if ($this->isConnected()) {
return null;
}
- $config = config('database.mysql');
+ $config = nexus_config('nexus.mysql');
return $this->connect($config['host'], $config['username'], $config['password'], $config['database'], $config['port']);
}
@@ -207,4 +207,4 @@ class DB
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/nexus/Field/Field.php b/nexus/Field/Field.php
index 8d61b060..f5a9d07f 100644
--- a/nexus/Field/Field.php
+++ b/nexus/Field/Field.php
@@ -408,7 +408,6 @@ JS;
$displayName = get_searchbox_value($browsecatmode, 'custom_fields_display_name');
$display = get_searchbox_value($browsecatmode, 'custom_fields_display');
$customFields = $this->listTorrentCustomField($torrentId);
-// dd($displayName, $display, $customFields);
$mixedRowContent = nl2br($display);
$rowByRowHtml = '';
foreach ($customFields as $field) {
@@ -486,4 +485,4 @@ JS;
-}
\ No newline at end of file
+}
diff --git a/nexus/Install/Install.php b/nexus/Install/Install.php
index bfd26056..f16a0794 100644
--- a/nexus/Install/Install.php
+++ b/nexus/Install/Install.php
@@ -8,7 +8,7 @@ class Install
{
protected $currentStep;
- protected $minimumPhpVersion = '7.2.0';
+ protected $minimumPhpVersion = '7.3.0';
protected $progressKeyPrefix = '__step';
@@ -522,4 +522,4 @@ class Install
}
return true;
}
-}
\ No newline at end of file
+}
diff --git a/nexus/Torrent/TechnicalInformation.php b/nexus/Torrent/TechnicalInformation.php
index a89e1cf1..688a30b9 100644
--- a/nexus/Torrent/TechnicalInformation.php
+++ b/nexus/Torrent/TechnicalInformation.php
@@ -149,7 +149,6 @@ class TechnicalInformation
$videos = array_filter($videos);
$audios = $this->getAudios();
$subtitles = $this->getSubtitles();
-// dd($this->mediaInfoArr, $videos, $audios, $subtitles);
//video part
$videoTable = '