Skip to content

A self-hosted media server and file management system

enable support for direct navigation to shows within a category

aminnausin7779a8dcc455
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index e9f6d675..4edb615e 100644
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -2,17 +2,66 @@
namespace App\Http\Controllers;
+use App\Models\Category;
+use App\Models\Folder;
+use App\Models\Video;
+use ErrorException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\File;
class DirectoryController extends Controller
{
- public function showDirectory($dir) {
+ public function showDirectory($dir,$folder_name = null) {
$data['dir'] = $dir;
+ $data['folder_name'] = $folder_name;
return view('home', $data);
}
+ public function getDirectory(Request $request){
+ try {
+ $default = 'tv';
+ $dir = isset($request->dir) ? $request->dir : $default;
+
+ $category_id = Category::select('id')->firstWhere('name', $dir)->id;
+ $folders = Folder::select('id','name')->where('category_id', $category_id)->get();
+ $firstFolder_id = $folders->first()->id;
+
+ $videos = Video::select('name','path','date')->where('folder_id', $firstFolder_id)->get();
+ dump(json_encode(array("success"=>true, "result"=>array("folders"=>$folders->toArray(),"videos"=>$videos->toArray()), "error"=>""), JSON_UNESCAPED_SLASHES));
+ //return json_encode(array("success"=>true, "result"=>array("folders"=>$folders->toArray(),"videos"=>$videos->toArray()), "error"=>""), JSON_UNESCAPED_SLASHES);
+ } catch (\Throwable $th) {
+ //throw $th;
+ return json_encode(array("success"=>false, "result"=>array("folders"=>array(), "videos"=>array()), "error"=>$th->getMessage()), JSON_UNESCAPED_SLASHES);
+ }
+ }
+
+ public function getDirectoryContents(Request $request){
+ try {
+ $default = 'tv';
+ $dir = isset($request->dir) ? $request->dir : $default;
+
+ $category_id = Category::select('id')->firstWhere('name', $dir)->id;
+ $folders = Folder::select('id','name')->where('category_id', $category_id)->get();
+
+ return(json_encode(array("success"=>true, "result"=>$folders->toArray(), "error"=>""), JSON_UNESCAPED_SLASHES));
+ } catch (\Throwable $th) {
+ return(json_encode(array("success"=>false, "result"=>array(), "error"=>$th->getMessage()), JSON_UNESCAPED_SLASHES));
+ }
+ }
+
+ public function getFolderContents(Request $request){
+ try {
+ $folder_id = isset($request->folder_id) ? $request->folder_id : throw new ErrorException("No folder id or invalid folder name provided. Cannot generate videos.");
+
+ $videos = Video::select('name','path','date')->where('folder_id', $folder_id)->get();
+
+ return(json_encode(array("success"=>true, "result"=>$videos->toArray(), "error"=>""), JSON_UNESCAPED_SLASHES));
+ } catch (\Throwable $th) {
+ return(json_encode(array("success"=>false, "result"=>array(), "error"=>$th->getMessage()), JSON_UNESCAPED_SLASHES));
+ }
+ }
+
public function generateDirectory(Request $request) {
$dir = $request->dir;
$mediaRoot = '/media/';
@@ -53,50 +102,7 @@ class DirectoryController extends Controller
return json_encode(array("success"=>true, "result"=>$folders, "error"=>""), JSON_UNESCAPED_SLASHES);
}
- public function testStorage() {
- $dir = 'tv';
- $mediaRoot = '/storage/media/';
- $default = 'tv';
- $path = isset($dir) ? $mediaRoot . $dir : $mediaRoot . $default ;
-
- $allDirectories = Storage::directories('public' . $path);
-
- dd($allDirectories);
- $folders = array();
- $currentFolder = array("name"=>"", "files"=>array());
-
- foreach ($allDirectories as $directory) {
- if (basename($directory) != '.thumbs') {
- $currentFolder['name'] = basename($directory);
-
- //$files = File::allFiles(public_path('resources\\' . $dir) . '\\' . basename($directory));
- $files = File::allFiles(storage_path('app') . '/' . $directory);
-
- foreach($files as $file){
- if ($file->getExtension() == 'mp4' || $file->getExtension() == 'mkv' ) {
- $fileData = array('name'=> $path . '/' . basename($directory) . '/' . basename($file), 'title'=>basename($file), 'date' => filectime($file), 'formattedDate' => date("Y-m-d g:i A", filectime($file)));
- array_push($currentFolder['files'], $fileData);
- }
- }
- }
- array_push($folders, $currentFolder);
- $currentFolder['files'] = array();
- }
-
- dd(json_encode(array("success"=>true, "result"=>$folders, "error"=>""), JSON_UNESCAPED_SLASHES));
- }
-
public function generateData() {
- /*
-
- category = array("id"=>$currentID,"name"=>$name,"media_content"=>"false", "action"=>"INSERT");
-
- folder = array("id"=>$currentID,"name"=>$name,"path"=>category/$name, "category_id"=>$categoryStructure[$category], "action"=>"INSERT");
-
- video = array("id"=>$currentID,"name"=>$name,"path"=>category/folder/name, "folder_id"=>$folderStructure[$folder], "date" => date("Y-m-d g:i A", filectime($file))", action"=>"INSERT");
-
- */
-
$path = "public\media\\";
if(!Storage::exists($path)){
@@ -108,8 +114,10 @@ class DirectoryController extends Controller
$realPath = Storage::path($path);
$directories = $this->generateCategories($realPath);
- $subDirectories = $this->generateFolders($path, $directories["categoryStructure"]);
- $files = $this->generateVideos($path, $subDirectories["folderStructure"], $directories["categoryStructure"]);
+ $subDirectories = $this->generateFolders($path, $directories["data"]["categoryStructure"]);
+ $files = $this->generateVideos($path, $subDirectories["data"]["folderStructure"], $directories["data"]["categoryStructure"]);
+
+ if(isset($files["updatedFolderStructure"])) $subDirectories["data"]["folderStructure"] = $files["updatedFolderStructure"];
$categories = $directories["categoryChanges"];
$folders = $subDirectories["folderChanges"];
@@ -132,18 +140,29 @@ class DirectoryController extends Controller
#endregion
$dbOut = "";
+ $categoryTransactions = array();
+ $folderTransactions = array();
+ $videoTransactions = array();
foreach ($categories as $categoryChange){ // for each in stored, remove from new (delete)
$changeID = $categoryChange['id'];
$changeName = $categoryChange["name"];
- $changeMediaContent = $categoryChange["media_content"];
+ $changeMediaContent = $categoryChange["media_content"] ?? 'False';
$changeAction = $categoryChange["action"];
- if($changeAction == "INSERT"){
- $dbOut .= "INSERT INTO [Categories] VALUES ({$changeID}, {$changeName}, {$changeMediaContent} );\n"; // insert
+ if($changeAction === "INSERT"){
+ $dbOut .= "INSERT INTO [Categories] VALUES ($changeID, $changeName, $changeMediaContent );\n"; // insert
+
+ $transaction = $categoryChange;
+ unset($transaction["action"]);
+ array_push($categoryTransactions, $transaction);
+ // Category::create(
+ // ["name"=>$changeName, "media_content" => $changeMediaContent]
+ // );
}
else{
- $dbOut .= "DELETE FROM [Categories] WHERE [Categories].[ID] = {$changeID};\n";
+ $dbOut .= "DELETE FROM [Categories] WHERE [Categories].[ID] = $changeID;\n";
+ Category::where('id', $changeID)->delete();
}
}
@@ -154,11 +173,18 @@ class DirectoryController extends Controller
$changeCategoryID = $folderChange["category_id"];
$changeAction = $folderChange["action"];
- if($changeAction == "INSERT"){
+ if($changeAction === "INSERT"){
$dbOut .= "INSERT INTO [Folders] VALUES ({$changeID}, {$changeName}, {$changePath}, {$changeCategoryID} );\n"; // insert
+
+ $transaction = $folderChange;
+ unset($transaction["action"]);
+ array_push($folderTransactions, $transaction);
+
+ //Folder::create(["name"=>$changeName, "path"=>$changePath,"category_id"=>$changeCategoryID]);
}
else{
$dbOut .= "DELETE FROM [Folders] WHERE [Folder].[ID] = {$changeID};";
+ Folder::where('id', $changeID)->delete();
}
}
@@ -170,14 +196,37 @@ class DirectoryController extends Controller
$changeDate = $videoChange["date"];
$changeAction = $videoChange["action"];
- if($changeAction == "INSERT"){
+ if($changeAction === "INSERT"){
$dbOut .= "INSERT INTO [Videos] VALUES ({$changeID}, {$changeName}, {$changePath}, {$changeFolderID}, {$changeDate} );\n"; // insert
+
+ // $video = new Video();
+ // $video->name = "anime";
+ // $video->path = $changePath;
+ // $video->folder_id = $changeCategoryID;
+ // $video->date = $changeDate;
+
+ // $video->save();
+
+ $transaction = $videoChange;
+ unset($transaction["action"]);
+ array_push($videoTransactions, $transaction);
+
+ //Video::create( ["name"=>$changeName, "path"=>$changePath,"folder_id"=>$changeCategoryID, "date"=>$changeDate] );
}
else{
$dbOut .= "DELETE FROM [Videos] WHERE [Categories].[ID] = {$changeID};\n";
+ Video::where('id', $changeID)->delete();
}
}
+ Storage::disk('public')->put('categories.json', json_encode($directories["data"], JSON_UNESCAPED_SLASHES));
+ Storage::disk('public')->put('folders.json', json_encode($subDirectories["data"], JSON_UNESCAPED_SLASHES));
+ Storage::disk('public')->put('videos.json', json_encode($files["data"], JSON_UNESCAPED_SLASHES));
+
+ Category::insert($categoryTransactions);
+ Folder::insert($folderTransactions);
+ Video::insert($videoTransactions);
+
$data = array("categories"=>$categories,"folders"=>$folders,"videos"=>$videos);
Storage::disk('public')->put('dataCache.json', json_encode($data, JSON_UNESCAPED_SLASHES));
@@ -185,17 +234,17 @@ class DirectoryController extends Controller
}
private function generateCategories($path){
- $currentID = 0;
-
+ $data = Storage::json('public\categories.json') ?? array("next_ID"=>1, "categoryStructure" => array()); //array("anime"=>1,"tv"=>2,"yogscast"=>3); // read from json
$scanned = array_map("htmlspecialchars", scandir($path)); // read folder structure
- $stored = Storage::json('public\categories.json') ?? array(); //array("anime"=>1,"tv"=>2,"yogscast"=>3); // read from json
- $storedCopy = $stored;
+
+ $currentID = $data["next_ID"];
+ $stored = $data["categoryStructure"];
$changes = array(); // send to db
$current = array(); // save into json
- foreach ($stored as $savedID){ // O(n) where n = number of already known categories
- $currentID = max($currentID, $savedID) + 1; // gets max currently used id
- }
+ // foreach ($stored as $savedID){ // O(n) where n = number of already known categories
+ // $currentID = max($currentID, $savedID + 1); // gets max currently used id
+ // }
/*
If scanned is in stored, add to current, remove from stored
@@ -219,7 +268,7 @@ class DirectoryController extends Controller
unset($stored[$name]); // remove from stored
}
else{ // If scanned not in stored, add to current, add to new (insert), id++
- $generated = array("id"=>$currentID,"name"=>$name,"media_content"=>"false", "action"=>"INSERT");
+ $generated = array("id"=>$currentID,"name"=>$name,"media_content"=>'False', "action"=>"INSERT");
$current[$name] = $currentID; // add to current
array_push($changes, $generated); // add to new (insert)
$currentID++;
@@ -231,28 +280,26 @@ class DirectoryController extends Controller
array_push($changes, $generated); // add to new (delete)
}
-
- if($current !== $storedCopy) {
- Storage::disk('public')->put('categories.json', json_encode($current, JSON_UNESCAPED_SLASHES));
- }
- return array("categoryChanges"=> $changes, "categoryStructure" => $current);
+ $data["next_ID"] = $currentID;
+ $data["categoryStructure"] = $current;
+
+ return array("categoryChanges"=> $changes, "data" => $data);
}
private function generateFolders($path, $categoryStructure){
- $cost = 0;
- $currentID = 0;
+ $data = Storage::json('public\folders.json') ?? array("next_ID"=>1,"folderStructure"=>array()); //array("anime/frieren"=>array("id"=>0,"name"=>"frieren"),"starwars/andor"=>array("id"=1,"name"="andor")); // read from json
$scannedCategories = array_keys($categoryStructure);
- $rawPath = Storage::path('');
-
- $stored = Storage::json('public\folders.json') ?? array(); //array("anime/frieren"=>array("id"=>0,"name"=>"frieren"),"starwars/andor"=>array("id"=1,"name"="andor")); // read from json
- $storedCopy = $stored;
+ $cost = 0;
+
+ $currentID = $data["next_ID"];
+ $stored = $data["folderStructure"];
$changes = array(); // send to db
$current = array(); // save into json into json
- foreach ($stored as $savedFolder){ // O(n) where n = number of already known categories
- $currentID = max($currentID, $savedFolder["id"]) + 1; // gets max currently used id
- $cost ++;
- }
+ // foreach ($stored as $savedFolder){ // O(n) where n = number of already known categories
+ // $currentID = max($currentID, $savedFolder["id"] + 1); // gets max currently used id
+ // $cost ++;
+ // }
/*
Double Foreach loop
@@ -309,30 +356,33 @@ class DirectoryController extends Controller
}
- if($current !== $storedCopy) {
- Storage::disk('public')->put('folders.json', json_encode($current, JSON_UNESCAPED_SLASHES));
- }
+ // if($current !== $storedCopy) {
+ // //Storage::disk('public')->put('folders.json', json_encode($current, JSON_UNESCAPED_SLASHES));
+ // }
- return array("folderChanges"=> $changes, "folderStructure" => $current, "cost"=>$cost);
+ $data["next_ID"] = $currentID;
+ $data["folderStructure"] = $current;
+ return array("folderChanges"=> $changes, "data" => $data, "cost"=>$cost);
}
private function generateVideos($path, $folderStructure){
- $cost = 0;
- $currentID = 0;
+ $data = Storage::json('public\videos.json') ?? array("next_ID"=>1,"videoStructure"=>array()); //array("anime/frieren/S1E01.mp4"=>array("id"=>0,"name"=>"S1E01"),"starwars/andor/S1E01.mkv"=>array("id"=1,"name"="S1E01.mkv")); // read from json
$scannedFolders = array_keys($folderStructure);
- $foldersCopy = $folderStructure;
- $unModefiedFolders = array();
- $rawPath = Storage::path('');
+ $cost = 0;
- $stored = Storage::json('public\videos.json') ?? array(); //array("anime/frieren/S1E01.mp4"=>array("id"=>0,"name"=>"S1E01"),"starwars/andor/S1E01.mkv"=>array("id"=1,"name"="S1E01.mkv")); // read from json
- $storedCopy = $stored;
+ $currentID = $data["next_ID"];
+ $stored = $data["videoStructure"];
$changes = array(); // send to db
$current = array(); // save into json into json
+
+ $foldersCopy = $folderStructure;
+ $unModefiedFolders = array();
+ $rawPath = Storage::path('');
- foreach ($stored as $savedVideo){ // O(n) where n = number of already known categories
- $currentID = max($currentID, $savedVideo) + 1; // gets max currently used id
- $cost ++;
- }
+ // foreach ($stored as $savedVideo){ // O(n) where n = number of already known categories
+ // $currentID = max($currentID, $savedVideo + 1); // gets max currently used id
+ // $cost ++;
+ // }
/*
Double Foreach loop
@@ -375,7 +425,8 @@ class DirectoryController extends Controller
$ext = pathinfo($file, PATHINFO_EXTENSION);
if ($ext !== 'mp4' && $ext !== 'mkv' ) continue;
- $name = basename($file, $ext);
+ $name = basename($file);
+ $cleanName = basename($file,".$ext");
$key = "$folder\\$name";
$rawFile = "$rawPath$file";
@@ -384,8 +435,7 @@ class DirectoryController extends Controller
unset($stored[$key]); // remove from stored
}
else{
- $generated = array("id"=>$currentID,"name"=>$name,"path"=>$key, "folder_id"=>$folderStructure[$folder]["id"], "date" => date("Y-m-d g:i A", filemtime($rawFile)), "action"=>"INSERT");
-
+ $generated = array("id"=>$currentID,"name"=>$cleanName,"path"=>"storage\\". basename($path) . "\\$key", "folder_id"=>$folderStructure[$folder]["id"], "date" => date("Y-m-d g:i A", filemtime($rawFile)), "action"=>"INSERT");
$current[$key] = $currentID; // add to current
array_push($changes, $generated); // add to new (insert)
$currentID++;
@@ -403,14 +453,10 @@ class DirectoryController extends Controller
$cost++;
}
-
- if($foldersCopy !== $folderStructure) {
- Storage::disk('public')->put('folders.json', json_encode($foldersCopy, JSON_UNESCAPED_SLASHES));
- }
+ if($foldersCopy === $folderStructure) $foldersCopy = null;
- if($current !== $storedCopy) {
- Storage::disk('public')->put('videos.json', json_encode($current, JSON_UNESCAPED_SLASHES));
- }
- return array("videoChanges"=> $changes, "videoStructure" => $current, "cost"=>$cost);
+ $data["next_ID"] = $currentID;
+ $data["videoStructure"] = $current;
+ return array("videoChanges"=> $changes, "data" => $data, "cost"=>$cost, "updatedFolderStructure"=>$foldersCopy);
}
}
\ No newline at end of file
diff --git a/app/Models/Category.php b/app/Models/Category.php
new file mode 100644
index 00000000..3c729962
--- /dev/null
+++ b/app/Models/Category.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class Category extends Model
+{
+ use HasFactory;
+
+ public $timestamps = false;
+
+ protected $fillable = ['name', 'media_content'];
+
+ public function folders(): HasMany{
+ return $this->hasMany(Folder::class);
+ }
+}
diff --git a/app/Models/Folder.php b/app/Models/Folder.php
new file mode 100644
index 00000000..facb5915
--- /dev/null
+++ b/app/Models/Folder.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class Folder extends Model
+{
+ use HasFactory;
+
+ public $timestamps = false;
+
+ public function videos(): HasMany{
+ return $this->hasMany(Video::class);
+ }
+
+ public function category(): BelongsTo{
+ return $this->belongsTo(Category::class);
+ }
+}
diff --git a/app/Models/Video.php b/app/Models/Video.php
new file mode 100644
index 00000000..18b6fb5d
--- /dev/null
+++ b/app/Models/Video.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class Video extends Model
+{
+ use HasFactory;
+
+ public $timestamps = false;
+
+ public function folder(): BelongsTo{
+ return $this->belongsTo(Folder::class);
+ }
+}
diff --git a/bootstrap/cache/packages.php b/bootstrap/cache/packages.php
index 0e28d4a5..7ae26b96 100644
--- a/bootstrap/cache/packages.php
+++ b/bootstrap/cache/packages.php
@@ -1,4 +1,11 @@
<?php return array (
+ 'appstract/laravel-opcache' =>
+ array (
+ 'providers' =>
+ array (
+ 0 => 'Appstract\\Opcache\\OpcacheServiceProvider',
+ ),
+ ),
'barryvdh/laravel-debugbar' =>
array (
'providers' =>
diff --git a/bootstrap/cache/services.php b/bootstrap/cache/services.php
index e342a898..d0828de6 100644
--- a/bootstrap/cache/services.php
+++ b/bootstrap/cache/services.php
@@ -23,18 +23,19 @@
19 => 'Illuminate\\Translation\\TranslationServiceProvider',
20 => 'Illuminate\\Validation\\ValidationServiceProvider',
21 => 'Illuminate\\View\\ViewServiceProvider',
- 22 => 'Barryvdh\\Debugbar\\ServiceProvider',
- 23 => 'Laravel\\Sail\\SailServiceProvider',
- 24 => 'Laravel\\Sanctum\\SanctumServiceProvider',
- 25 => 'Laravel\\Tinker\\TinkerServiceProvider',
- 26 => 'Carbon\\Laravel\\ServiceProvider',
- 27 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
- 28 => 'Termwind\\Laravel\\TermwindServiceProvider',
- 29 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
- 30 => 'App\\Providers\\AppServiceProvider',
- 31 => 'App\\Providers\\AuthServiceProvider',
- 32 => 'App\\Providers\\EventServiceProvider',
- 33 => 'App\\Providers\\RouteServiceProvider',
+ 22 => 'Appstract\\Opcache\\OpcacheServiceProvider',
+ 23 => 'Barryvdh\\Debugbar\\ServiceProvider',
+ 24 => 'Laravel\\Sail\\SailServiceProvider',
+ 25 => 'Laravel\\Sanctum\\SanctumServiceProvider',
+ 26 => 'Laravel\\Tinker\\TinkerServiceProvider',
+ 27 => 'Carbon\\Laravel\\ServiceProvider',
+ 28 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+ 29 => 'Termwind\\Laravel\\TermwindServiceProvider',
+ 30 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
+ 31 => 'App\\Providers\\AppServiceProvider',
+ 32 => 'App\\Providers\\AuthServiceProvider',
+ 33 => 'App\\Providers\\EventServiceProvider',
+ 34 => 'App\\Providers\\RouteServiceProvider',
),
'eager' =>
array (
@@ -48,16 +49,17 @@
7 => 'Illuminate\\Pagination\\PaginationServiceProvider',
8 => 'Illuminate\\Session\\SessionServiceProvider',
9 => 'Illuminate\\View\\ViewServiceProvider',
- 10 => 'Barryvdh\\Debugbar\\ServiceProvider',
- 11 => 'Laravel\\Sanctum\\SanctumServiceProvider',
- 12 => 'Carbon\\Laravel\\ServiceProvider',
- 13 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
- 14 => 'Termwind\\Laravel\\TermwindServiceProvider',
- 15 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
- 16 => 'App\\Providers\\AppServiceProvider',
- 17 => 'App\\Providers\\AuthServiceProvider',
- 18 => 'App\\Providers\\EventServiceProvider',
- 19 => 'App\\Providers\\RouteServiceProvider',
+ 10 => 'Appstract\\Opcache\\OpcacheServiceProvider',
+ 11 => 'Barryvdh\\Debugbar\\ServiceProvider',
+ 12 => 'Laravel\\Sanctum\\SanctumServiceProvider',
+ 13 => 'Carbon\\Laravel\\ServiceProvider',
+ 14 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+ 15 => 'Termwind\\Laravel\\TermwindServiceProvider',
+ 16 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
+ 17 => 'App\\Providers\\AppServiceProvider',
+ 18 => 'App\\Providers\\AuthServiceProvider',
+ 19 => 'App\\Providers\\EventServiceProvider',
+ 20 => 'App\\Providers\\RouteServiceProvider',
),
'deferred' =>
array (
diff --git a/composer.json b/composer.json
index 1a4c9c1d..841ec6d7 100644
--- a/composer.json
+++ b/composer.json
@@ -6,6 +6,7 @@
"license": "MIT",
"require": {
"php": "^8.1",
+ "appstract/laravel-opcache": "^4.0",
"guzzlehttp/guzzle": "^7.2",
"laravel/framework": "^10.10",
"laravel/sanctum": "^3.3",
diff --git a/composer.lock b/composer.lock
index 5c0252b6..82915ab8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,70 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "283e34281449c1c77bfa692414cd4a55",
+ "content-hash": "8905a07f2f37e52b8507727efbc3c829",
"packages": [
+ {
+ "name": "appstract/laravel-opcache",
+ "version": "4.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/appstract/laravel-opcache.git",
+ "reference": "d2ce88cddda6af54c14d1f9ceaaf94b54f38f9d3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/appstract/laravel-opcache/zipball/d2ce88cddda6af54c14d1f9ceaaf94b54f38f9d3",
+ "reference": "d2ce88cddda6af54c14d1f9ceaaf94b54f38f9d3",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/guzzle": "^6.3.1|^7.0",
+ "laravel/framework": ">=7.0",
+ "php": ">=7.2.5"
+ },
+ "require-dev": {
+ "orchestra/testbench": "^5.0",
+ "phpunit/phpunit": "^8.5"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Appstract\\Opcache\\OpcacheServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Appstract\\Opcache\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Olav van Schie",
+ "email": "[email protected]",
+ "homepage": "https://appstract.nl",
+ "role": "Developer"
+ }
+ ],
+ "description": "PHP OPcache Artisan commands for Laravel.",
+ "homepage": "https://github.com/appstract/laravel-opcache",
+ "keywords": [
+ "Opcache",
+ "appstract",
+ "laravel",
+ "php"
+ ],
+ "support": {
+ "issues": "https://github.com/appstract/laravel-opcache/issues",
+ "source": "https://github.com/appstract/laravel-opcache/tree/4.0.2"
+ },
+ "time": "2020-12-01T16:12:14+00:00"
+ },
{
"name": "brick/math",
"version": "0.11.0",
diff --git a/database/migrations/2024_02_10_211928_create_categories_table.php b/database/migrations/2024_02_10_211928_create_categories_table.php
new file mode 100644
index 00000000..355564bd
--- /dev/null
+++ b/database/migrations/2024_02_10_211928_create_categories_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+ /**
+ * Run the migrations.
+ */
+ public function up(): void
+ {
+ Schema::create('categories', function (Blueprint $table) {
+ $table->id();
+ $table->string('name')->unique();
+ $table->boolean('media_content');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::dropIfExists('categories');
+ }
+};
diff --git a/database/migrations/2024_02_10_212124_create_folders_table.php b/database/migrations/2024_02_10_212124_create_folders_table.php
new file mode 100644
index 00000000..8626a811
--- /dev/null
+++ b/database/migrations/2024_02_10_212124_create_folders_table.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+ /**
+ * Run the migrations.
+ */
+ public function up(): void
+ {
+ Schema::create('folders', function (Blueprint $table) {
+ $table->id();
+ $table->string('name');
+ $table->string('path')->unique();
+ $table->foreignId('category_id')->constrained();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::dropIfExists('folders');
+ }
+};
diff --git a/database/migrations/2024_02_10_212508_create_videos_table.php b/database/migrations/2024_02_10_212508_create_videos_table.php
new file mode 100644
index 00000000..5c885eb0
--- /dev/null
+++ b/database/migrations/2024_02_10_212508_create_videos_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+ /**
+ * Run the migrations.
+ */
+ public function up(): void
+ {
+ Schema::create('videos', function (Blueprint $table) {
+ $table->id();
+ $table->string('name');
+ $table->string('path')->unique();
+ $table->string('date');
+ $table->foreignId('folder_id')->constrained();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::dropIfExists('videos');
+ }
+};
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index a9f4519f..35ff215c 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -3,6 +3,7 @@
namespace Database\Seeders;
// use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+
use Illuminate\Database\Seeder;
class DatabaseSeeder extends Seeder
diff --git a/public/js/main.js b/public/js/main.js
index 70a6fcd5..b296a48c 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -1,5 +1,6 @@
document.addEventListener("DOMContentLoaded", function(event) {
- loadVideos();
+ if(folderName === null | folderName === undefined) { loadVideos(); }
+ else { loadVideosTest(); }
toggleDarkMode();
document.getElementById('dark-mode-toggle').addEventListener('click', () => { toggleDarkMode(); });
@@ -33,6 +34,34 @@ async function loadVideos(){
});
}
+async function loadVideosTest(){
+ const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
+ const dir = videoDirectory ?? 'anime';
+
+ fetch(`/ajax/getFolders`, {
+ method: 'post',
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ 'X-CSRF-TOKEN': csrfToken
+ },
+ body: JSON.stringify({
+ dir:dir
+ })
+ }).then((response) =>
+ response.json()
+ ).then((json) => {
+ console.log(json);
+ if(json.success == false){
+ toastr["error"](`The directory '${dir}' does not exist.`, "Invalid Category");
+ return;
+ }
+ parseVideosTest(json.result);
+ }).catch((error) => {
+ console.log(error);
+ });
+}
+
function parseVideos(data){
// const dataContainer = document.getElementById('dataContainer');
const darkModeSettings = getDarkModeSettings();
@@ -93,6 +122,98 @@ function parseVideos(data){
initVideos();
}
+async function parseVideosTest(data){
+ const darkModeSettings = getDarkModeSettings();
+ const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
+
+ var folderTemplate = function(folderName, folderCount, fileElements) {
+ return `
+ <div class="col-sm-12">
+ <div class="folder-header row mb-4">
+ <h4 class="col-sm-8 col-lg-10 ps-0 text-center text-sm-start"> ${folderName} </h4>
+ <button class="col-sm-4 col-lg-2 btn ${darkModeSettings.btnClass} folder-toggle" id="dataTable-${folderCount}-collapse-toggle" type="button" data-bs-toggle="collapse" data-bs-target="#dataTable-${folderCount}-collapse">
+ <i class="bi bi-list"></i>
+ Show Folder
+ </button>
+ </div>
+ <div class="collapse show" id="dataTable-${folderCount}-collapse" data-state="0">
+ <table class="vid-table hover stripe" id="dataTable-${folderCount}" data-folder="${folderName}">
+ <thead>
+ <tr>
+ <th>Title</th>
+ <!-- <th>Length</th> -->
+ <th>Date</th>
+ </tr>
+ </thead>
+ <tbody>
+ ${fileElements}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <hr>
+ `
+ }
+ var videoTemplate = function(fileArray){
+ let fileName = fileArray['path'];
+ let title = fileArray['name'];
+ let date = fileArray['date'];
+ let filePrefix = '../';
+ return `
+ <tr>
+ <td class="vid-row" data-col="col-title" value="${filePrefix}${fileName}">${title}</td>
+ <!-- <td class="vid-row" data-col="col-length" value="0">Unimplemented</td> -->
+ <td class="vid-row" data-col="col-date" value="${date}">${date}</td>
+ </tr>
+ `
+ }
+
+ let selectedFolderName = folderName;
+ let folder_id = -1;
+
+ if(folderName === null | folderName === undefined) {
+ toastr["error"](`An invalid folder name [${folderName}] was provided in the URL.`, "Invalid Folder");
+ return;
+ }
+
+ for (let i = 0; i < data.length; i++) {
+ const folder = data[i];
+ if(folder["name"].toLowerCase().localeCompare(selectedFolderName.toLowerCase()) == 0){
+ folder_id = folder["id"];
+ selectedFolderName = folder["name"];
+ break;
+ }
+ }
+
+ fetch(`/ajax/getVideos`, {
+ method: 'post',
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ 'X-CSRF-TOKEN': csrfToken
+ },
+ body: JSON.stringify({
+ folder_id:folder_id
+ })
+ }).then((response) =>
+ response.json()
+ ).then((json) => {
+ if(json.success == false){
+ toastr["error"](`The folder '${selectedFolderName}' does not exist.`, "Invalid folder");
+ return;
+ }
+
+ const files = json.result;
+ let fileElements = files.map(videoTemplate);
+ let folderElement = folderTemplate(selectedFolderName, 0, fileElements.toString().replaceAll(',',''));
+ $('#dataContainer').append(folderElement);
+
+ initVideos();
+ }).catch((error) => {
+ console.log(error);
+ });
+}
+
function initVideos(){
let pastFirst = false;
$('.vid-row').off('click').on('click', function(){
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 370d04af..a3c4a74f 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -24,13 +24,14 @@
<link href="https://cdn.datatables.net/1.13.7/css/jquery.dataTables.min.css" rel="stylesheet">
<!-- toastr -->
- <link href="./css/toastr.min.css" rel="stylesheet">
+ <link href="<?php if (isset($folder_name)) echo (".."); else echo (".");?>/css/toastr.min.css" rel="stylesheet">
- <script src="./js/toastr.min.js"></script>
+ <script src="<?php if (isset($folder_name)) echo (".."); else echo (".");?>/js/toastr.min.js"></script>
<!-- Local -->
- <link href="./css/main.css" rel="stylesheet" >
+ <link href="<?php if (isset($folder_name)) echo (".."); else echo (".");?>/css/main.css" rel="stylesheet" >
<script>
var videoDirectory = <?php echo json_encode($dir ?? 'anime')?>;
+ var folderName = <?php echo json_encode($folder_name)?>;
toastr.options = {
"closeButton": true,
@@ -50,7 +51,7 @@
"hideMethod": "fadeOut"
}
</script>
- <script src="./js/main.js"></script>
+ <script src="<?php if (isset($folder_name)) echo (".."); else echo (".");?>/js/main.js"></script>
</head>
<body class="light-mode" id="root">
<main class="container">
diff --git a/routes/web.php b/routes/web.php
index 1ff978fb..081bb04b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -19,14 +19,21 @@ Route::get('/welcome', function () {
});
Route::get('/', function () {
- return view('home', ['dir' => 'anime']);
+ return view('home', ['dir' => 'anime', 'folder_name' => null]);
});
Route::get('/account', function () {
- return view('account', ['dir' => 'none']);
+ return view('account', ['dir' => 'none', 'folder_name' => null]);
});
-Route::get('/{dir}', [DirectoryController::class, 'showDirectory']);
-Route::get('/storage/test', [DirectoryController::class, 'testStorage']);
+Route::get('/test/folders/{dir}', [DirectoryController::class, 'getDirectoryContents']);
+Route::get('/test/videos/{folder_name}/{category_id}', [DirectoryController::class, 'getFolderContents']);
+
Route::get('/storage/data', [DirectoryController::class, 'generateData']);
-Route::post('/ajax/generateDir', [DirectoryController::class, 'generateDirectory']);
\ No newline at end of file
+Route::post('/ajax/generateDir', [DirectoryController::class, 'generateDirectory']);
+
+Route::post('/ajax/getFolders', [DirectoryController::class, 'getDirectoryContents']);
+Route::post('/ajax/getVideos', [DirectoryController::class, 'getFolderContents']);
+
+Route::get('/{dir}', [DirectoryController::class, 'showDirectory']);
+Route::get('/{dir}/{folder_name}', [DirectoryController::class, 'showDirectory']);
\ No newline at end of file