Moved video files to public/videos directory, small refactoring.
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -14,3 +14,4 @@ npm-debug.log
|
|||||||
yarn-error.log
|
yarn-error.log
|
||||||
/.idea
|
/.idea
|
||||||
/.vscode
|
/.vscode
|
||||||
|
/public/videos
|
||||||
|
|||||||
@@ -3,12 +3,11 @@
|
|||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
use App\Http\SymfonyCastDl\SymfonyCastDlService;
|
use App\Http\SymfonyCastDl\SymfonyCastDlService;
|
||||||
use App\Models\Chapter;
|
|
||||||
use App\Models\Course;
|
use App\Models\Course;
|
||||||
|
|
||||||
class ChapterController extends Controller
|
class ChapterController extends Controller
|
||||||
{
|
{
|
||||||
public function index(Course $course, int $chapter, SymfonyCastDlService $symfonyCastDlService)
|
public function __invoke(Course $course, int $chapter, SymfonyCastDlService $symfonyCastDlService)
|
||||||
{
|
{
|
||||||
$chapter = $course->chapters->firstWhere('order', $chapter);
|
$chapter = $course->chapters->firstWhere('order', $chapter);
|
||||||
|
|
||||||
|
|||||||
18
app/Http/Controllers/Course/Sync.php
Normal file
18
app/Http/Controllers/Course/Sync.php
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Controllers\Course;
|
||||||
|
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use App\Jobs\DownloadVideoFile;
|
||||||
|
use App\Models\Course;
|
||||||
|
use Illuminate\Http\RedirectResponse;
|
||||||
|
|
||||||
|
class Sync extends Controller
|
||||||
|
{
|
||||||
|
public function __invoke(Course $course): RedirectResponse
|
||||||
|
{
|
||||||
|
$course->chapters->each->update(['sync_offline' => 1]);
|
||||||
|
$course->chapters->each(fn($chapter) => DownloadVideoFile::dispatch($chapter->id));
|
||||||
|
return redirect()->back();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,16 +11,8 @@ use Illuminate\View\View;
|
|||||||
|
|
||||||
class CourseController extends Controller
|
class CourseController extends Controller
|
||||||
{
|
{
|
||||||
public function index(Course $course): View
|
public function __invoke(Course $course): View
|
||||||
{
|
{
|
||||||
return view('course.index', compact('course'));
|
return view('course.index', compact('course'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function sync(Course $course): \Illuminate\Http\RedirectResponse
|
|
||||||
{
|
|
||||||
$course->chapters->each->update(['sync_offline' => 1]);
|
|
||||||
$course->chapters->each(fn($chapter) => DownloadVideoFile::dispatch($chapter->id));
|
|
||||||
return redirect()->back();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,14 +5,19 @@ namespace App\Http\Controllers;
|
|||||||
use App\Http\SymfonyCastDl\HtmlParser;
|
use App\Http\SymfonyCastDl\HtmlParser;
|
||||||
use App\Http\SymfonyCastDl\SymfonyCastDlService;
|
use App\Http\SymfonyCastDl\SymfonyCastDlService;
|
||||||
use App\Models\Course;
|
use App\Models\Course;
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
class Index extends Controller
|
class Index extends Controller
|
||||||
{
|
{
|
||||||
public function index(string $track = null)
|
public function index(string $track = null)
|
||||||
{
|
{
|
||||||
$courses = Course::where('tracks', 'like', '%'.$track.'%')->with('chapters')->withCount('chapters')->get();
|
$courses = Course::where('tracks', 'like', '%' . $track . '%')->with('chapters')->withCount([
|
||||||
|
'chapters',
|
||||||
|
'chapters as chapters_to_sync' => function (Builder $query) {
|
||||||
|
$query->where('sync_offline', 1);
|
||||||
|
},
|
||||||
|
])->get();
|
||||||
return view('index', compact(['courses']));
|
return view('index', compact(['courses']));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,11 +18,8 @@ class SymfonyCastDlService
|
|||||||
'base_uri' => config('symfonycast.base_url'),
|
'base_uri' => config('symfonycast.base_url'),
|
||||||
'cookies' => true
|
'cookies' => true
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$response = $this->client->get('login');
|
$response = $this->client->get('login');
|
||||||
|
|
||||||
$token = $htmlParser->getCsrfToken($response);
|
$token = $htmlParser->getCsrfToken($response);
|
||||||
|
|
||||||
$this->client->post('login', [
|
$this->client->post('login', [
|
||||||
'form_params' => [
|
'form_params' => [
|
||||||
'email' => config('symfonycast.login'),
|
'email' => config('symfonycast.login'),
|
||||||
@@ -38,7 +35,6 @@ class SymfonyCastDlService
|
|||||||
public function getInfo(): void
|
public function getInfo(): void
|
||||||
{
|
{
|
||||||
$coursePage = $this->client->get('courses/filtering');
|
$coursePage = $this->client->get('courses/filtering');
|
||||||
|
|
||||||
$courses = $this->htmlParser->getCourses($coursePage);
|
$courses = $this->htmlParser->getCourses($coursePage);
|
||||||
$courses->each->save();
|
$courses->each->save();
|
||||||
/** @var Course $course */
|
/** @var Course $course */
|
||||||
@@ -68,7 +64,7 @@ class SymfonyCastDlService
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!is_dir($chapter->directory_path)) {
|
if (!is_dir($chapter->directory_path)) {
|
||||||
mkdir($chapter->directory_path);
|
mkdir(directory: $chapter->directory_path, recursive: true);
|
||||||
}
|
}
|
||||||
if (!$chapter->is_video_file) {
|
if (!$chapter->is_video_file) {
|
||||||
$this->client->request(
|
$this->client->request(
|
||||||
|
|||||||
@@ -46,7 +46,9 @@ class Chapter extends Model
|
|||||||
protected function videoUrl(): Attribute
|
protected function videoUrl(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
get: fn() => url($this->course_id . '/' . $this->order . '.mp4')
|
get: fn() => url(
|
||||||
|
'videos' . DIRECTORY_SEPARATOR . $this->course_id . DIRECTORY_SEPARATOR . $this->order . '.mp4'
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,7 +62,7 @@ class Chapter extends Model
|
|||||||
protected function directoryPath(): Attribute
|
protected function directoryPath(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
get: fn() => public_path($this->course_id)
|
get: fn() => public_path('videos' . DIRECTORY_SEPARATOR . $this->course_id)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -55,9 +55,7 @@ class Course extends Model
|
|||||||
public function totalSizeHuman(): Attribute
|
public function totalSizeHuman(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
get: function () {
|
get: fn() => formatFileSize($this->total_size),
|
||||||
return formatFileSize($this->total_size);
|
|
||||||
},
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,18 +26,18 @@
|
|||||||
<td class="align-middle">{{ $course->status }}</td>
|
<td class="align-middle">{{ $course->status }}</td>
|
||||||
<td class="align-middle">
|
<td class="align-middle">
|
||||||
@foreach( explode(',', $course->tracks) as $track)
|
@foreach( explode(',', $course->tracks) as $track)
|
||||||
<a href="/track/{{ $track }}" class="badge rounded-pill bg-secondary">{{ $track }}</a>
|
<a href="/track/{{ $track }}" class="badge rounded-pill bg-secondary text-decoration-none">{{ $track }}</a>
|
||||||
@endforeach
|
@endforeach
|
||||||
</td>
|
</td>
|
||||||
<td class="align-middle"><a class="btn btn-outline-primary"
|
<td class="align-middle"><a class="btn btn-outline-primary"
|
||||||
href="{{ route('course.sync', ['course' => $course->id]) }}">Sync all
|
href="{{ route('course.sync', ['course' => $course->id]) }}">Sync all
|
||||||
chapters offline</a></td>
|
chapters offline</a></td>
|
||||||
<td class="align-middle">{{ $course->chapters_count }} / {{ $course->numberofchapters }}</td>
|
<td class="align-middle">{{ $course->chapters_to_sync }} / {{ $course->numberofchapters }}</td>
|
||||||
<td class="align-middle"><abbr
|
<td class="align-middle"><abbr
|
||||||
title="{{ $course->published_at?->format('Y-m-d') }}">{{ $course->published_at?->diffForHumans() }}</abbr>
|
title="{{ $course->published_at?->format('Y-m-d') }}">{{ $course->published_at?->diffForHumans() }}</abbr>
|
||||||
</td>
|
</td>
|
||||||
<td class="align-middle text-end pe-4">{{ $course->total_size_human }}</td>
|
<td class="align-middle text-end pe-4">{{ $course->total_size_human }}</td>
|
||||||
<td class="align-middle text-end pe-4">{{formatFileSize(folderSize(public_path($course->id)))}}</td>
|
<td class="align-middle text-end pe-4">{{formatFileSize(folderSize(public_path('videos'.DIRECTORY_SEPARATOR.$course->id)))}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
@@ -1,28 +1,18 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Http\Controllers\ChapterController;
|
use App\Http\Controllers\ChapterController;
|
||||||
|
use App\Http\Controllers\Course\Sync;
|
||||||
use App\Http\Controllers\CourseController;
|
use App\Http\Controllers\CourseController;
|
||||||
use App\Http\Controllers\Index;
|
use App\Http\Controllers\Index;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Web Routes
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Here is where you can register web routes for your application. These
|
|
||||||
| routes are loaded by the RouteServiceProvider within a group which
|
|
||||||
| contains the "web" middleware group. Now create something great!
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
Route::get('/download', [Index::class, 'download']);
|
Route::get('/download', [Index::class, 'download']);
|
||||||
Route::get('/', [Index::class, 'index']);
|
Route::get('/', [Index::class, 'index']);
|
||||||
Route::get('/track/{track}', [Index::class, 'index']);
|
Route::get('/track/{track}', [Index::class, 'index']);
|
||||||
Route::prefix('course')->name('course.')->group(function () {
|
Route::prefix('course')->group(function () {
|
||||||
Route::get('/{course}', [CourseController::class, 'index'])->name('index');
|
Route::get('/{course}', CourseController::class)->name('course.index');
|
||||||
Route::get('/{course}/sync', [CourseController::class, 'sync'])->name('sync');
|
Route::get('/{course}/sync', Sync::class)->name('course.sync');
|
||||||
Route::get('/{course}/chapter/{chapter}', [ChapterController::class, 'index'])->name('chapter');
|
Route::get('/{course}/chapter/{chapter}', ChapterController::class)->name('course.chapter');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user