Skip to content

A self-hosted media server and file management system

scanning dates and file sizes

aminnausinbc268710edcc
diff --git a/app/Jobs/IndexFiles.php b/app/Jobs/IndexFiles.php
index 714a2114..0c34c5aa 100755
--- a/app/Jobs/IndexFiles.php
+++ b/app/Jobs/IndexFiles.php
@@ -10,38 +10,37 @@ use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
+
+use Symfony\Component\Process\Exception\ProcessFailedException;
+use Symfony\Component\Process\Process;
+use Ramsey\Uuid\Uuid;
+
use App\Models\Category;
use App\Models\Folder;
use App\Models\Metadata;
use App\Models\Series;
use App\Models\Video;
-use Illuminate\Support\Facades\DB;
-use Symfony\Component\Process\Exception\ProcessFailedException;
-use Symfony\Component\Process\Process;
-use Ramsey\Uuid\Uuid;
-class IndexFiles implements ShouldQueue, ShouldBeUnique
-{
+use Exception;
+
+class IndexFiles implements ShouldQueue, ShouldBeUnique {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
/**
* Create a new job instance.
*/
- public function __construct()
- {
+ public function __construct() {
//
}
/**
* Execute the job.
*/
- public function handle(): void
- {
+ public function handle(): void {
$this->generateData();
}
- public function generateData()
- {
+ public function generateData() {
$path = "public/media/";
$dbOut = "";
@@ -136,7 +135,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
$changeAction = $videoChange["action"];
if ($changeAction === "INSERT") {
- $dbOut .= "INSERT INTO [Videos] VALUES ({$changeID}, {$changeUUID}, {$changeName}, {$changePath}, {$changeFolderID}, {$changeDate} );\n"; // insert
+ $dbOut .= "INSERT INTO [Videos] VALUES ({$changeID}, {$changeUUID}, {$changeName}, {$changePath}, {$changeFolderID}, {$changeDate});\n"; // insert
$transaction = $videoChange;
unset($transaction["action"]);
@@ -151,8 +150,10 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
$videoID = $metadataChange['video_id'];
$compositeID = $metadataChange["composite_id"];
$uuid = $metadataChange['uuid'];
+ $file_size = $metadataChange["file_size"];
+ $date_scanned = $metadataChange["date_scanned"];
- $dbOut .= "INSERT INTO [metadata] VALUES ({$videoID}, {$compositeID}, {$uuid});\n"; // insert
+ $dbOut .= "INSERT INTO [metadata] VALUES ({$videoID}, {$compositeID}, {$uuid}, {$file_size}, {$date_scanned});\n"; // insert
array_push($metadataTransactions, $metadataChange);
}
@@ -176,7 +177,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
}
- // // One day logging should be put in the database
+ // One day logging should be put in the database
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));
@@ -194,8 +195,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
dump('Categories | Folders | Videos | Changes | SQL ', $directories, ['count' => count($subDirectories["data"]['folderStructure'])], ['count' => count($files["data"]["videoStructure"])], $data, $dbOut);
}
- private function generateCategories($path)
- {
+ private function generateCategories($path) {
$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
@@ -243,8 +243,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
return array("categoryChanges" => $changes, "data" => $data);
}
- private function generateFolders($path, $categoryStructure)
- {
+ private function generateFolders($path, $categoryStructure) {
$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);
$cost = 0;
@@ -256,8 +255,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
$seriesChanges = array();
- /*
- foreach ($stored as $savedFolder){ // O(n) where n = number of already known categories
+ /*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 ++;
@@ -280,8 +278,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
add to current -> key, id, basename(folder) ?
add to changes (insert)
id += 1;
- }
- */
+ }*/
foreach ($scannedCategories as $category) { // O(n) where n = number of folders * 2 (for scan)
$cost++;
@@ -320,8 +317,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
return array("folderChanges" => $changes, "data" => $data, "cost" => $cost, "seriesChanges" => $seriesChanges);
}
- private function generateVideos($path, $folderStructure)
- {
+ private function generateVideos($path, $folderStructure) {
$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);
$cost = 0;
@@ -337,12 +333,9 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
$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
o(M*N) where M = number of categories and N = number of files in each category
@@ -363,9 +356,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
add to current -> key, id, basename(folder) ?
add to changes (insert)
id += 1;
-
-
- */
+ }*/
foreach ($scannedFolders as $folder) { // O(n) where n = number of folders * 2 (for scan)
$cost++;
@@ -387,14 +378,10 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
if (strtolower($ext) !== 'mp4' && strtolower($ext) !== 'mkv') continue;
$uuid = $this->getUidFromMetadata($absolutePath);
-
if (!$uuid || !Uuid::isValid($uuid)) {
- // dump("uuid does not exist for $file as it is $uuid");
$uuid = Str::uuid()->toString();
// if ($count < 1) {
EmbedUidInMetadata::dispatch($absolutePath, $uuid);
- // $this->embedUidInMetadata($absolutePath, $uuid);
- // }
// $count += 1;
// dd('F');
}
@@ -407,8 +394,8 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
$current[$key] = $stored[$key]; // add to current
unset($stored[$key]); // remove from stored
} else {
- $generated = array("id" => $currentID, "uuid" => $uuid, "name" => $cleanName, "path" => $key, "folder_id" => $folderStructure[$folder]["id"], "date" => date("Y-m-d g:i A", filemtime($rawFile)), "action" => "INSERT");
- $metadata = array("video_id" => $currentID, "composite_id" => "$folder/$name", "uuid" => $uuid);
+ $generated = array("id" => $currentID, "uuid" => $uuid, "name" => $cleanName, "path" => $key, "folder_id" => $folderStructure[$folder]["id"], "date" => date("Y-m-d h:i A", filemtime($rawFile)), "action" => "INSERT");
+ $metadata = array("video_id" => $currentID, "composite_id" => "$folder/$name", "uuid" => $uuid, "file_size" => filesize($rawFile), "date_scanned" => date("Y-m-d h:i:s A"));
$current[$key] = $currentID; // add to current
array_push($changes, $generated); // add to new (insert)
array_push($metadataChanges, $metadata); // create metadata (insert)
@@ -434,8 +421,7 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
return array("videoChanges" => $changes, "data" => $data, "cost" => $cost, "updatedFolderStructure" => $foldersCopy, "metadataChanges" => $metadataChanges);
}
- private function getUidFromMetadata($filePath)
- {
+ private function getUidFromMetadata($filePath) {
$command = [
'ffprobe',
'-v',
@@ -462,59 +448,56 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique
return isset($metadata['format']['tags']['uid']) ? $metadata['format']['tags']['uid'] : (isset($metadata['format']['tags']['UID']) ? $metadata['format']['tags']['UID'] : null);
}
- // private function embedUidInMetadata($filePath, $uid)
- // {
-
- // $ext = pathinfo($filePath, PATHINFO_EXTENSION);
- // // Define a temporary file path with the correct extension
- // $tempFilePath = $filePath . '.tmp';
-
- // // Map file extensions to FFmpeg formats
- // $formatMap = ['mp4' => 'mp4', 'mkv' => 'matroska'];
- // // Determine the correct format to use
- // $format = isset($formatMap[$ext]) ? $formatMap[$ext] : $ext;
-
- // $command = [
- // 'ffmpeg',
- // '-i',
- // $filePath,
- // '-c',
- // 'copy',
- // '-movflags',
- // 'use_metadata_tags',
- // '-metadata',
- // "uid=$uid",
- // '-f',
- // $format,
- // $tempFilePath
- // ];
- // // Execute the FFmpeg command
- // $process = new Process($command);
- // $process->run();
-
- // // Check if the process was successful
- // if (!$process->isSuccessful()) {
- // throw new ProcessFailedException($process);
- // }
- // // Replace the original file with the temporary file
- // if (file_exists($tempFilePath)) {
- // // Get the original file's timestamps
- // $originalCreatedTime = filectime($filePath);
- // $originalModifiedTime = filemtime($filePath);
- // // Replace the original file with the temporary file
- // rename($tempFilePath, $filePath);
- // // Restore the original timestamps
- // touch($filePath, $originalModifiedTime, $originalCreatedTime);
- // } else {
- // throw new Exception('Failed to create the temporary file with metadata.');
- // }
- // }
+ // Not Using
+ private function embedUidInMetadataDirect($filePath, $uid) {
+
+ $ext = pathinfo($filePath, PATHINFO_EXTENSION);
+ // Define a temporary file path with the correct extension
+ $tempFilePath = $filePath . '.tmp';
+ // Map file extensions to FFmpeg formats
+ $formatMap = ['mp4' => 'mp4', 'mkv' => 'matroska'];
+ // Determine the correct format to use
+ $format = isset($formatMap[$ext]) ? $formatMap[$ext] : $ext;
+ $command = [
+ 'ffmpeg',
+ '-i',
+ $filePath,
+ '-c',
+ 'copy',
+ '-movflags',
+ 'use_metadata_tags',
+ '-metadata',
+ "uid=$uid",
+ '-f',
+ $format,
+ $tempFilePath
+ ];
+ // Execute the FFmpeg command
+ $process = new Process($command);
+ $process->run();
+
+ // Check if the process was successful
+ if (!$process->isSuccessful()) {
+ throw new ProcessFailedException($process);
+ }
+ // Replace the original file with the temporary file
+ if (file_exists($tempFilePath)) {
+ // Get the original file's timestamps
+ $originalCreatedTime = filectime($filePath);
+ $originalModifiedTime = filemtime($filePath);
+ // Replace the original file with the temporary file
+ rename($tempFilePath, $filePath);
+ // Restore the original timestamps
+ touch($filePath, $originalModifiedTime, $originalCreatedTime);
+ } else {
+ throw new Exception('Failed to create the temporary file with metadata.');
+ }
+ }
// Define the custom function to handle the upsert logic
- function upsertMetadata($data)
- {
+ function upsertMetadata($data) {
// Attempt to update by UUID first
$metadata = Metadata::where('uuid', $data['uuid'])->first();
diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.php
index 1eff8186..f7a6b3b8 100755
--- a/app/Jobs/VerifyFiles.php
+++ b/app/Jobs/VerifyFiles.php
@@ -14,25 +14,20 @@ use Illuminate\Queue\SerializesModels;
use FFMpeg\FFProbe as FFMpegFFProbe;
use Illuminate\Support\Facades\Storage;
-use function PHPUnit\Framework\isNull;
-
-class VerifyFiles implements ShouldQueue
-{
+class VerifyFiles implements ShouldQueue {
use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
/**
* Create a new job instance.
*/
- public function __construct(public $videos)
- {
+ public function __construct(public $videos) {
//
}
/**
* Execute the job.
*/
- public function handle(): void
- {
+ public function handle(): void {
if ($this->batch()->cancelled()) {
// Determine if the batch has been cancelled...
return;
@@ -47,11 +42,31 @@ class VerifyFiles implements ShouldQueue
$error = false;
foreach ($this->videos as $video) {
try {
- $stored = array();
- $changes = array();
+ $stored = array(); // Metadata from db
+ $changes = array(); // Changes -> stored + changes . length has to be the same for every video so must generate defaults
+
+ // id NOT_NULL -> INT8
+ // video_id -> INT8
+ // composite_id -> VARCHAR
+ // title -> VARCHAR
+ // season -> INT4
+ // episode -> INT4
+ // duration -> INT4
+ // view_count -> INT4
+ // description -> VARCHAR
+ // date_released -> DATE
+ // editor_id -> INT8
+ // created_at -> DATE
+ // updated_at -> DATE
+ // uuid -> uuid
+ // file_size -> INT8
+ // date_scanned -> INT8
+
+ $filePath = str_replace('\\', '/', Storage::path('')) . 'public/media/' . $video->folder->path . "/" . basename($video->path);
$compositeId = $video->folder->path . "/" . basename($video->path);
$uuid = $video->uuid ?? Str::uuid()->toString();
- $filePath = str_replace('\\', '/', Storage::path('')) . 'public/media/' . $video->folder->path . "/" . basename($video->path);
+
+ $new = false;
// if the video in db does not have a uuid saved, it will add it in both the db and on the file. This replaces any existing uuid on the file not known to the db.
if (is_null($video->uuid)) {
@@ -63,8 +78,11 @@ class VerifyFiles implements ShouldQueue
if (!$metadata) {
$metadata = Metadata::create(['uuid' => $uuid, 'composite_id' => $compositeId, 'video_id' => $video->id]);
+ dump('new');
+ $new = true;
}
+ $stored = $metadata->toArray();
if (is_null($metadata->uuid)) {
$changes['uuid'] = $uuid;
}
@@ -73,9 +91,10 @@ class VerifyFiles implements ShouldQueue
$changes['composite_id'] = $compositeId;
}
- // $metadata = Metadata::firstOrCreate(['composite_id' => $video->folder->path . "/" . basename($video->path)], ['video_id' => $video->id]);
+ if (is_null($metadata->file_size)) {
+ $changes['file_size'] = filesize($filePath);
+ }
- $stored = $metadata->toArray();
preg_match('![sS][0-9]+!', $video->name, $seasonRaw);
preg_match('![eE][0-9]+!', $video->name, $episodeRaw);
preg_match('![0-9]+!', $seasonRaw[0] ?? '', $season);
@@ -91,8 +110,8 @@ class VerifyFiles implements ShouldQueue
$changes['duration'] = $duration;
}
- if (is_null($metadata->episode) && count($episode) == 1) $changes['episode'] = (int)$episode[0];
- if (is_null($metadata->season) && count($season) == 1) $changes['season'] = (int)$season[0];
+ if (is_null($metadata->episode)) $changes['episode'] = count($episode) == 1 ? (int)$episode[0] : null;
+ if (is_null($metadata->season)) $changes['season'] = count($season) == 1 ? (int)$season[0] : null;
if (is_null($metadata->title)) {
$newTitle = count($season) == 1 ? 'S' . $season[0] : '';
@@ -102,10 +121,25 @@ class VerifyFiles implements ShouldQueue
else $changes['title'] = $video->name;
}
+ if (is_null($metadata->description)) {
+ $changes['description'] = $video->description ?? null;
+ }
+
+ if (is_null($metadata->date_released)) {
+ $changes['date_released'] = null;
+ }
+
+ if (is_null($metadata->editor_id)) {
+ $changes['editor_id'] = null;
+ }
+
is_null($metadata->view_count) ? $changes['view_count'] = Record::where('video_id', $video->id)->count() + ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0) : $stored['view_count'] = $metadata->view_count;
if (count($changes) > 0) {
+ $changes['date_scanned'] = date("Y-m-d h:i:s A");
array_push($transactions, [...$stored, ...$changes]);
+ // dump(count([...$stored, ...$changes]));
+ // if ($new) dump([...$stored, ...$changes]);
// dump([...$stored, ...$changes]);
// dump($changes);
// dump($video->name);
@@ -114,7 +148,11 @@ class VerifyFiles implements ShouldQueue
} catch (\Throwable $th) {
//throw $th;
- dump('Error cannot verify file metadata ' . $th->getMessage() . ' Cancelling ' . count($transactions) . ' updates');
+ $ids = array_map(function ($transaction) {
+ return $transaction['id'];
+ }, $transactions);
+
+ dump('Error cannot verify file metadata ' . $th->getMessage() . ' Cancelling ' . count($transactions) . ' updates with IDs ' . [...$ids]);
$error = true;
break;
}
@@ -122,11 +160,16 @@ class VerifyFiles implements ShouldQueue
try {
if (count($transactions) == 0 || $error == true) return;
- Metadata::upsert($transactions, 'id', ['video_id', 'title', 'duration', 'season', 'episode', 'view_count', 'uuid']);
+ Metadata::upsert($transactions, 'id', ['video_id', 'title', 'duration', 'season', 'episode', 'view_count', 'uuid', 'date_scanned']);
// Video::upsert($transactions, 'id', ['title','duration','season','episode','view_count']);
dump('Updated ' . count($transactions) . ' videos from id ' . ($transactions[0]['video_id']) . ' to ' . ($transactions[count($transactions) - 1]['video_id']));
} catch (\Throwable $th) {
- dump('Error cannot insert verified file metadata ' . $th->getMessage() . ' Cancelling ' . count($transactions) . ' updates');
+
+ $ids = array_map(function ($transaction) {
+ return $transaction['id'];
+ }, $transactions);
+
+ dump('Error cannot insert verified file metadata ' . $th->getMessage() . ' Cancelling ' . count($transactions) . ' updates with IDs ' . [...$ids]);
}
}
}
diff --git a/app/Models/Metadata.php b/app/Models/Metadata.php
index 062a801f..07e1fecc 100644
--- a/app/Models/Metadata.php
+++ b/app/Models/Metadata.php
@@ -8,8 +8,7 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
-class Metadata extends Model
-{
+class Metadata extends Model {
use HasFactory;
protected $fillable = [
@@ -25,31 +24,26 @@ class Metadata extends Model
'view_count',
'file_size',
'date_released',
- 'tags',
+ 'date_scanned',
];
- public function video(): BelongsTo
- {
+ public function video(): BelongsTo {
return $this->belongsTo(Video::class);
}
- public function editor(): BelongsTo
- {
+ public function editor(): BelongsTo {
return $this->belongsTo(User::class);
}
- public function playbacks(): HasMany
- {
+ public function playbacks(): HasMany {
return $this->hasMany(Playback::class);
}
- public function videoTags(): HasMany
- {
+ public function videoTags(): HasMany {
return $this->hasMany(VideoTag::class);
}
- public function getDateReleasedFormattedAttribute()
- {
+ public function getDateReleasedFormattedAttribute() {
return $this->attributes['date_released'] ? Carbon::parse($this->attributes['date_released'])->format('F d, Y') : null;
}
}
diff --git a/composer.lock b/composer.lock
index 52abb5da..27a53747 100755
--- a/composer.lock
+++ b/composer.lock
@@ -358,9 +358,7 @@
}
},
"notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
+ "license": ["MIT"],
"authors": [
{
"name": "Guilherme Blanco",
@@ -457,9 +455,7 @@
}
},
"notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
+ "license": ["MIT"],
"description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
"homepage": "https://www.doctrine-project.org/",
"support": {
@@ -1527,9 +1523,7 @@
"dev-main": "1.x-dev"
},
"laravel": {
- "providers": [
- "Laravel\\Pail\\PailServiceProvider"
- ]
+ "providers": ["Laravel\\Pail\\PailServiceProvider"]
}
},
"autoload": {
@@ -1538,9 +1532,7 @@
}
},
"notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
+ "license": ["MIT"],
"authors": [
{
"name": "Taylor Otwell",
@@ -1553,12 +1545,7 @@
],
"description": "Easily delve into your Laravel application's log files directly from the command line.",
"homepage": "https://github.com/laravel/pail",
- "keywords": [
- "laravel",
- "logs",
- "php",
- "tail"
- ],
+ "keywords": ["laravel", "logs", "php", "tail"],
"support": {
"issues": "https://github.com/laravel/pail/issues",
"source": "https://github.com/laravel/pail"
diff --git a/database/migrations/2024_12_02_002435_remove_tags_from_metadata.php b/database/migrations/2024_12_02_002435_remove_tags_from_metadata.php
new file mode 100644
index 00000000..1da72dd2
--- /dev/null
+++ b/database/migrations/2024_12_02_002435_remove_tags_from_metadata.php
@@ -0,0 +1,26 @@
+<?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::table('metadata', function (Blueprint $table) {
+ //
+ $table->dropColumn('tags');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void {
+ Schema::table('metadata', function (Blueprint $table) {
+ $table->string('tags')->nullable();
+ });
+ }
+};
diff --git a/eslint.config.js b/eslint.config.js
index c091e19d..890e9b9d 100755
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -13,9 +13,14 @@ const gitignorePath = path.resolve(__dirname, '.gitignore');
export default [
includeIgnoreFile(gitignorePath),
{
- name: 'app/files-to-lint',
+ ...pluginVue.configs['flat/essential'],
+ ...vueTsEslintConfig(),
files: ['resources/*.{js,mjs,cjs,vue,ts}'],
+ skipFormatting,
languageOptions: {
+ ecmaVersion: 'latest',
+ sourceType: 'module',
+ globals: globals.browser,
parserOptions: {
parser: {
// Script parser for `<script>`
@@ -23,14 +28,8 @@ export default [
// Script parser for `<script lang="ts">`
ts: '@typescript-eslint/parser',
-
- // Script parser for vue directives (e.g. `v-if=` or `:attribute=`)
- // and vue interpolations (e.g. `{{variable}}`).
- // If not specified, the parser determined by `<script lang ="...">` is used.
- '<template>': 'espree',
},
sourceType: 'module',
- project: ['./tsconfig.json', './tsconfig.node.json'],
extraFileExtensions: ['.vue'],
},
},
@@ -39,15 +38,12 @@ export default [
'no-unused-vars': '0',
'@typescript-eslint/no-unused-vars': '0',
'@typescript-eslint/no-explicit-any': '0',
+ 'vue/block-lang': [
+ 'error',
+ {
+ script: { allowNoLang: true },
+ },
+ ],
},
},
-
- // {
- // name: 'app/files-to-ignore',
- // ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**'],
- // },
-
- ...pluginVue.configs['flat/essential'],
- ...vueTsEslintConfig(),
- skipFormatting,
];
diff --git a/resources/js/components/forms/EditFolder.vue b/resources/js/components/forms/EditFolder.vue
index f4f39bb9..a70c5ce8 100644
--- a/resources/js/components/forms/EditFolder.vue
+++ b/resources/js/components/forms/EditFolder.vue
@@ -1,22 +1,22 @@
<script setup>
-import { toCalendarFormattedDate } from '../../service/util';
+import { toCalendarFormattedDate } from '@/service/util';
import { reactive } from 'vue';
-import { useToast } from '../../composables/useToast';
+import { useToast } from '@/composables/useToast';
-import FormInputNumber from '../inputs/FormInputNumber.vue';
-import FormInputLabel from '../labels/FormInputLabel.vue';
-import FormTextArea from '../inputs/FormTextArea.vue';
-import DatePicker from '../pinesUI/DatePicker.vue';
-import FormInput from '../inputs/FormInput.vue';
+import FormInputNumber from '@/components/inputs/FormInputNumber.vue';
+import FormInputLabel from '@/components/labels/FormInputLabel.vue';
+import FormTextArea from '@/components/inputs/FormTextArea.vue';
+import DatePicker from '@/components/pinesUI/DatePicker.vue';
+import FormInput from '@/components/inputs/FormInput.vue';
import mediaAPI from '@/service/mediaAPI.ts';
-import useForm from '../../composables/useForm';
+import useForm from '@/composables/useForm';
const emit = defineEmits(['handleFinish']);
const props = defineProps(['folder']);
const toast = useToast();
-'title', 'description', 'studio', 'seasons', 'episodes', 'films', 'date_start', 'date_end', 'thumbnail_url', 'editor_id';
+// 'title', 'description', 'studio', 'seasons', 'episodes', 'films', 'date_start', 'date_end', 'thumbnail_url', 'editor_id';
const fields = reactive([
{
name: 'title',
diff --git a/tsconfig.json b/tsconfig.json
index 62f603a5..f4979fbb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,19 +1,10 @@
{
"extends": "@vue/tsconfig/tsconfig.dom.json",
- "include": [
- "resources/**/*.ts",
- "resources/**/*.js",
- "resources/**/*.d.ts",
- "resources/**/*.vue"
- ],
+ "include": ["resources/**/*.ts", "resources/**/*.js", "resources/**/*.d.ts", "resources/**/*.vue"],
"compilerOptions": {
"target": "ES2020",
"module": "ESNext",
- "lib": [
- "ES2020",
- "DOM",
- "DOM.Iterable"
- ],
+ "lib": ["ES2020", "DOM", "DOM.Iterable"],
/* Bundler mode */
"moduleResolution": "node",
"allowImportingTsExtensions": true,
@@ -24,17 +15,13 @@
"allowJs": true,
"strict": true,
"composite": true,
- "noUnusedLocals": false, /* Report errors on unused locals. */
+ "noUnusedLocals": false /* Report errors on unused locals. */,
"noUnusedParameters": false,
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
"baseUrl": ".",
"paths": {
- "@/*": [
- "resources/js/*"
- ]
+ "@/*": ["resources/js/*"]
},
- "types": [
- "vite/client"
- ],
+ "types": ["vite/client"]
}
-}
\ No newline at end of file
+}