up

xiaomlove · Oct 7, 2024 · 9fec1a7 · 9fec1a7
1 parent 000862f
commit 9fec1a7
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 14 deletions.
diff --git a/app/Console/Commands/Test.php b/app/Console/Commands/Test.php
@@ -40,10 +40,12 @@
 use Carbon\Carbon;
 use Filament\Notifications\Notification;
 use GeoIp2\Database\Reader;
+use GuzzleHttp\Client;
 use Illuminate\Console\Command;
 use Illuminate\Encryption\Encrypter;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
@@ -98,7 +100,17 @@ public function __construct()
      */
     public function handle()
     {
-        CleanupRepository::checkQueueFailedJobs();
+        $url = "http://127.0.0.1:7777/list-seeder-leecher-count";
+        $idArr = [8, 12];
+        $client = new Client();
+        $response = $client->post($url, ['json' => ['torrent_ids' => $idArr]]);
+        $result = json_decode((string)$response->getBody(), true);
+        dump($result);
+        if (!isset($result['ret']) || $result['ret'] != 0) {
+            echo "Bad";
+        } else {
+            echo "OK";
+        }
     }
 
 }
diff --git a/app/Jobs/LoadTorrentBoughtUsers.php b/app/Jobs/LoadTorrentBoughtUsers.php
@@ -16,6 +16,10 @@ class LoadTorrentBoughtUsers implements ShouldQueue
 
     private int $torrentId;
 
+    public $tries = 1;
+
+    public $timeout = 1800;
+
     /**
      * Create a new job instance.
      *

diff --git a/include/constants.php b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.14');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2024-10-04');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2024-10-07');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");

diff --git a/nexus/Plugin/BasePlugin.php b/nexus/Plugin/BasePlugin.php
@@ -2,9 +2,7 @@
 namespace Nexus\Plugin;
 
 use App\Repositories\BaseRepository;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Artisan;
-use Nexus\Database\NexusDB;
 
 abstract class BasePlugin extends BaseRepository
 {
@@ -44,4 +42,14 @@ public function getNexusView($name): string
         $pluginRoot = dirname($reflection->getFileName(), 2);
         return $pluginRoot . "/resources/views/" . trim($name, "/");
     }
+
+    public function trans($name): string
+    {
+        return nexus_trans(sprintf("%s::%s", static::ID, $name));
+    }
+
+    public static function getInstance(): static
+    {
+        return Plugin::getById(static::ID);
+    }
 }
diff --git a/public/viewpeerlist.php b/public/viewpeerlist.php
@@ -168,16 +168,24 @@ function dltable($name, $arr, $torrent, &$isSeedBoxCaseWhens)
 	$s .= "</table>\n";
 	return $s;
 }
-	$downloaders = array();
-	$seeders = array();
-	$torrent = \App\Models\Torrent::query()->findOrFail($id, ['id', 'seeders', 'leechers']);
-	$subres = sql_query("SELECT id, seeder, finishedat, downloadoffset, uploadoffset, ip, ipv4, ipv6, port, uploaded, downloaded, to_go, UNIX_TIMESTAMP(started) AS st, connectable, agent, peer_id, UNIX_TIMESTAMP(last_action) AS la, userid FROM peers WHERE torrent = $id") or sqlerr();
-	while ($subrow = mysql_fetch_array($subres)) {
-	if ($subrow["seeder"] == "yes")
-		$seeders[] = $subrow;
-	else
-		$downloaders[] = $subrow;
-	}
+    $downloaders = array();
+    $seeders = array();
+    $torrent = \App\Models\Torrent::query()->findOrFail($id, ['id', 'seeders', 'leechers']);
+    $seedersAndLeechers = apply_filter("torrent_seeder_leecher_list", [], $id);
+    if (isset($seedersAndLeechers['seeders'], $seedersAndLeechers['leechers'])) {
+//        dd($seedersAndLeechers);
+        $seeders = $seedersAndLeechers['seeders'];
+        $downloaders = $seedersAndLeechers['leechers'];
+        do_log("SEEDER_LEECHER_FROM_FILTER: torrent_seeder_leecher_list");
+    } else {
+        $subres = sql_query("SELECT id, seeder, finishedat, downloadoffset, uploadoffset, ip, ipv4, ipv6, port, uploaded, downloaded, to_go, UNIX_TIMESTAMP(started) AS st, connectable, agent, peer_id, UNIX_TIMESTAMP(last_action) AS la, userid FROM peers WHERE torrent = $id") or sqlerr();
+        while ($subrow = mysql_fetch_array($subres)) {
+            if ($subrow["seeder"] == "yes")
+                $seeders[] = $subrow;
+            else
+                $downloaders[] = $subrow;
+        }
+    }
 	$seedersCount = count($seeders);
 	$leechersCount = count($downloaders);
     if ($torrent->seeders != $seedersCount || $torrent->leechers != $leechersCount) {