latest update

This commit is contained in:
ghassan committed 2026-03-11 11:21:33 +03:00
1 parent 9ad842dcd5
commit 062c0e896f
42 files changed
+7052 -2921

No files matched your search

+155 -98
View File
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use App\Jobs\CompressVideoJob;
use App\Mail\VideoUploaded;
use App\Models\Playlist;
use App\Models\Video;
use FFMpeg\FFMpeg;
use FFMpeg\FFProbe;
@@ -23,25 +24,26 @@ class VideoController extends Controller
public function index()
{
$videos = Video::public()->latest()->paginate(12);
return view('videos.index', compact('videos'));
}
public function search(Request $request)
{
$query = $request->get('q', '');
if (empty($query)) {
return redirect()->route('videos.index');
}
$videos = Video::public()
->where(function($q) use ($query) {
->where(function ($q) use ($query) {
$q->where('title', 'like', "%{$query}%")
->orWhere('description', 'like', "%{$query}%");
->orWhere('description', 'like', "%{$query}%");
})
->latest()
->paginate(12);
return view('videos.index', compact('videos', 'query'));
}
@@ -62,41 +64,41 @@ class VideoController extends Controller
]);
$videoFile = $request->file('video');
$filename = Str::slug($request->title) . '-' . time() . '.' . $videoFile->getClientOriginalExtension();
$filename = Str::slug($request->title).'-'.time().'.'.$videoFile->getClientOriginalExtension();
$path = $videoFile->storeAs('public/videos', $filename);
// Get file info
$fileSize = $videoFile->getSize();
$mimeType = $videoFile->getMimeType();
$thumbnailPath = null;
if ($request->hasFile('thumbnail')) {
$thumbFilename = Str::uuid() . '.' . $request->file('thumbnail')->getClientOriginalExtension();
$thumbFilename = Str::uuid().'.'.$request->file('thumbnail')->getClientOriginalExtension();
$thumbnailPath = $request->file('thumbnail')->storeAs('public/thumbnails', $thumbFilename);
} else {
// Extract thumbnail from video using FFmpeg
try {
$ffmpeg = FFMpeg::create();
$videoPath = storage_path('app/' . $path);
$videoPath = storage_path('app/'.$path);
if (file_exists($videoPath)) {
$video = $ffmpeg->open($videoPath);
$frame = $video->frame(\FFMpeg\Coordinate\TimeCode::fromSeconds(1));
$thumbFilename = Str::uuid() . '.jpg';
$thumbFullPath = storage_path('app/public/thumbnails/' . $thumbFilename);
$thumbFilename = Str::uuid().'.jpg';
$thumbFullPath = storage_path('app/public/thumbnails/'.$thumbFilename);
// Ensure thumbnails directory exists
if (!file_exists(storage_path('app/public/thumbnails'))) {
if (! file_exists(storage_path('app/public/thumbnails'))) {
mkdir(storage_path('app/public/thumbnails'), 0755, true);
}
$frame->save($thumbFullPath);
$thumbnailPath = 'public/thumbnails/' . $thumbFilename;
$thumbnailPath = 'public/thumbnails/'.$thumbFilename;
}
} catch (\Exception $e) {
// Log the error but don't fail the upload
\Log::error('FFmpeg failed to extract thumbnail: ' . $e->getMessage());
\Log::error('FFmpeg failed to extract thumbnail: '.$e->getMessage());
}
}
@@ -107,16 +109,16 @@ class VideoController extends Controller
try {
$ffprobe = FFProbe::create();
$videoPath = storage_path('app/' . $path);
$videoPath = storage_path('app/'.$path);
if (file_exists($videoPath)) {
$streams = $ffprobe->streams($videoPath);
$videoStream = $streams->videos()->first();
if ($videoStream) {
$width = $videoStream->get('width');
$height = $videoStream->get('height');
// Auto-detect orientation based on dimensions
if ($width && $height) {
if ($height > $width) {
@@ -131,7 +133,7 @@ class VideoController extends Controller
}
} catch (\Exception $e) {
// Log the error but don't fail the upload
\Log::error('FFprobe failed to get video dimensions: ' . $e->getMessage());
\Log::error('FFprobe failed to get video dimensions: '.$e->getMessage());
// Use default orientation
}
@@ -163,22 +165,22 @@ class VideoController extends Controller
Mail::to(Auth::user()->email)->send(new VideoUploaded($video, Auth::user()->name));
} catch (\Exception $e) {
// Log the error but don't fail the upload
\Log::error('Email notification failed: ' . $e->getMessage());
\Log::error('Email notification failed: '.$e->getMessage());
}
return response()->json([
'success' => true,
'redirect' => route('videos.show', $video->id)
'redirect' => route('videos.show', $video->id),
]);
}
public function show(Video $video)
public function show(Request $request, Video $video)
{
// Check if user can view this video
if (!$video->canView(Auth::user())) {
if (! $video->canView(Auth::user())) {
abort(404, 'Video not found');
}
// Track view if user is logged in
if (Auth::check()) {
$user = Auth::user();
@@ -188,27 +190,50 @@ class VideoController extends Controller
->where('video_id', $video->id)
->where('watched_at', '>', now()->subHour())
->first();
if (!$existingView) {
if (! $existingView) {
\DB::table('video_views')->insert([
'user_id' => $user->id,
'video_id' => $video->id,
'watched_at' => now()
'watched_at' => now(),
]);
}
}
// Load comments with user relationship
$video->load(['comments.user', 'comments.replies.user']);
// Handle playlist navigation if playlist parameter is provided
$playlist = null;
$nextVideo = null;
$previousVideo = null;
$playlistVideos = null;
$playlistId = $request->query('playlist');
if ($playlistId) {
$playlist = Playlist::find($playlistId);
if ($playlist && $playlist->canView(Auth::user())) {
$nextVideo = $playlist->getNextVideo($video);
$previousVideo = $playlist->getPreviousVideo($video);
$playlistVideos = $playlist->videos;
}
}
// Get recommended videos (exclude current video)
$recommendedVideos = Video::public()
->where('id', '!=', $video->id)
->latest()
->limit(20)
->get();
// Render the appropriate view based on video type
$view = match($video->type) {
$view = match ($video->type) {
'match' => 'videos.types.match',
'music' => 'videos.types.music',
default => 'videos.types.generic',
};
return view($view, compact('video'));
return view($view, compact('video', 'playlist', 'nextVideo', 'previousVideo', 'recommendedVideos', 'playlistVideos'));
}
public function edit(Video $video, Request $request)
@@ -217,12 +242,12 @@ class VideoController extends Controller
if (Auth::id() !== $video->user_id) {
abort(403, 'You do not have permission to edit this video.');
}
// If not AJAX request, redirect to show page with edit parameter
if (!$request->expectsJson() && !$request->ajax()) {
if (! $request->expectsJson() && ! $request->ajax()) {
return redirect()->route('videos.show', $video->id)->with('openEditModal', true);
}
// For AJAX request, return JSON
return response()->json([
'success' => true,
@@ -231,10 +256,10 @@ class VideoController extends Controller
'title' => $video->title,
'description' => $video->description,
'thumbnail' => $video->thumbnail,
'thumbnail_url' => $video->thumbnail ? asset('storage/thumbnails/' . $video->thumbnail) : null,
'thumbnail_url' => $video->thumbnail ? asset('storage/thumbnails/'.$video->thumbnail) : null,
'visibility' => $video->visibility ?? 'public',
'type' => $video->type ?? 'generic',
]
],
]);
}
@@ -257,15 +282,15 @@ class VideoController extends Controller
if ($request->hasFile('thumbnail')) {
if ($video->thumbnail) {
Storage::delete('public/thumbnails/' . $video->thumbnail);
Storage::delete('public/thumbnails/'.$video->thumbnail);
}
$thumbFilename = Str::uuid() . '.' . $request->file('thumbnail')->getClientOriginalExtension();
$thumbFilename = Str::uuid().'.'.$request->file('thumbnail')->getClientOriginalExtension();
$data['thumbnail'] = $request->file('thumbnail')->storeAs('public/thumbnails', $thumbFilename);
$data['thumbnail'] = basename($data['thumbnail']);
}
// Set default visibility if not provided
if (!isset($data['visibility'])) {
if (! isset($data['visibility'])) {
unset($data['visibility']);
}
@@ -281,7 +306,7 @@ class VideoController extends Controller
'title' => $video->title,
'description' => $video->description,
'visibility' => $video->visibility,
]
],
]);
}
@@ -294,15 +319,15 @@ class VideoController extends Controller
if (Auth::id() !== $video->user_id) {
abort(403, 'You do not have permission to delete this video.');
}
$videoTitle = $video->title;
Storage::delete('public/videos/' . $video->filename);
Storage::delete('public/videos/'.$video->filename);
if ($video->thumbnail) {
Storage::delete('public/thumbnails/' . $video->thumbnail);
Storage::delete('public/thumbnails/'.$video->thumbnail);
}
$video->delete();
// Return JSON for AJAX requests
if ($request->expectsJson() || $request->ajax()) {
return response()->json([
@@ -317,13 +342,13 @@ class VideoController extends Controller
public function stream(Video $video)
{
// Check if user can view this video
if (!$video->canView(Auth::user())) {
if (! $video->canView(Auth::user())) {
abort(404, 'Video not found');
}
$path = storage_path('app/public/videos/' . $video->filename);
if (!file_exists($path)) {
$path = storage_path('app/public/videos/'.$video->filename);
if (! file_exists($path)) {
abort(404, 'Video file not found');
}
@@ -331,47 +356,47 @@ class VideoController extends Controller
$mimeType = $video->mime_type ?: 'video/mp4';
$handle = fopen($path, 'rb');
if (!$handle) {
if (! $handle) {
abort(500, 'Cannot open video file');
}
$range = request()->header('Range');
if ($range) {
// Parse range header
preg_match('/bytes=(\d+)-(\d*)/', $range, $matches);
$start = intval($matches[1] ?? 0);
$end = $matches[2] ? intval($matches[2]) : $fileSize - 1;
$length = $end - $start + 1;
header('HTTP/1.1 206 Partial Content');
header('Content-Type: ' . $mimeType);
header('Content-Length: ' . $length);
header('Content-Range: bytes ' . $start . '-' . $end . '/' . $fileSize);
header('Content-Type: '.$mimeType);
header('Content-Length: '.$length);
header('Content-Range: bytes '.$start.'-'.$end.'/'.$fileSize);
header('Accept-Ranges: bytes');
header('Cache-Control: public, max-age=3600');
fseek($handle, $start);
$chunkSize = 8192;
$bytesToRead = $length;
while (!feof($handle) && $bytesToRead > 0) {
while (! feof($handle) && $bytesToRead > 0) {
$buffer = fread($handle, min($chunkSize, $bytesToRead));
echo $buffer;
flush();
$bytesToRead -= strlen($buffer);
}
fclose($handle);
exit;
} else {
// No range requested, stream entire file
header('Content-Type: ' . $mimeType);
header('Content-Length: ' . $fileSize);
header('Content-Type: '.$mimeType);
header('Content-Length: '.$fileSize);
header('Accept-Ranges: bytes');
header('Cache-Control: public, max-age=3600');
fpassthru($handle);
fclose($handle);
exit;
@@ -381,18 +406,18 @@ class VideoController extends Controller
public function download(Video $video)
{
// Check if user can view this video
if (!$video->canView(Auth::user())) {
if (! $video->canView(Auth::user())) {
abort(404, 'Video not found');
}
$path = storage_path('app/public/videos/' . $video->filename);
if (!file_exists($path)) {
$path = storage_path('app/public/videos/'.$video->filename);
if (! file_exists($path)) {
abort(404, 'Video file not found');
}
$filename = $video->title . '.' . pathinfo($video->filename, PATHINFO_EXTENSION);
$filename = $video->title.'.'.pathinfo($video->filename, PATHINFO_EXTENSION);
return response()->download($path, $filename);
}
@@ -401,41 +426,73 @@ class VideoController extends Controller
{
$hours = $request->get('hours', 48); // Default: 48 hours
$limit = $request->get('limit', 50);
// Validate parameters
$hours = min(max($hours, 24), 168); // Between 24h and 7 days
$limit = min(max($limit, 10), 100);
// Get trending videos using the scope with raw score calculation
$trendingVideos = \DB::table('videos')
->select('videos.*',
\DB::raw('(
(SELECT COUNT(*) FROM video_views vv WHERE vv.video_id = videos.id AND vv.watched_at >= DATE_SUB(NOW(), INTERVAL ' . $hours . ' HOUR)) * 0.70 +
(SELECT COUNT(*) FROM video_views vv WHERE vv.video_id = videos.id AND vv.watched_at >= DATE_SUB(NOW(), INTERVAL ' . $hours . ' HOUR)) / ' . $hours . ' * 100 * 0.15 +
GREATEST(0, 1 - TIMESTAMPDIFF(HOUR, videos.created_at, NOW()) / 240) * 50 * 0.10 +
(SELECT COUNT(*) FROM video_likes vl WHERE vl.video_id = videos.id) * 0.1 * 0.05
) as trending_score')
)
->where('visibility', 'public')
// Get all public ready videos first
$videos = Video::public()
->where('status', 'ready')
->where('created_at', '>=', now()->subDays(10))
->having('trending_score', '>', 0)
->orderByDesc('trending_score')
->limit($limit)
->with('user')
->get();
// Load user relationship
$trendingVideos = $trendingVideos->map(function ($video) {
$video->user = \App\Models\User::find($video->user_id);
$video->view_count = \DB::table('video_views')->where('video_id', $video->id)->count();
$video->like_count = \DB::table('video_likes')->where('video_id', $video->id)->count();
// Calculate trending score for each video
$videos = $videos->map(function ($video) use ($hours) {
$recentViews = \DB::table('video_views')
->where('video_id', $video->id)
->where('watched_at', '>=', now()->subHours($hours))
->count();
$likeCount = \DB::table('video_likes')
->where('video_id', $video->id)
->count();
// Calculate age in hours
$ageHours = $video->created_at->diffInHours(now());
// Calculate trending score
// 70% recent views, 15% velocity, 10% recency, 5% likes
$velocity = $recentViews / $hours;
$recencyBonus = max(0, 1 - ($ageHours / 240));
$score = ($recentViews * 0.70) +
($velocity * 100 * 0.15) +
($recencyBonus * 50 * 0.10) +
($likeCount * 0.1 * 0.05);
$video->trending_score = round($score, 2);
$video->view_count = $recentViews;
$video->like_count = $likeCount;
return $video;
});
// Filter and sort by trending score
$trendingVideos = $videos
->filter(fn ($v) => $v->trending_score > 0)
->sortByDesc('trending_score')
->take($limit)
->values();
return view('videos.trending', [
'videos' => $trendingVideos,
'hours' => $hours,
'limit' => $limit,
]);
}
// Shorts page
public function shorts(Request $request)
{
$videos = Video::public()
->where('is_shorts', true)
->where('status', 'ready')
->with('user')
->latest()
->paginate(12);
return view('videos.shorts', compact('videos'));
}
}