diff --git a/app/Http/Controllers/VideoController.php b/app/Http/Controllers/VideoController.php index 5fcc980..d15ecdb 100644 --- a/app/Http/Controllers/VideoController.php +++ b/app/Http/Controllers/VideoController.php @@ -22,25 +22,26 @@ class VideoController extends Controller * @return Response */ public function index(Request $request) { - - if($request->has('q')){ - $needle = trim($request->input('q')); - return view('index', [ - 'videos' => Video::filtered()->withAnyTagsFuzzy($needle) - ->orderBy('id', 'asc') - ->paginate(20)->appends(['q' => $needle]), + $videos = Video::filtered(); + if($request->has('q')) { + $needle = trim($request->input('q')); + $videos = $videos->withAnyTagsFuzzy($needle); + return view('index', [ + 'number_of_results' => $videos->get()->count(), + 'videos' => $videos->orderBy('id', 'ASC')->paginate(20)->appends(['q' => $needle]), 'categories' => Category::all(), - 'q' => $needle, + 'q' => $needle ]); } - return view('index', [ - 'videos' => Video::filtered()->orderBy('id', 'ASC')->paginate(20), - 'categories' => Category::all(), + return view('index', [ + 'number_of_results' => $videos->get()->count(), + 'videos' => $videos->orderBy('id', 'ASC')->paginate(20), + 'categories' => Category::all() ]); } - public function main(Request $request) { + public function main(Request $request) { if($request->has('q')){ $needle = trim($request->input('q')); return view('main', [ @@ -181,9 +182,11 @@ class VideoController extends Controller #->back(); #->with('error', 'No video with that ID found'); - $sfw = $video->tags->contains(function($key, $tag) { - return $tag->normalized === 'sfw'; - }); + + $sfw = $video->isSfw(); + + if(!$sfw && !file_exists(public_path() . "/thumbs/blurred/" . substr($video->file, 0, -5) . "_blurred.png")) + $video->blurryThumb(); return view('video', [ 'video' => $video, diff --git a/app/Http/routes.php b/app/Http/routes.php index df53559..894e7ec 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -38,9 +38,9 @@ Route::group(['prefix' => 'api'], function() { Route::group(['prefix' => 'comments'], function() { Route::get('/', 'CommentController@index')->middleware('auth'); Route::get('/{id}', 'CommentController@show')->where('id', '[0-9]+')->middleware('auth'); - Route::post('{id}/edit', 'CommentController@update')->where('id', '[0-9]+')->middleware('auth'); - Route::post('{id}/delete', 'CommentController@destroy')->where('id', '[0-9]+')->middleware('auth'); - Route::post('{id}/restore', 'CommentController@restore')->where('id', '[0-9]+')->middleware('auth'); + Route::post('{id}/edit', 'CommentController@update')->where('id', '[0-9]+')->middleware('auth')->middleware('theme'); + Route::post('{id}/delete', 'CommentController@destroy')->where('id', '[0-9]+')->middleware('auth')->middleware('theme'); + Route::post('{id}/restore', 'CommentController@restore')->where('id', '[0-9]+')->middleware('auth')->middleware('theme'); }); // /api/user @@ -76,10 +76,10 @@ Route::group(['prefix' => 'api'], function() { } return $res; })->where('id', '[0-9]+')->middleware('auth'); - Route::post('{id}/delete', 'VideoController@destroy')->where('id', '[0-9]+'); + Route::post('{id}/delete', 'VideoController@destroy')->where('id', '[0-9]+')->middleware('theme'); Route::post('{id}/tag', 'VideoController@tag')->where('id', '[0-9]+'); Route::post('{id}/untag', 'VideoController@untag')->where('id', '[0-9]+'); - #Route::post('upload', 'VideoController@store')->middleware('auth'); + Route::post('upload', 'VideoController@store')->middleware('auth'); }); #Route::post('upload', 'VideoController@store'); @@ -109,7 +109,7 @@ Route::group(["middleware" => "theme"], function() { Route::get('index', 'VideoController@index')->middleware('auth'); Route::get('main', 'VideoController@main')->middleware('auth'); Route::post('index/{id}', 'VideoController@update')->middleware('auth'); - #Route::get('upload', 'VideoController@create')->middleware('auth'); + Route::get('upload', 'VideoController@create')->middleware('auth'); Route::get('categories', 'CategoryController@index')->middleware('auth'); Route::get('webm', function() { return view('webm'); })->middleware('auth'); Route::get('about', function() { return view('about'); })->middleware('auth'); diff --git a/app/Models/Video.php b/app/Models/Video.php index 9a2d04d..5f903e5 100644 --- a/app/Models/Video.php +++ b/app/Models/Video.php @@ -163,8 +163,8 @@ class Video extends Model public function tesThumb() { set_time_limit(9899999999999999); $dat = $this->file; - #$in = public_path() . "/b"; // webm-input - $in = "/home/w0bm/w0bm/public/b"; + $in = public_path() . "/b"; // webm-input + #$in = "/home/w0bm/w0bm/public/b"; $out = public_path() . "/thumbs/beta"; //thumb-output $tmpdir = str_replace("public", "app/Http/Controllers/tmp", public_path()); @@ -192,7 +192,7 @@ public function blurryThumb() { set_time_limit(9899999999999999); $dat = $this->file; #$in = public_path() . "/b"; // webm-input - $in = "/home/w0bm/w0bm/public/b"; + $in = public_path() . "/b"; $out = public_path() . "/thumbs/blurred"; //thumb-output $tmpdir = str_replace("public", "app/Http/Controllers/tmp", public_path()); @@ -220,28 +220,6 @@ public function blurryThumb() { } } - public function createThumbnailStatic() { - $dat = $this->file; - $in = public_path() . "/b"; // webm-input - $out = public_path() . "/thumbs/testing"; //thumb-output - $tmpdir = str_replace("public", "app/Http/Controllers/tmp", public_path()); - - $name = explode(".", $dat); - array_pop($name); - $name = join(".", $name); - if(!file_exists("{$out}/{$name}.png")) { - $length = round(shell_exec("ffprobe -i {$in}/{$dat} -show_format -v quiet | sed -n 's/duration=//p'")); - for ($i = 1; $i < 10; $i++) { - $act = ($i * 10) * ($length / 100); - $ffmpeg = shell_exec("ffmpeg -ss {$act} -i {$in}/{$dat} -vf \"'select=eq(n\,0)'\" -vf scale=128:128 {$tmpdir}/{$name}_{$i}.png 2>&1"); - } - $tmp = shell_exec("convert -delay 27 -loop 0 {$tmpdir}/{$name}_*.png {$out}/{$name}.png 2>&1"); - if(@filesize("{$out}/{$name}.png") < 2000) - @unlink("{$out}/{$name}.png"); - array_map('unlink', glob("{$tmpdir}/{$name}*.png")); - } - } - public static function getRandom($related = null) { if ($related) { $id = $related->videos()->filtered()->countScoped()->count() - 1; @@ -260,8 +238,8 @@ public function blurryThumb() { } public function isSfw() { - return $this->tags->contains(function ($key, $tag) { - $tag->normalized === 'sfw'; + return !$this->tags->contains(function ($key, $tag) { + return $tag->normalized === 'nsfw'; }); } diff --git a/public/js/w0bmscript.js b/public/js/w0bmscript.js index 112ca71..a8eacbb 100644 --- a/public/js/w0bmscript.js +++ b/public/js/w0bmscript.js @@ -1143,7 +1143,7 @@ $(function() { formData.append('file', file); $('.progress-striped, #upload-stats').css('opacity', 0).slideDown('fast').animate({opacity: 1}, {queue: false, duration: 'fast'}); jqXHR = $.ajax({ - url: '/api/upload', + url: '/api/video/upload', type: 'POST', data: formData, processData: false, @@ -1443,4 +1443,4 @@ if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(naviga newlink = document.createElement('a'); newlink.setAttribute('class', 'mobiledetected'); newlink.setAttribute('href', '/api/user/layout?layout=5'); -} \ No newline at end of file +} diff --git a/resources/views/layout1/index.blade.php b/resources/views/layout1/index.blade.php index 4897795..2d7e4df 100644 --- a/resources/views/layout1/index.blade.php +++ b/resources/views/layout1/index.blade.php @@ -1,7 +1,7 @@ @extends('profilelayout') @section('content')
-

Index {{ count($videos) }} results

+

Index {{ $number_of_results }} results

{!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!} diff --git a/resources/views/layout1/layout.blade.php b/resources/views/layout1/layout.blade.php index 02791de..a123da7 100644 --- a/resources/views/layout1/layout.blade.php +++ b/resources/views/layout1/layout.blade.php @@ -15,20 +15,11 @@ @if(auth()->check())@endif @if(isset($video)) - @if(count($video->tags)) - @foreach($video->tags as $tag) - @if($tag == 'sfw') + @if($video->isSfw()) file)}}.png"@endif/> - @elseif($tag == 'nsfw') - @if(file_exists(public_path() . 'thumbs/blurred/{{$video->file}}' . '_blurred.png')) + @else file)}}_blurred.png"@endif/> - @else - {{$video->blurryThumb()}} - file)}}_blurred.png"@endif/> - @endif - @endif - @endforeach - @endif + @endif @endif @if(auth()->check())@endif diff --git a/resources/views/layout1/main.blade.php b/resources/views/layout1/main.blade.php index 5174ffe..a900481 100644 --- a/resources/views/layout1/main.blade.php +++ b/resources/views/layout1/main.blade.php @@ -18,11 +18,10 @@
{{-- MUSS UNBEDINGT NOCH ANGEPASST WERDEN!!! --}} - @if(file_exists('/home/w0bm/w0bm/public/thumbs/beta/'.$thumb.'.png')) + @if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png')) @else - {{$video->tesThumb()}} - + @endif
diff --git a/resources/views/layout1/partials/comments.blade.php b/resources/views/layout1/partials/comments.blade.php index a2f20b5..b60807a 100644 --- a/resources/views/layout1/partials/comments.blade.php +++ b/resources/views/layout1/partials/comments.blade.php @@ -15,7 +15,6 @@ Help to improve w0bm, click here
--> @if(Auth::check()) -

Shutting down 9.12.2020, all donations refunded!
wget -m -np -c -U "blah" -R "index.html*" "https://b.w0bm.com/b/" backup if you like

@include('partials.commentform') @endif diff --git a/resources/views/layout1/video.blade.php b/resources/views/layout1/video.blade.php index 97d1d7f..fa9d979 100644 --- a/resources/views/layout1/video.blade.php +++ b/resources/views/layout1/video.blade.php @@ -2,12 +2,6 @@ @section('content') @if(auth()->check()) - -@if(file_exists(public_path() . 'thumbs/beta/{{$video->file}}' . '.png')) -@else -{{$video->tesThumb()}} -@endif -
@@ -21,7 +15,7 @@ @else @endif @@ -140,7 +134,6 @@ @else -{{$video->tesThumb()}}
@@ -159,20 +152,11 @@
- @if(count($video->tags)) - @foreach($video->tags as $tag) - @if($tag == 'sfw') - file)}}.png"@endif"> - @elseif($tag == 'nsfw') - @if(file_exists(public_path() . 'thumbs/blurred/{{$video->file}}' . '_blurred.png')) - file)}}_blurred.png"@endif"> - @else - {{$video->blurryThumb()}} - file)}}_blurred.png"@endif"> - @endif - @endif - @endforeach - @endif + @if($sfw) + + @else + + @endif

diff --git a/resources/views/layout2/main.blade.php b/resources/views/layout2/main.blade.php index 0b4ed58..742407d 100644 --- a/resources/views/layout2/main.blade.php +++ b/resources/views/layout2/main.blade.php @@ -6,16 +6,14 @@ $thumb = str_replace(".webm","",$video->file); ?>
- -@if(file_exists('/home/w0bm/w0bm/public/thumbs/beta/'.$thumb.'.png')) - - -@else - - {{$video->tesThumb()}} -@endif - -
+ + @if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png')) + + @else + + @endif + +

@endforeach
diff --git a/resources/views/layout2/video.blade.php b/resources/views/layout2/video.blade.php index 6c33e99..da137b3 100644 --- a/resources/views/layout2/video.blade.php +++ b/resources/views/layout2/video.blade.php @@ -5,7 +5,7 @@
@@ -19,7 +19,7 @@
@@ -33,7 +33,7 @@ @else @endif
diff --git a/resources/views/layout3/main.blade.php b/resources/views/layout3/main.blade.php index 0b4ed58..c96cf84 100644 --- a/resources/views/layout3/main.blade.php +++ b/resources/views/layout3/main.blade.php @@ -7,12 +7,10 @@ ?>
-@if(file_exists('/home/w0bm/w0bm/public/thumbs/beta/'.$thumb.'.png')) +@if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png')) - @else - {{$video->tesThumb()}} @endif
diff --git a/resources/views/layout3/video.blade.php b/resources/views/layout3/video.blade.php index 903fb59..ddf014d 100644 --- a/resources/views/layout3/video.blade.php +++ b/resources/views/layout3/video.blade.php @@ -5,7 +5,7 @@
diff --git a/resources/views/layout4/main.blade.php b/resources/views/layout4/main.blade.php index 0b4ed58..616750f 100644 --- a/resources/views/layout4/main.blade.php +++ b/resources/views/layout4/main.blade.php @@ -7,12 +7,11 @@ ?>
-@if(file_exists('/home/w0bm/w0bm/public/thumbs/beta/'.$thumb.'.png')) +@if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png')) @else - {{$video->tesThumb()}} @endif
diff --git a/resources/views/layout4/video.blade.php b/resources/views/layout4/video.blade.php index b7261e7..0b51b60 100644 --- a/resources/views/layout4/video.blade.php +++ b/resources/views/layout4/video.blade.php @@ -5,7 +5,7 @@
@@ -34,5 +34,4 @@
@include('video-partials.legacy-videonav') - {{$video->tesThumb()}} @endsection diff --git a/resources/views/layout5/video.blade.php b/resources/views/layout5/video.blade.php index e578291..5343ea1 100644 --- a/resources/views/layout5/video.blade.php +++ b/resources/views/layout5/video.blade.php @@ -5,7 +5,7 @@
@if($video->category->name === 'Anime' || $video->category->name === 'Otomad') diff --git a/resources/views/layout6/main.blade.php b/resources/views/layout6/main.blade.php index dd88863..8b6452a 100644 --- a/resources/views/layout6/main.blade.php +++ b/resources/views/layout6/main.blade.php @@ -18,11 +18,10 @@
{{-- MUSS UNBEDINGT NOCH ANGEPASST WERDEN!!! --}} -@if(file_exists('/home/w0bm/w0bm/public/thumbs/beta/'.$thumb.'.png')) +@if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png')) @else - {{$video->tesThumb()}} - + @endif
diff --git a/resources/views/layout6/video.blade.php b/resources/views/layout6/video.blade.php index cc5faea..1c2ff81 100644 --- a/resources/views/layout6/video.blade.php +++ b/resources/views/layout6/video.blade.php @@ -3,11 +3,6 @@ @if(auth()->check()) -@if(file_exists(public_path() . 'thumbs/beta/{{$video->file}}' . '.png')) -@else -{{$video->tesThumb()}} -@endif -
@@ -21,7 +16,7 @@ @else @endif @@ -140,7 +135,6 @@ @else -{{$video->tesThumb()}}