From 5cbf9ff1775e95009809488a74aab6cb406045a4 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 24 Aug 2022 20:54:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=AC=BE=E5=AF=BC=E5=85=A5=E8=8A=82?= =?UTF-8?q?=E7=9B=AE=E5=8D=95=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=88=E9=9C=80=E6=8F=90=E5=89=8D=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=88=86P=E4=BF=A1=E6=81=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProgramConstructController.php | 68 ++++++++++++++----- .../ProgramVideoConstructController.php | 15 ++-- app/Http/Controllers/UserController.php | 30 ++++---- app/Models/ProgramVideos.php | 7 ++ app/Models/VideoParts.php | 6 ++ app/Util/TimeUtil.php | 19 ++++++ 6 files changed, 105 insertions(+), 40 deletions(-) create mode 100644 app/Util/TimeUtil.php diff --git a/app/Http/Controllers/ProgramConstructController.php b/app/Http/Controllers/ProgramConstructController.php index 5272757..a5559ab 100644 --- a/app/Http/Controllers/ProgramConstructController.php +++ b/app/Http/Controllers/ProgramConstructController.php @@ -5,6 +5,9 @@ namespace App\Http\Controllers; use App\Models\Programs; use App\Models\ProgramVideos; use App\Models\VideoComments; +use App\Models\VideoParts; +use App\Util\TimeUtil; +use Carbon\Carbon; use Illuminate\Database\QueryException; use Illuminate\Http\Request; use Illuminate\Routing\Controller as BaseController; @@ -12,6 +15,7 @@ use Illuminate\Support\Facades\DB; class ProgramConstructController extends BaseController { + // region Views public function index(Request $request) { $status = $request->get("status", "0"); $query = Programs::query()->with(["appends", "video_pivots.video"])->where("status", $status, 0)->orderByDesc("created_at"); @@ -27,6 +31,25 @@ class ProgramConstructController extends BaseController ]); } + public function from_comment(Request $request, VideoComments $comment) { + return redirect(route("program.construct.batch_add"))->withInput([ + "bvid"=>$comment->video->bvid, + "content"=>$comment->content + ]); + } + + public function batch_add(Request $request) { + return view("program.construct.batch_add"); + } + + public function edit(Request $request, Programs $program) { + return view("program.construct.create", [ + "program"=>$program + ]); + } + // endregion + + // region Form Submit public function create(Request $request) { $request->validate([ "name" => ["required"] @@ -39,17 +62,6 @@ class ProgramConstructController extends BaseController return redirect(route("program.construct.edit", ["program"=>$program->id])); } - public function from_comment(Request $request, VideoComments $comment) { - return redirect(route("program.construct.batch_add"))->withInput([ - "bvid"=>$comment->video->bvid, - "content"=>$comment->content - ]); - } - - public function batch_add(Request $request) { - return view("program.construct.batch_add"); - } - public function batch_create(Request $request) { $request->validate([ 'bvid' => ['required'], @@ -63,7 +75,8 @@ class ProgramConstructController extends BaseController "bvid" => "该BVID下已有{$count}个节目关联,请手动添加" ]); } - $regex = "/^p(?P\d{1,2})[-# _:,)]+(?P