Simplify setting names and check

This commit is contained in:
DariusIII
2024-10-28 12:14:32 +01:00
parent 65ab33743b
commit f21e6e8845
40 changed files with 192 additions and 210 deletions
@@ -271,15 +271,15 @@ class ProcessAdditional
$this->_nfo = new Nfo;
$this->manticore = new ManticoreSearch;
$this->elasticsearch = new ElasticSearchSiteSearch;
$this->ffmpeg = FFMpeg::create(['timeout' => Settings::settingValue('..timeoutseconds')]);
$this->ffmpeg = FFMpeg::create(['timeout' => Settings::settingValue('timeoutseconds')]);
$this->ffprobe = FFProbe::create();
$this->mediaInfo = new MediaInfo;
$this->mediaInfo->setConfig('use_oldxml_mediainfo_output_format', true);
$this->mediaInfo->setConfig('command', Settings::settingValue('apps..mediainfopath'));
$this->mediaInfo->setConfig('command', config('nntmux_settings.mediainfo_path'));
$this->_innerFileBlacklist = Settings::settingValue('indexer.ppa.innerfileblacklist') === '' ? false : Settings::settingValue('indexer.ppa.innerfileblacklist');
$this->_maxNestedLevels = (int) Settings::settingValue('..maxnestedlevels') === 0 ? 3 : (int) Settings::settingValue('..maxnestedlevels');
$this->_extractUsingRarInfo = (int) Settings::settingValue('..extractusingrarinfo') !== 0;
$this->_innerFileBlacklist = Settings::settingValue('innerfileblacklist') === '' ? false : Settings::settingValue('innerfileblacklist');
$this->_maxNestedLevels = (int) Settings::settingValue('maxnestedlevels') === 0 ? 3 : (int) Settings::settingValue('maxnestedlevels');
$this->_extractUsingRarInfo = (int) Settings::settingValue('extractusingrarinfo') !== 0;
$this->_fetchLastFiles = (int) Settings::settingValue('archive.fetch.end') !== 0;
$this->_unrarPath = false;
@@ -291,11 +291,11 @@ class ProcessAdditional
$this->_archiveInfo->setExternalClients($clients);
$this->_killString = '"';
if (config('nntmux_settings.timeout_path') && (int) Settings::settingValue('..timeoutseconds') > 0) {
if (config('nntmux_settings.timeout_path') && (int) Settings::settingValue('timeoutseconds') > 0) {
$this->_killString = (
'"'.config('nntmux_settings.timeout_path').
'" --foreground --signal=KILL '.
Settings::settingValue('..timeoutseconds').' "'
Settings::settingValue('timeoutseconds').' "'
);
}
@@ -303,43 +303,43 @@ class ProcessAdditional
// Maximum amount of releases to fetch per run.
$this->_queryLimit =
(Settings::settingValue('..maxaddprocessed') !== '') ? (int) Settings::settingValue('..maxaddprocessed') : 25;
(Settings::settingValue('maxaddprocessed') !== '') ? (int) Settings::settingValue('maxaddprocessed') : 25;
// Maximum message ID's to download per file type in the NZB (video, jpg, etc).
$this->_segmentsToDownload =
(Settings::settingValue('..segmentstodownload') !== '') ? (int) Settings::settingValue('..segmentstodownload') : 2;
(Settings::settingValue('segmentstodownload') !== '') ? (int) Settings::settingValue('segmentstodownload') : 2;
// Maximum message ID's to download for a RAR file.
$this->_maximumRarSegments =
(Settings::settingValue('..maxpartsprocessed') !== '') ? (int) Settings::settingValue('..maxpartsprocessed') : 3;
(Settings::settingValue('maxpartsprocessed') !== '') ? (int) Settings::settingValue('maxpartsprocessed') : 3;
// Maximum RAR files to check for a password before stopping.
$this->_maximumRarPasswordChecks =
(Settings::settingValue('..passchkattempts') !== '') ? (int) Settings::settingValue('..passchkattempts') : 1;
(Settings::settingValue('passchkattempts') !== '') ? (int) Settings::settingValue('passchkattempts') : 1;
$this->_maximumRarPasswordChecks = (max($this->_maximumRarPasswordChecks, 1));
// Maximum size of releases in GB.
$this->_maxSize = (Settings::settingValue('..maxsizetopostprocess') !== '') ? (int) Settings::settingValue('..maxsizetopostprocess') : 100;
$this->_maxSize = (Settings::settingValue('maxsizetopostprocess') !== '') ? (int) Settings::settingValue('maxsizetopostprocess') : 100;
// Minimum size of releases in MB.
$this->_minSize = (Settings::settingValue('..minsizetopostprocess') !== '') ? (int) Settings::settingValue('..minsizetopostprocess') : 100;
$this->_minSize = (Settings::settingValue('minsizetopostprocess') !== '') ? (int) Settings::settingValue('minsizetopostprocess') : 100;
// Use the alternate NNTP provider for downloading Message-ID's ?
$this->_alternateNNTP = config('nntmux_nntp.use_alternate_nntp_server');
$this->_ffMPEGDuration = Settings::settingValue('..ffmpeg_duration') !== '' ? (int) Settings::settingValue('..ffmpeg_duration') : 5;
$this->_ffMPEGDuration = Settings::settingValue('ffmpeg_duration') !== '' ? (int) Settings::settingValue('ffmpeg_duration') : 5;
$this->_addPAR2Files = config('nntmux:settings.add_par2');
if (! config('nntmux_settings.ffmpeg_path')) {
$this->_processAudioSample = $this->_processThumbnails = $this->_processVideo = false;
} else {
$this->_processAudioSample = (int) Settings::settingValue('..saveaudiopreview') !== 0;
$this->_processThumbnails = (int) Settings::settingValue('..processthumbnails') !== 0;
$this->_processVideo = (int) Settings::settingValue('..processvideos') !== 0;
$this->_processAudioSample = (int) Settings::settingValue('saveaudiopreview') !== 0;
$this->_processThumbnails = (int) Settings::settingValue('processthumbnails') !== 0;
$this->_processVideo = (int) Settings::settingValue('processvideos') !== 0;
}
$this->_processJPGSample = (int) Settings::settingValue('..processjpg') !== 0;
$this->_processJPGSample = (int) Settings::settingValue('processjpg') !== 0;
$this->_processMediaInfo = config('nntmux_settings.mediainfo_path');
$this->_processAudioInfo = $this->_processMediaInfo;
$this->_processPasswords = config('nntmux_settings.check_passworded_rars') === true && ! empty(config('nntmux_settings.unrar_path'));