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

Update seeder and names

Browse Source
This commit is contained in:
DariusIII
2024-10-28 13:27:02 +01:00
parent 5ee03998b3
commit 98c7b043ca
9 changed files with 46 additions and 1073 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+2 -2
View File
@@ -195,7 +195,7 @@ CHECK_PASSWORDED_RARS=false
DELETE_PASSWORDED_RELEASES=false
DELETE_POSSIBLE_PASSWORDED_RELEASES=false
EXTRACT_USING_RARINFO=false
PATH_TO_NZBS='/var/www/NNTmux/storage/nzb'
PATH_TO_NZBS=
PRIVATE_PROFILES=true
STORE_USER_IP=false
FFMPEG_PATH=
@@ -203,4 +203,4 @@ LAME_PATH=
MEDIAINFO_PATH=
TIIMEOUT_PATH=
MAGIC_FILE_PATH=
COVERS_PATH='/var/www/nntmux/storage/covers/'
COVERS_PATH=
Blacklight/Tmux.php
+1 -2
View File
@@ -147,7 +147,6 @@ class Tmux
(%1\$s 'crap_timer') AS crap_timer,
(%1\$s 'fix_crap') AS fix_crap,
(%1\$s 'fix_crap_opt') AS fix_crap_opt,
(%1\$s 'tv_timer') AS tv_timer,
(%1\$s 'post_kill_timer') AS post_kill_timer,
(%1\$s 'monitor_path') AS monitor_path,
(%1\$s 'monitor_path_a') AS monitor_path_a,
@@ -170,7 +169,7 @@ class Tmux
(%1\$s 'lookupgames') AS processgames,
(%1\$s 'lookupxxx') AS processxxx,
(%1\$s 'lookupimdb') AS processmovies,
(%1\$s 'lookuptvrage') AS processtvrage,
(%1\$s 'lookuptv') AS processtvrage,
(%1\$s 'lookupanidb') AS processanime,
(%1\$s 'lookupnfo') AS processnfo,
(%1\$s 'lookuppar2') AS processpar2,
Blacklight/libraries/Forking.php
+3 -3
View File
@@ -789,7 +789,7 @@ class Forking
*/
private function checkProcessTV(): bool
{
if ((int) Settings::settingValue('lookuptvrage') > 0) {
if ((int) Settings::settingValue('lookuptv') > 0) {
return DB::select(sprintf('
SELECT id
FROM releases
@@ -798,7 +798,7 @@ class Forking
AND size > 1048576
AND tv_episodes_id BETWEEN -2 AND 0
%s %s
', NZB::NZB_ADDED, (int) Settings::settingValue('lookuptvrage') === 2 ? 'AND isrenamed = 1' : '', $this->ppRenamedOnly ? 'AND isrenamed = 1' : '')) > 0;
', NZB::NZB_ADDED, (int) Settings::settingValue('lookuptv') === 2 ? 'AND isrenamed = 1' : '', $this->ppRenamedOnly ? 'AND isrenamed = 1' : '')) > 0;
}
return false;
@@ -826,7 +826,7 @@ class Forking
LIMIT 16',
($this->ppRenamedOnly ? 2 : 1),
NZB::NZB_ADDED,
(int) Settings::settingValue('lookuptvrage') === 2 ? 'AND isrenamed = 1' : '',
(int) Settings::settingValue('lookuptv') === 2 ? 'AND isrenamed = 1' : '',
($this->ppRenamedOnly ? 'AND isrenamed = 1' : '')
)
);
Blacklight/processing/PostProcess.php
+2 -2
View File
@@ -168,7 +168,7 @@ class PostProcess
public function processNfos(NNTP $nntp, string $groupID = '', string $guidChar = ''): void
{
if ((int) Settings::settingValue('lookupnfo') === 1) {
$this->Nfo->processNfoFiles($nntp, $groupID, $guidChar, (int) Settings::settingValue('lookupimdb'), (int) Settings::settingValue('lookuptvrage'));
$this->Nfo->processNfoFiles($nntp, $groupID, $guidChar, (int) Settings::settingValue('lookupimdb'), (int) Settings::settingValue('lookuptv'));
}
}
@@ -184,7 +184,7 @@ class PostProcess
*/
public function processTv(string $groupID = '', string $guidChar = '', int|string|null $processTV = ''): void
{
$processTV = (is_numeric($processTV) ? $processTV : Settings::settingValue('lookuptvrage'));
$processTV = (is_numeric($processTV) ? $processTV : Settings::settingValue('lookuptv'));
if ($processTV > 0) {
(new TVDB(['Echo' => $this->echooutput]))->processSite($groupID, $guidChar, $processTV);
(new TVMaze(['Echo' => $this->echooutput]))->processSite($groupID, $guidChar, $processTV);
config/nntux_settings.php
+1
View File
@@ -13,6 +13,7 @@ return [
'ffmpeg_path' => env('FFMPEG_PATH', '/usr/bin/ffmpeg'),
'ffprobe_path' => env('FFPROBE_PATH', '/usr/bin/ffprobe'),
'mediainfo_path' => env('MEDIAINFO_PATH', '/usr/bin/mediainfo'),
'lame_path' => env('LAME_PATH', '/usr/bin/lame'),
'timeout_path' => env('TIMEOUT_PATH', '/usr/bin/timeout'),
'magic_file_path' => env('MAGIC_FILE_PATH', '/usr/share/misc/magic'),
'covers_path' => env('COVERS_PATH', storage_path('covers')),
database/migrations/2024_10_28_115551_rename_lookuptvrage_to_lookuptv.php
+28
View File
@@ -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::table('settings', function (Blueprint $table) {
$table->renameColumn('lookuptvrage', 'lookuptv');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('settings', function (Blueprint $table) {
$table->renameColumn('lookuptv', 'lookuptvrage');
});
}
};
database/seeders/SettingsTableSeeder.php
+3 -1058
View File
File diff suppressed because it is too large Load Diff
misc/update/multiprocessing/.do_not_run/switch.php
+2 -2
View File
@@ -309,7 +309,7 @@ switch ($options[1]) {
echo $e->getMessage();
}
try {
(new Nfo())->processNfoFiles($nntp, $options[2], '', (int) Settings::settingValue('lookupimdb'), (int) Settings::settingValue('lookuptvrage'));
(new Nfo())->processNfoFiles($nntp, $options[2], '', (int) Settings::settingValue('lookupimdb'), (int) Settings::settingValue('lookuptv'));
} catch (Throwable $e) {
echo $e->getMessage();
}
@@ -331,7 +331,7 @@ switch ($options[1]) {
if ($options[1] === 'pp_nfo') {
try {
(new Nfo())->processNfoFiles($nntp, '', $options[2], (int) Settings::settingValue('lookupimdb'), (int) Settings::settingValue('lookuptvrage'));
(new Nfo())->processNfoFiles($nntp, '', $options[2], (int) Settings::settingValue('lookupimdb'), (int) Settings::settingValue('lookuptv'));
} catch (Throwable $e) {
echo $e->getMessage();
}
resources/views/themes/admin/site-edit.tpl
+4 -4
View File
@@ -269,9 +269,9 @@
<legend>Lookup Settings</legend>
<table class="input data table table-striped responsive-utilities jambo-table">
<tr>
<td style="width:180px;"><label for="lookuptvrage">Lookup TV:</label></td>
<td style="width:180px;"><label for="lookuptv">Lookup TV:</label></td>
<td>
{html_options style="width:180px;" id="lookuptvrage" name='lookuptvrage' values=$lookuptv_ids output=$lookuptv_names selected=$site->lookuptvrage}
{html_options style="width:180px;" id="lookuptv" name='lookuptv' values=$lookuptv_ids output=$lookuptv_names selected=$site->lookuptv}
<div class="hint">Whether to attempt to lookup TvRage ids on the web.</div>
</td>
</tr>
@@ -381,10 +381,10 @@
<legend>Password Settings</legend>
<table class="input data table table-striped responsive-utilities jambo-table">
<tr>
<td style="width:180px;"><label for="fetchlastcompressedfiles">Download last compressed
<td style="width:180px;"><label for="end">Download last compressed
file:</label></td>
<td>
{html_radios id="fetchlastcompressedfiles" name='fetchlastcompressedfiles' values=$yesno_ids output=$yesno_names selected=$site->end separator='<br />'}
{html_radios id="end" name='end' values=$yesno_ids output=$yesno_names selected=$site->end separator='<br />'}
<div class="hint">Try to download the last rar or zip file? (This is good if most of the files
are at the end.) Note: The first rar/zip is still downloaded.
</div>