fix hr display error when not download completed

xiaomlove · Sep 20, 2023 · ab517bf · ab517bf
1 parent 36aa10f
commit ab517bf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/app/Models/HitAndRun.php b/app/Models/HitAndRun.php
@@ -62,6 +62,10 @@ private function doGetInspectTimeLeft(): string
         if ($this->status != self::STATUS_INSPECTING) {
             return '---';
         }
+        if (!$this->snatch->completedat) {
+            //not download completed
+            return '---';
+        }
         $searchBoxId = $this->torrent->basic_category->mode ?? 0;
         if ($searchBoxId == 0) {
             do_log(sprintf('[INVALID_CATEGORY], Torrent: %s', $this->torrent_id), 'error');

diff --git a/app/Repositories/HitAndRunRepository.php b/app/Repositories/HitAndRunRepository.php
@@ -236,7 +236,7 @@ private function geReachedMessage(HitAndRun $hitAndRun): array
             'added' => Carbon::now()->toDateTimeString(),
             'subject' => nexus_trans('hr.reached_message_subject', ['hit_and_run_id' => $hitAndRun->id], $hitAndRun->user->locale),
             'msg' => nexus_trans('hr.reached_message_content', [
-                'completed_at' => $hitAndRun->snatch->completedat->toDateTimeString(),
+                'completed_at' => format_datetime($hitAndRun->snatch->completedat),
                 'torrent_id' => $hitAndRun->torrent_id,
                 'torrent_name' => $hitAndRun->torrent->name,
             ], $hitAndRun->user->locale),
@@ -335,7 +335,7 @@ private function unreached(HitAndRun $hitAndRun, array $setting, $disableUser =
             'added' => Carbon::now()->toDateTimeString(),
             'subject' => nexus_trans('hr.unreached_message_subject', ['hit_and_run_id' => $hitAndRun->id], $hitAndRun->user->locale),
             'msg' => nexus_trans('hr.unreached_message_content', [
-                'completed_at' => $hitAndRun->snatch->completedat->toDateTimeString(),
+                'completed_at' => format_datetime($hitAndRun->snatch->completedat),
                 'torrent_id' => $hitAndRun->torrent_id,
                 'torrent_name' => $hitAndRun->torrent->name,
             ], $hitAndRun->user->locale),

diff --git a/include/constants.php b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.7');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-09-20');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-09-21');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");

diff --git a/public/announce.php b/public/announce.php
@@ -630,9 +630,9 @@
             if ($snatchInfo['downloaded'] >= $requiredDownloaded) {
                 $sql = "insert into hit_and_runs (uid, torrent_id, snatched_id) values ($userid, $torrentid, {$snatchInfo['id']}) on duplicate key update updated_at = " . sqlesc(date('Y-m-d H:i:s'));
                 $affectedRows = sql_query($sql);
-                do_log("$hrLog, total downloaded: {$snatchInfo['downloaded']} > required: $requiredDownloaded, [INSERT_H&R], sql: $sql, affectedRows: $affectedRows");
+                do_log("$hrLog, total downloaded: {$snatchInfo['downloaded']} >= required: $requiredDownloaded, [INSERT_H&R], sql: $sql, affectedRows: $affectedRows");
             } else {
-                do_log("$hrLog, total downloaded: {$snatchInfo['downloaded']} <= required: $requiredDownloaded", "debug");
+                do_log("$hrLog, total downloaded: {$snatchInfo['downloaded']} < required: $requiredDownloaded", "debug");
             }
         } else {
             do_log("$hrLog, already exists", "debug");