fix thumbnail generation

fix hardcoded paths
a lot of minor fixes
This commit is contained in:
2021-01-21 19:55:42 +00:00
parent aacf387d63
commit 7a62b01027
18 changed files with 62 additions and 121 deletions

View File

@@ -1,7 +1,7 @@
@extends('profilelayout')
@section('content')
<div class="page-header">
<h3 id="index">Index <small>{{ count($videos) }} results</small></h3>
<h3 id="index">Index <small>{{ $number_of_results }} results</small></h3>
<form method="get">
<button type="submit" class="suchbutton"><i style="color:white;" class="fa fa-search"></i></button>
{!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!}

View File

@@ -15,20 +15,11 @@
<meta property="og:title" content="@if(isset($video)){{$video->videotitle}}@endif">
@if(auth()->check())<meta property="og:description" content="Tags:@if(isset($video)) {{ $video->getTagListAttribute() }} @endif">@endif
@if(isset($video))
@if(count($video->tags))
@foreach($video->tags as $tag)
@if($tag == 'sfw')
@if($video->isSfw())
<meta property="og:image" content="@if(isset($video))/thumbs/beta/{{str_replace(".webm","",$video->file)}}.png"@endif/>
@elseif($tag == 'nsfw')
@if(file_exists(public_path() . 'thumbs/blurred/{{$video->file}}' . '_blurred.png'))
@else
<meta property="og:image" content="@if(isset($video))/thumbs/blurred/{{str_replace(".webm","",$video->file)}}_blurred.png"@endif/>
@else
{{$video->blurryThumb()}}
<meta property="og:image" content="@if(isset($video))/thumbs/blurred/{{str_replace(".webm","",$video->file)}}_blurred.png"@endif/>
@endif
@endif
@endforeach
@endif
@endif
@endif
@if(auth()->check())<meta property="og:video" content="@if(isset($video))/b/{{ $video->file }} @endif">@endif
<meta property="og:url" content="@if(isset($video))/{{ $video->id }}@endif">

View File

@@ -18,11 +18,10 @@
<div class="main-item">
<a href="/{{$video->id}}">
{{-- 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'))
<img src="/thumbs/beta/{{$thumb}}.png">
@else
{{$video->tesThumb()}}
<img src="/thumbs/beta/{{$thumb}}.png">
<img src="/small_404.gif" class="nothumb">
@endif
</a>
</div>

View File

@@ -15,7 +15,6 @@
Help to improve w0bm, click <a href="https://www.strawpoll.me/20512203" target="_blank">here</a>
</div>-->
@if(Auth::check())
<p style="border: 1px solid red; text-align: center;">Shutting down <b><u>9.12.2020</u></b>, all donations refunded! <br> <code>wget -m -np -c -U "blah" -R "index.html*" "https://b.w0bm.com/b/"</code> backup if you like</p>
@include('partials.commentform')
@endif

View File

@@ -2,12 +2,6 @@
@section('content')
@if(auth()->check())
@if(file_exists(public_path() . 'thumbs/beta/{{$video->file}}' . '.png'))
@else
{{$video->tesThumb()}}
@endif
<?php $related = $related ?? null; ?>
<div class="vertical-align">
<div class="wrapper">
@@ -21,7 +15,7 @@
<iframe src="https://w0bm.com/loop/index.html"></iframe>
@else
<video id="video" loop controls preload="auto" crossorigin="anonymous">
<source src="https://b.w0bm.com/b{{ "/" . $video->file }}">
<source src="/b{{ "/" . $video->file }}">
<!-- rip fapple! <source src="//fapple.w0bm.com/{{str_replace(".webm","",$video->file)}}.mp4"> -->
</video>
@endif
@@ -140,7 +134,6 @@
</aside>
@else
{{$video->tesThumb()}}
<div class="centered">
<div class="modal-content col-md-5">
<div class="modal-header">
@@ -159,20 +152,11 @@
</div>
<div class="media not-logged-in">
<div class="media-left">
@if(count($video->tags))
@foreach($video->tags as $tag)
@if($tag == 'sfw')
<img class="media-object" src="@if(isset($video))/thumbs/beta/{{str_replace(".webm","",$video->file)}}.png"@endif">
@elseif($tag == 'nsfw')
@if(file_exists(public_path() . 'thumbs/blurred/{{$video->file}}' . '_blurred.png'))
<img class="media-object" src="@if(isset($video))/thumbs/blurred/{{str_replace(".webm","",$video->file)}}_blurred.png"@endif">
@else
{{$video->blurryThumb()}}
<img class="media-object" src="@if(isset($video))/thumbs/blurred/{{str_replace(".webm","",$video->file)}}_blurred.png"@endif">
@endif
@endif
@endforeach
@endif
@if($sfw)
<img class="media-object" src="/thumbs/beta/{{str_replace('.webm','',$video->file)}}.png">
@else
<img class="media-object" src="/thumbs/blurred/{{str_replace('.webm','',$video->file)}}_blurred.png">
@endif
</div>
<div class="media-koerper">
<h4 class="media-heading">

View File

@@ -6,16 +6,14 @@
$thumb = str_replace(".webm","",$video->file);
?>
<div class="main-item">
<a href="/{{$video->id}}">
@if(file_exists('/home/w0bm/w0bm/public/thumbs/beta/'.$thumb.'.png'))
<img src="/thumbs/beta/{{$thumb}}.png">
@else
<img src="/small_404.gif" class="nothumb" />
{{$video->tesThumb()}}
@endif
</a>
</div>
<a href="/{{$video->id}}">
@if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png'))
<img src="/thumbs/beta/{{$thumb}}.png">
@else
<img src="/small_404.gif" class="nothumb" />
@endif
</a>
</div>
@endforeach
</div>

View File

@@ -5,7 +5,7 @@
<div class="video">
<div class="embed-responsive embed-responsive-16by9">
<video id="video" class="video rounded embed-responsive-item" loop preload="auto" crossorigin="anonymous">
<source src="//b.w0bm.com/b{{ "/" . $video->file }}">
<source src="//w0bm.com/b{{ "/" . $video->file }}">
</video>
</div>
</div>
@@ -19,7 +19,7 @@
<div class="video-wrap embed-responsive embed-responsive-16by9">
<div class="video">
<video id="video" class="video rounded embed-responsive-item" loop preload="auto" crossorigin="anonymous">
<source src="//b.w0bm.com/b{{ "/" . $video->file }}">
<source src="//w0bm.com/b{{ "/" . $video->file }}">
</video>
</div>
</div>
@@ -33,7 +33,7 @@
<iframe src="https://w0bm.com/loop/index.html"></iframe>
@else
<video class="video scrollable" loop id="video">
<source src="//b.w0bm.com/b{{ "/" . $video->file }}">
<source src="//w0bm.com/b{{ "/" . $video->file }}">
</video>
@endif
</div>

View File

@@ -7,12 +7,10 @@
?>
<div class="main-item">
<a href="/{{$video->id}}">
@if(file_exists('/home/w0bm/w0bm/public/thumbs/beta/'.$thumb.'.png'))
@if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png'))
<img src="/thumbs/beta/{{$thumb}}.png">
@else
<img src="/small_404.gif" class="nothumb" />
{{$video->tesThumb()}}
@endif
</a>
</div>

View File

@@ -5,7 +5,7 @@
<div class="video">
<div class="embed-responsive embed-responsive-16by9">
<video id="video" class="video rounded embed-responsive-item" loop preload="auto" crossorigin="anonymous">
<source src="@if(env('APP_DEBUG')){{"/b"}}@else{{"//" . (substr($_SERVER["HTTP_HOST"], 0, 3) === "v4." ? "v4." : "") . "b.w0bm.com"}}@endif{{ "/" . $video->file }}">
<source src="@if(env('APP_DEBUG')){{"/b"}}@else{{"//" . (substr($_SERVER["HTTP_HOST"], 0, 3) === "v4." ? "v4." : "") . "w0bm.com"}}@endif{{ "/" . $video->file }}">
</video>
</div>
</div>

View File

@@ -7,12 +7,11 @@
?>
<div class="main-item">
<a href="/{{$video->id}}">
@if(file_exists('/home/w0bm/w0bm/public/thumbs/beta/'.$thumb.'.png'))
@if(file_exists(public_path() . '/thumbs/beta/'.$thumb.'.png'))
<img src="/thumbs/beta/{{$thumb}}.png">
@else
<img src="/small_404.gif" class="nothumb" />
{{$video->tesThumb()}}
@endif
</a>
</div>

View File

@@ -5,7 +5,7 @@
<div class="video">
<div class="embed-responsive embed-responsive-16by9">
<video id="video" class="video rounded embed-responsive-item" loop preload="auto" crossorigin="anonymous">
<source src="@if(env('APP_DEBUG')){{"/b"}}@else{{"//" . (substr($_SERVER["HTTP_HOST"], 0, 3) === "v4." ? "v4." : "") . "b.w0bm.com"}}@endif{{ "/" . $video->file }}">
<source src="@if(env('APP_DEBUG')){{"/b"}}@else{{"//" . (substr($_SERVER["HTTP_HOST"], 0, 3) === "v4." ? "v4." : "") . "w0bm.com"}}@endif{{ "/" . $video->file }}">
</video>
</div>
</div>
@@ -34,5 +34,4 @@
</video>
</div>
@include('video-partials.legacy-videonav')
{{$video->tesThumb()}}
@endsection

View File

@@ -5,7 +5,7 @@
<div class="wrapper">
<div class="embed-responsive embed-responsive-16by9">
<video id="video" loop controls preload="auto" crossorigin="anonymous">
<source src="{{ "//b.w0bm.com/b/" . $video->file }}">
<source src="{{ "//w0bm.com/b/" . $video->file }}">
<!-- rip fapple! <source src="//fapple.w0bm.com/{{str_replace(".webm","",$video->file)}}.mp4"> -->
</video>
@if($video->category->name === 'Anime' || $video->category->name === 'Otomad')

View File

@@ -18,11 +18,10 @@
<div class="main-item">
<a href="/{{$video->id}}">
{{-- 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'))
<img src="/thumbs/beta/{{$thumb}}.png">
@else
{{$video->tesThumb()}}
<img src="/thumbs/beta/{{$thumb}}.png">
<img src="/small_404.gif" class="nothumb">
@endif
</a>
</div>

View File

@@ -3,11 +3,6 @@
@if(auth()->check())
@if(file_exists(public_path() . 'thumbs/beta/{{$video->file}}' . '.png'))
@else
{{$video->tesThumb()}}
@endif
<?php $related = $related ?? null; ?>
<div class="vertical-align">
<div class="wrapper">
@@ -21,7 +16,7 @@
<iframe src="https://w0bm.com/loop/index.html"></iframe>
@else
<video id="video" loop controls preload="auto" crossorigin="anonymous">
<source src="//b.w0bm.com/b{{ "/" . $video->file }}">
<source src="//w0bm.com/b{{ "/" . $video->file }}">
<!-- rip fapple! <source src="//fapple.w0bm.com/{{str_replace(".webm","",$video->file)}}.mp4"> -->
</video>
@endif
@@ -140,7 +135,6 @@
</aside>
@else
{{$video->tesThumb()}}
<div class="centered">
<div class="modal-content col-md-5">
<div class="modal-header">