deon/photo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates for Videos

Browse Source
This commit is contained in:
Deon George
2019-12-15 23:34:42 +11:00
parent 075d31e9f4
commit 49933382f3
14 changed files with 376 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
app/Http/Controllers/PhotoController.php
View File

@@ -12,18 +12,18 @@ class PhotoController extends Controller
protected $list_duplicates = 20;
protected $list_deletes = 50;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
public function delete($id)
{
public function delete($id)
{
$po = Photo::notRemove()->findOrFail($id);
if ($po)
@@ -33,18 +33,18 @@ class PhotoController extends Controller
}
return redirect()->action('PhotoController@info',[$id]);
}
}
public function deletes($id=NULL)
{
public function deletes($id=NULL)
{
return view('catalog.deletereview',[
'return'=>url('p/deletes'),
'catalog'=>is_null($id) ? Photo::where('remove',1)->with('software.model.make')->paginate($this->list_deletes) : Photo::where('id',$id)->paginate(1)
]);
}
}
public function deletesUpdate(Request $request)
{
public function deletesUpdate(Request $request)
{
foreach ($request->input('remove') as $id=>$k)
{
$o = Photo::findOrFail($id);
@@ -54,18 +54,18 @@ class PhotoController extends Controller
}
return redirect()->action('PhotoController@deletes',$request->input('pagenext') ? '?page='.$request->input('pagenext') : NULL);
}
}
public function duplicates($id=NULL)
{
public function duplicates($id=NULL)
{
return view('catalog.duplicatereview',[
'return'=>url('p/duplicates'),
'catalog'=>is_null($id) ? Photo::notRemove()->where('duplicate',1)->with('software.model.make')->paginate($this->list_duplicates) : Photo::where('id',$id)->paginate(1)
]);
}
}
public function duplicatesUpdate(Request $request)
{
public function duplicatesUpdate(Request $request)
{
foreach ($request->input('items') as $id)
{
$po = Photo::findOrFail($id);
@@ -83,20 +83,20 @@ class PhotoController extends Controller
}
return redirect()->action('PhotoController@duplicates','?page='.$request->input('page'));
}
}
public function info(Photo $o)
{
public function info(Photo $o)
{
return view('photo.view',['o'=>$o]);
}
}
public function thumbnail($id)
{
public function thumbnail($id)
{
return response(Photo::findOrFail($id)->thumbnail(TRUE))->header('Content-Type','image/jpeg');
}
}
public function undelete($id)
{
public function undelete($id)
{
$po = Photo::findOrFail($id);
if ($po)
@@ -106,10 +106,10 @@ class PhotoController extends Controller
}
return redirect()->action('PhotoController@info',[$id]);
}
}
public function view($id)
{
public function view($id)
{
return response(Photo::findOrFail($id)->image())->header('Content-Type','image/jpeg');
}
}
}

75
app/Http/Controllers/VideoController.php
View File

@@ -2,28 +2,26 @@
namespace App\Http\Controllers;
use Illuminate\Http\Response;
use Illuminate\Http\Request;
use App\Http\Requests;
use App\Model\Video;
use App\Models\Video;
use App\Jobs\VideoDelete;
use App\Helpers\VideoStream;
class VideoController extends Controller
{
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
public function delete($id)
{
public function delete($id)
{
$po = Video::notRemove()->findOrFail($id);
if ($po)
@@ -33,15 +31,15 @@ class VideoController extends Controller
}
return redirect()->action('VideoController@info',[$id]);
}
}
public function deletes($id=NULL)
{
public function deletes($id=NULL)
{
return view('catalog.deletereview',['return'=>url('v/deletes'),'catalog'=>is_null($id) ? Video::where('remove',1)->paginate(50) : Video::where('id',$id)->paginate(1)]);
}
}
public function deletesUpdate(Request $request)
{
public function deletesUpdate(Request $request)
{
foreach ($request->input('remove') as $k=>$id)
{
$o = Video::findOrFail($k);
@@ -51,15 +49,15 @@ class VideoController extends Controller
}
return redirect()->action('VideoController@deletes',$request->input('pagenext') ? '?page='.$request->input('pagenext') : NULL);
}
}
public function duplicates($id=NULL)
{
public function duplicates($id=NULL)
{
return view('catalog.duplicatereview',['return'=>url('/v/duplicates'),'catalog'=>is_null($id) ? Video::notRemove()->where('duplicate',1)->paginate(50) : Video::where('id',$id)->paginate(1)]);
}
}
public function duplicatesUpdate(Request $request)
{
public function duplicatesUpdate(Request $request)
{
foreach ($request->input('items') as $id)
{
$po = Video::findOrFail($id);
@@ -77,14 +75,15 @@ class VideoController extends Controller
}
return redirect()->action('VideoController@duplicates','?page='.$request->input('page'));
}
public function info($id)
{
return view('video.view', ['video'=> Video::findOrFail($id)]);
}
}
public function undelete($id)
{
public function info(Video $o)
{
return view('video.view', ['o'=>$o]);
}
public function undelete($id)
{
$po = Video::findOrFail($id);
if ($po)
@@ -94,10 +93,10 @@ class VideoController extends Controller
}
return redirect()->action('VideoController@info',[$id]);
}
}
public function view($id)
{
public function view($id)
{
(new VideoStream(Video::findOrFail($id)->file_path()))->start();
}
}
}
}