starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update mediainfo usage

Browse Source
This commit is contained in:
DariusIII
2024-03-29 14:41:56 +01:00
parent abeed40310
commit 48ff3684ea
7 changed files with 183 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Blacklight/NameFixer.php
+46 -49
View File
@@ -15,7 +15,7 @@ use Illuminate\Support\Str;
*/
class NameFixer
{
public const PREDB_REGEX = '/([\w() -]+[\s._,&+-]([!\w,.+()]+[\s._-])+[\w()]+-\w+)/';
public const PREDB_REGEX = '/([\w\(\) \-–]+[\s\._,&+\'-–]([\!\w&\',@#.\+\(\)]+[\s\._–-])+[\w\(\)]+(.?-)\w+)/ui';
// Constants for name fixing status
public const PROC_NFO_NONE = 0;
@@ -153,7 +153,7 @@ class NameFixer
if ($cats === 3) {
$query = sprintf(
'
SELECT rel.id AS releases_id, rel.fromname
SELECT rel.id AS releases_id, rel.fromname, rel.nzb_password
FROM releases rel
INNER JOIN release_nfos nfo ON (nfo.releases_id = rel.id)
WHERE rel.nzbstatus = %d
@@ -165,7 +165,7 @@ class NameFixer
} else {
$query = sprintf(
'
SELECT rel.id AS releases_id, rel.fromname
SELECT rel.id AS releases_id, rel.fromname, rel.nzb_password
FROM releases rel
INNER JOIN release_nfos nfo ON (nfo.releases_id = rel.id)
WHERE (rel.isrenamed = %d OR rel.categories_id IN (%d, %d))
@@ -190,7 +190,7 @@ class NameFixer
$releaseRow = Release::fromQuery(
sprintf(
'
SELECT nfo.releases_id AS nfoid, rel.groups_id, rel.fromname, rel.categories_id, rel.name, rel.searchname,
SELECT nfo.releases_id AS nfoid, rel.groups_id, rel.fromname, rel.categories_id, rel.name, rel.searchname, rel.nzb_password,
UNCOMPRESS(nfo) AS textstring, rel.id AS releases_id
FROM releases rel
INNER JOIN release_nfos nfo ON (nfo.releases_id = rel.id)
@@ -234,7 +234,7 @@ class NameFixer
if ($cats === 3) {
$query = sprintf(
'
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id,
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id, rel.nzb_password,
rf.releases_id AS fileid, rel.id AS releases_id
FROM releases rel
INNER JOIN release_files rf ON rf.releases_id = rel.id
@@ -247,7 +247,7 @@ class NameFixer
} else {
$query = sprintf(
'
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id,
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id, rel.nzb_password,
rf.releases_id AS fileid, rel.id AS releases_id
FROM releases rel
INNER JOIN release_files rf ON rf.releases_id = rel.id
@@ -296,7 +296,7 @@ class NameFixer
if ($cats === 3) {
$query = sprintf(
'
SELECT rf.crc32 AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id, rel.size as relsize,
SELECT rf.crc32 AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id, rel.size as relsize, rel.nzb_password,
rf.releases_id AS fileid, rel.id AS releases_id
FROM releases rel
INNER JOIN release_files rf ON rf.releases_id = rel.id
@@ -309,7 +309,7 @@ class NameFixer
} else {
$query = sprintf(
'
SELECT rf.crc32 AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id, rel.size as relsize,
SELECT rf.crc32 AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id, rel.size as relsize, rel.nzb_password,
rf.releases_id AS fileid, rel.id AS releases_id
FROM releases rel
INNER JOIN release_files rf ON rf.releases_id = rel.id
@@ -357,7 +357,7 @@ class NameFixer
if ($cats === 3) {
$query = sprintf(
'
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id,
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id, rel.nzb_password,
rf.releases_id AS fileid, rel.id AS releases_id
FROM releases rel
INNER JOIN release_files rf ON rf.releases_id = rel.id
@@ -369,7 +369,7 @@ class NameFixer
} else {
$query = sprintf(
'
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id,
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id, rel.nzb_password,
rf.releases_id AS fileid, rel.id AS releases_id
FROM releases rel
INNER JOIN release_files rf ON rf.releases_id = rel.id
@@ -416,7 +416,7 @@ class NameFixer
if ($cats === 3) {
$query = sprintf(
'
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id,
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id, rel.nzb_password,
rf.releases_id AS fileid, rel.id AS releases_id
FROM releases rel
INNER JOIN release_files rf ON rf.releases_id = rel.id
@@ -428,7 +428,7 @@ class NameFixer
} else {
$query = sprintf(
'
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id,
SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id, rel.nzb_password,
rf.releases_id AS fileid, rel.id AS releases_id
FROM releases rel
INNER JOIN release_files rf ON rf.releases_id = rel.id
@@ -488,7 +488,7 @@ class NameFixer
} else {
$query = sprintf(
'
SELECT rel.id AS releases_id, rel.guid, rel.groups_id, rel.fromname
SELECT rel.id AS releases_id, rel.guid, rel.groups_id, rel.fromname, rel.nzb_password
FROM releases rel
WHERE (rel.isrenamed = %d OR rel.categories_id IN (%d, %d))
AND rel.predb_id = 0
@@ -525,10 +525,6 @@ class NameFixer
}
/**
* Attempts to fix release names using the mediainfo xml Unique_ID.
*
*
*
* @throws \Exception
*/
public function fixNamesWithMedia($time, $echo, $cats, $nameStatus, $show): void
@@ -542,11 +538,11 @@ class NameFixer
$query = sprintf(
'
SELECT
rel.id AS releases_id, rel.size AS relsize, rel.groups_id, rel.fromname, rel.categories_id,
rel.id AS releases_id, rel.size AS relsize, rel.groups_id, rel.fromname, rel.categories_id, rel.nzb_password,
rel.name, rel.name AS textstring, rel.predb_id, rel.searchname,
ru.uniqueid AS uid
ru.unique_id AS uid
FROM releases rel
LEFT JOIN release_unique ru ON ru.releases_id = rel.id
LEFT JOIN media_infos ru ON ru.releases_id = rel.id
WHERE ru.releases_id IS NOT NULL
AND rel.nzbstatus = %d
AND rel.predb_id = 0',
@@ -559,10 +555,10 @@ class NameFixer
'
SELECT
rel.id AS releases_id, rel.size AS relsize, rel.groups_id, rel.fromname, rel.categories_id,
rel.name, rel.name AS textstring, rel.predb_id, rel.searchname,
ru.uniqueid AS uid
rel.name, rel.name AS textstring, rel.predb_id, rel.searchname, rel.nzb_password,
ru.unique_id AS uid
FROM releases rel
LEFT JOIN release_unique ru ON ru.releases_id = rel.id
LEFT JOIN media_infos ru ON ru.releases_id = rel.id
WHERE ru.releases_id IS NOT NULL
AND rel.nzbstatus = %d
AND (rel.isrenamed = %d OR rel.categories_id IN (%d, %d))
@@ -605,34 +601,30 @@ class NameFixer
// Re-check all releases we haven't matched to a PreDB
if ($cats === 3) {
$query = sprintf(
"
SELECT rel.id AS releases_id, rel.name, rel.name AS textstring, rel.predb_id, rel.searchname, rel.fromname, rel.groups_id, rel.categories_id, rel.id AS releases_id, rf.mediainfo AS mediainfo
'
SELECT rel.id AS releases_id, rel.name, rel.name AS textstring, rel.predb_id, rel.searchname, rel.fromname, rel.groups_id, rel.categories_id, rel.nzb_password, rel.id AS releases_id, rf.movie_name as movie_name
FROM releases rel
INNER JOIN releaseextrafull rf ON rf.releases_id = rel.id
WHERE rel.name REGEXP '[a-z0-9]{32,64}'
AND rf.mediainfo REGEXP '\<Movie_name\>'
AND rel.nzbstatus = %d
AND rel.predb_id = 0",
INNER JOIN media_infos rf ON rf.releases_id = rel.id
WHERE rel.nzbstatus = %d
AND rel.predb_id = 0',
NZB::NZB_ADDED
);
$cats = 2;
// Otherwise check only releases we haven't renamed and checked uid before in Misc categories
} else {
$query = sprintf(
"
SELECT rel.id AS releases_id, rel.name, rel.name AS textstring, rel.predb_id, rel.searchname, rel.fromname, rel.groups_id, rel.categories_id, rel.id AS releases_id, rf.mediainfo AS mediainfo
'
SELECT rel.id AS releases_id, rel.name, rel.name AS textstring, rel.predb_id, rel.searchname, rel.fromname, rel.groups_id, rel.categories_id, rel.nzb_password, rel.id AS releases_id, rf.movie_name as movie_name, rf.file_name as file_name
FROM releases rel
INNER JOIN releaseextrafull rf ON rf.releases_id = rel.id
WHERE rel.name REGEXP '[a-z0-9]{32,64}'
AND rf.mediainfo REGEXP '\<Movie_name\>'
AND rel.nzbstatus = %d
INNER JOIN media_infos rf ON rf.releases_id = rel.id
WHERE rel.nzbstatus = %d
AND rel.isrenamed = %d
AND rel.predb_id = 0",
AND rel.predb_id = 0',
NZB::NZB_ADDED,
self::IS_RENAMED_NONE
);
if ($cats === 2) {
$query .= PHP_EOL.sprintf('AND rel.categories_id IN (%s)', [Category::OTHER_MISC, Category::OTHER_HASHED]);
$query .= PHP_EOL.'AND rel.categories_id IN ('.Category::OTHER_MISC.','.Category::OTHER_HASHED.')';
}
}
@@ -672,7 +664,7 @@ class NameFixer
'
SELECT
rel.id AS releases_id, rel.size AS relsize, rel.groups_id, rel.fromname, rel.categories_id,
rel.name, rel.name AS textstring, rel.predb_id, rel.searchname,
rel.name, rel.name AS textstring, rel.predb_id, rel.searchname, rel.nzb_password,
IFNULL(ph.hash, \'\') AS hash
FROM releases rel
LEFT JOIN par_hashes ph ON ph.releases_id = rel.id
@@ -688,7 +680,7 @@ class NameFixer
'
SELECT
rel.id AS releases_id, rel.size AS relsize, rel.groups_id, rel.fromname, rel.categories_id,
rel.name, rel.name AS textstring, rel.predb_id, rel.searchname,
rel.name, rel.name AS textstring, rel.predb_id, rel.searchname, rel.nzb_password,
IFNULL(ph.hash, \'\') AS hash
FROM releases rel
LEFT JOIN par_hashes ph ON ph.releases_id = rel.id
@@ -817,6 +809,10 @@ class NameFixer
if (\is_array($release)) {
$release = (object) $release;
}
// If $release does not have a releases_id, we should add it.
if (! isset($release->releases_id)) {
$release->releases_id = $release->id;
}
if ($this->relid !== $release->releases_id) {
$newName = (new ReleaseCleaning())->fixerCleaner($name);
if (strtolower($newName) !== strtolower($release->searchname)) {
@@ -926,6 +922,7 @@ class NameFixer
'predb_id' => $preId,
'searchname' => $newTitle,
'categories_id' => $determinedCategory['categories_id'],
'nzb_password' => $release->nzb_password,
];
if ($status !== '') {
@@ -959,6 +956,7 @@ class NameFixer
'searchname' => $newTitle,
'categories_id' => $determinedCategory['categories_id'],
'iscategorized' => 1,
'nzb_password' => $release->nzb_password,
]
);
@@ -1838,10 +1836,10 @@ class NameFixer
case preg_match('/^(.+?(x264|XviD)\-TVP)\\\\/i', $release->textstring, $result):
$this->updateRelease($release, $result['1'], 'fileCheck: TVP', $echo, $type, $nameStatus, $show);
break;
case preg_match('/^(\\\\|\/)?(.+(\\\\|\/))*(.+?S\d{1,3}[.-_ ]?[ED]\d{1,3}.+)\.(.+)$/i', $release->textstring, $result):
case preg_match('/^(\\\\|\/)?(.+(\\\\|\/))*(.+?S\d{1,3}[.-_ ]?[ED]\d{1,3}.+)\.(.+)$/iu', $release->textstring, $result):
$this->updateRelease($release, $result['4'], 'fileCheck: Generic TV', $echo, $type, $nameStatus, $show);
break;
case preg_match('/^(\\\\|\/)?(.+(\\\\|\/))*(.+?([\.\-_ ]\d{4}[\.\-_ ].+?(BDRip|bluray|DVDRip|XVID)).+)\.(.+)$/i', $release->textstring, $result):
case preg_match('/^(\\\\|\/)?(.+(\\\\|\/))*(.+?([\.\-_ ]\d{4}[\.\-_ ].+?(BDRip|bluray|DVDRip|XVID)).+)\.(.+)$/iu', $release->textstring, $result):
$this->updateRelease($release, $result['4'], 'fileCheck: Generic movie 1', $echo, $type, $nameStatus, $show);
break;
case preg_match('/^([a-z0-9\.\-_]+(19|20)\d\d[a-z0-9\.\-_]+[\.\-_ ](720p|1080p|BDRip|bluray|DVDRip|x264|XviD)[a-z0-9\.\-_]+)\.[a-z]{2,}$/i', $release->textstring, $result):
@@ -1930,9 +1928,9 @@ class NameFixer
'
SELECT r.id AS releases_id, r.size AS relsize, r.name AS textstring, r.searchname, r.fromname, r.predb_id
FROM releases r
LEFT JOIN release_unique ru ON ru.releases_id = r.id
LEFT JOIN media_infos ru ON ru.releases_id = r.id
WHERE ru.releases_id IS NOT NULL
AND ru.uniqueid = %s
AND ru.unique_id = %s
AND ru.releases_id != %d
AND (r.predb_id > 0 OR r.anidbid > 0 OR r.fromname = %s)',
escapeString($release->uid),
@@ -1975,14 +1973,13 @@ class NameFixer
$newName = '';
if (! $this->done && $this->relid !== (int) $release->releases_id) {
if (preg_match('/<Movie_name>(.+)<\/Movie_name>/i', $release->mediainfo, $hit)) {
$media = $hit[1];
if (preg_match(self::PREDB_REGEX, $media, $hit)) {
if (! empty($release->movie_name)) {
if (preg_match(self::PREDB_REGEX, $release->movie_name, $hit)) {
$newName = $hit[1];
} elseif (preg_match('/(.+)[\,](\sRMZ\.cr)?$/i', $media, $hit)) {
} elseif (preg_match('/(.+),(\sRMZ\.cr)?$/i', $release->movie_name, $hit)) {
$newName = $hit[1];
} else {
$newName = $media;
$newName = $release->movie_name;
}
}
Blacklight/ReleaseExtra.php
+5 -53
View File
@@ -3,9 +3,7 @@
namespace Blacklight;
use App\Models\AudioData;
use App\Models\ReleaseExtraFull;
use App\Models\ReleaseSubtitle;
use App\Models\ReleaseUnique;
use App\Models\VideoData;
use Illuminate\Support\Facades\DB;
use Mhor\MediaInfo\Container\MediaInfoContainer;
@@ -54,7 +52,7 @@ class ReleaseExtra
}
/**
* @return \Illuminate\Database\Eloquent\Model|null|static
* @return \Illuminate\Database\Eloquent\Model|null
*/
public function getSubs($id)
{
@@ -85,19 +83,10 @@ class ReleaseExtra
$videos = $arrXml->getVideos();
$subtitles = $arrXml->getSubtitles();
if ($general !== null) {
if (! empty($general->get('unique_id')) && (int) $general->get('unique_id')->getShortName() !== 1) {
$uniqueId = $general->get('unique_id')->getShortName();
$this->addUID($releaseID, $uniqueId);
}
if ($general->get('format') !== null) {
$containerFormat = $general->get('format')->getFullName();
}
if ($general->get('overall_bit_rate') !== null) {
$overallBitRate = $general->get('overall_bit_rate')->getFullName();
}
$videoDuration = $videoFormat = $videoCodec = $videoWidth = $videoHeight = $videoAspect = $videoFrameRate = $videoLibrary = $videoBitRate = '';
if (! empty($videos)) {
@@ -106,6 +95,10 @@ class ReleaseExtra
$videoDuration = $video->get('duration')->getMilliseconds();
}
if ($video->get('bit_rate') !== null) {
$overallBitRate = $video->get('bit_rate');
}
if ($video->get('format') !== null) {
$videoFormat = $video->get('format')->getFullName();
}
@@ -292,45 +285,4 @@ class ReleaseExtra
]);
}
}
public function addUID(int $releaseID, string $uniqueId): void
{
$dupecheck = ReleaseUnique::query()->where('releases_id', $releaseID)->orWhere([
'releases_id' => $releaseID,
'uniqueid' => $uniqueId,
])->first(['releases_id']);
if ($dupecheck === null) {
ReleaseUnique::insertOrIgnore([
'releases_id' => $releaseID,
'uniqueid' => $uniqueId,
]);
}
}
/**
* @return \Illuminate\Database\Eloquent\Model|null|static
*/
public function getFull($id)
{
return ReleaseExtraFull::query()->where('releases_id', $id)->first();
}
/***
* @param $id
*
* @return mixed
*/
public function deleteFull($id)
{
return ReleaseExtraFull::query()->where('releases_id', $id)->delete();
}
public function addFull($id, MediaInfoContainer $xmlArray): void
{
$ckid = ReleaseExtraFull::query()->where('releases_id', $id)->first();
if ($ckid === null) {
$xml = $xmlArray->__toXML()->asXML();
ReleaseExtraFull::insertOrIgnore(['releases_id' => $id, 'mediainfo' => $xml]);
}
}
}
Blacklight/processing/post/ProcessAdditional.php
+1 -1
View File
@@ -1855,7 +1855,7 @@ class ProcessAdditional
$xmlArray = $this->mediaInfo->getInfo($fileLocation, true);
// Insert it into the DB.
$this->_releaseExtra->addFull($this->_release->id, $xmlArray);
\App\Models\MediaInfo::addData($this->_release->id, $xmlArray);
$this->_releaseExtra->addFromXml($this->_release->id, $xmlArray);
if ($this->_echoCLI) {
app/Models/MediaInfo.php
+37
View File
@@ -0,0 +1,37 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Mhor\MediaInfo\Container\MediaInfoContainer;
class MediaInfo extends Model
{
use HasFactory;
protected $guarded = [];
public static function addData($id, MediaInfoContainer $xmlArray): void
{
$mediainfoArray = $xmlArray->getGeneral();
if (! $mediainfoArray) {
return;
}
// Check if we have the same release in the database
if (self::where('releases_id', $id)->exists()) {
return;
}
self::insertOrIgnore([
'releases_id' => $id,
'movie_name' => $mediainfoArray->get('movie_name') ?? null,
'file_name' => $mediainfoArray->get('file_name') ?? null,
'title' => $mediainfoArray->get('title') ?? null,
'unique_id' => $mediainfoArray->get('unique_id') ?? null,
'created_at' => now(),
'updated_at' => now(),
]);
}
}
database/migrations/2024_03_24_112451_create_mediainfo_table.php
+32
View File
@@ -0,0 +1,32 @@
<?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('media_infos', function (Blueprint $table) {
$table->id();
$table->bigInteger('releases_id')->unsigned();
$table->string('movie_name')->nullable();
$table->string('file_name')->nullable();
$table->string('title')->nullable();
$table->string('unique_id')->nullable();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('media_infos');
}
};
database/migrations/2024_03_26_215106_drop_releaseextrafull_table.php
+31
View File
@@ -0,0 +1,31 @@
<?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('releaseextrafull', function (Blueprint $table) {
$table->drop();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('releaseextrafull', function (Blueprint $table) {
$table->id();
$table->bigInteger('releases_id')->unsigned();
$table->longText('mediainfo')->nullable();
$table->timestamps();
});
}
};
database/migrations/2024_03_28_182943_drop_release_unique_table.php
+31
View File
@@ -0,0 +1,31 @@
<?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('release_unique', function (Blueprint $table) {
$table->drop();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('release_unique', function (Blueprint $table) {
$table->id();
$table->bigInteger('releases_id')->unsigned();
$table->string('uniqueid', 255)->nullable();
$table->timestamps();
});
}
};