Skip to content

A self-hosted media server and file management system

fix view count and temp remake view count

aminnausin018071753626
diff --git a/app/Http/Controllers/Api/V1/VideoController.php b/app/Http/Controllers/Api/V1/VideoController.php
index 9d36b2cc..0da42b3d 100755
--- a/app/Http/Controllers/Api/V1/VideoController.php
+++ b/app/Http/Controllers/Api/V1/VideoController.php
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
use App\Http\Requests\VideoCollectionRequest;
use App\Http\Requests\VideoUpdateRequest;
use App\Http\Resources\VideoResource;
+use App\Models\Record;
use App\Models\Video;
use App\Traits\HttpResponses;
use Illuminate\Http\Request;
@@ -65,11 +66,13 @@ class VideoController extends Controller {
* @return \Illuminate\Http\Response
*/
public function watch(Request $request, Video $video) {
- $metadata = $video->metadata();
- if ($metadata) {
- $metadata->update(['view_count' => ($metadata->view_count ?? 0) + 1]);
+ $metadata = $video->metadata;
+
+ // Only update view count via metadata if it exists (ie do not reset)
+ if (isset($metadata->view_count)) {
+ $metadata->update(['view_count' => $metadata->view_count + 1]);
} else {
- $video->update(['view_count' => ($video->view_count ?? 0) + 1]);
+ $metadata->update(['view_count' => Record::where('video_id', $video->id)->whereNull('metadata_id')->count() + ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0) + 1]);
}
return $this->success(new VideoResource($video->load('metadata.videoTags.tag')));
diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.php
index 8ece4610..0bccca0e 100755
--- a/app/Jobs/VerifyFiles.php
+++ b/app/Jobs/VerifyFiles.php
@@ -284,8 +284,8 @@ class VerifyFiles implements ShouldQueue {
if (is_null($metadata->bitrate) && ! isset($changes['bitrate'])) {
$changes['bitrate'] = $audioMetadata['bitrate'] ?? null;
}
-
- is_null($metadata->view_count) ? $changes['view_count'] = Record::where('video_id', $video->id)->count() + ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0) : $stored['view_count'] = $metadata->view_count;
+ $changes['view_count'] = Record::where('video_id', $video->id)->whereNull('metadata_id')->count() + ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0);
+ // is_null($metadata->view_count) ? $changes['view_count'] = Record::where('video_id', $video->id)->whereNull('metadata_id')->count() + ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0) : $stored['view_count'] = $metadata->view_count;
if (count($changes) > 0) {
$changes['date_scanned'] = date('Y-m-d h:i:s A');