@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | { |
| 268 | 268 | $returnVal = shell_exec("which $cmd 2>/dev/null"); |
| 269 | 269 | |
| 270 | - return ! empty($returnVal); |
|
| 270 | + return !empty($returnVal); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | /** |
@@ -326,11 +326,11 @@ discard block |
||
| 326 | 326 | |
| 327 | 327 | case 2: |
| 328 | 328 | $ppminString = $ppmaxString = ''; |
| 329 | - if (is_numeric($ppmax) && ! empty($ppmax)) { |
|
| 329 | + if (is_numeric($ppmax) && !empty($ppmax)) { |
|
| 330 | 330 | $ppmax *= 1073741824; |
| 331 | 331 | $ppmaxString = "AND r.size < {$ppmax}"; |
| 332 | 332 | } |
| 333 | - if (is_numeric($ppmin) && ! empty($ppmin)) { |
|
| 333 | + if (is_numeric($ppmin) && !empty($ppmin)) { |
|
| 334 | 334 | $ppmin *= 1048576; |
| 335 | 335 | $ppminString = "AND r.size > {$ppmin}"; |
| 336 | 336 | } |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | throw new \RuntimeException('Tmux\\\'s running flag was not found in the database.'.PHP_EOL.'Please check the tables are correctly setup.'.PHP_EOL); |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | - return ! ((int) $running->value === 0); |
|
| 391 | + return !((int) $running->value === 0); |
|
| 392 | 392 | } |
| 393 | 393 | |
| 394 | 394 | /** |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | */ |
| 415 | 415 | public function startRunning(): void |
| 416 | 416 | { |
| 417 | - if (! $this->isRunning()) { |
|
| 417 | + if (!$this->isRunning()) { |
|
| 418 | 418 | Settings::query()->where(['name' => 'running'])->update(['value' => 1]); |
| 419 | 419 | } |
| 420 | 420 | } |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | |
| 332 | 332 | $this->_addPAR2Files = config('nntmux_settings.add_par2'); |
| 333 | 333 | |
| 334 | - if (! config('nntmux_settings.ffmpeg_path')) { |
|
| 334 | + if (!config('nntmux_settings.ffmpeg_path')) { |
|
| 335 | 335 | $this->_processAudioSample = $this->_processThumbnails = $this->_processVideo = false; |
| 336 | 336 | } else { |
| 337 | 337 | $this->_processAudioSample = (int) Settings::settingValue('saveaudiopreview') !== 0; |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | $this->_processJPGSample = (int) Settings::settingValue('processjpg') !== 0; |
| 343 | 343 | $this->_processMediaInfo = config('nntmux_settings.mediainfo_path'); |
| 344 | 344 | $this->_processAudioInfo = $this->_processMediaInfo; |
| 345 | - $this->_processPasswords = config('nntmux_settings.check_passworded_rars') === true && ! empty(config('nntmux_settings.unrar_path')); |
|
| 345 | + $this->_processPasswords = config('nntmux_settings.check_passworded_rars') === true && !empty(config('nntmux_settings.unrar_path')); |
|
| 346 | 346 | |
| 347 | 347 | $this->_audioSavePath = config('nntmux_settings.covers_path').'/audiosample/'; |
| 348 | 348 | |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | $this->_mainTmpPath = config('nntmux.tmp_unrar_path'); |
| 400 | 400 | |
| 401 | 401 | // Check if it ends with a dir separator. |
| 402 | - if (! Str::endsWith($this->_mainTmpPath, '/') && ! Str::endsWith($this->_mainTmpPath, '\\')) { |
|
| 402 | + if (!Str::endsWith($this->_mainTmpPath, '/') && !Str::endsWith($this->_mainTmpPath, '\\')) { |
|
| 403 | 403 | $this->_mainTmpPath .= '/'; |
| 404 | 404 | } |
| 405 | 405 | |
@@ -410,13 +410,13 @@ discard block |
||
| 410 | 410 | $this->_mainTmpPath .= $guidChar.'/'; |
| 411 | 411 | } |
| 412 | 412 | |
| 413 | - if (! File::isDirectory($this->_mainTmpPath)) { |
|
| 414 | - if (! File::makeDirectory($this->_mainTmpPath, 0777, true, true) && ! File::isDirectory($this->_mainTmpPath)) { |
|
| 413 | + if (!File::isDirectory($this->_mainTmpPath)) { |
|
| 414 | + if (!File::makeDirectory($this->_mainTmpPath, 0777, true, true) && !File::isDirectory($this->_mainTmpPath)) { |
|
| 415 | 415 | throw new \RuntimeException(sprintf('Directory "%s" was not created', $this->_mainTmpPath)); |
| 416 | 416 | } |
| 417 | 417 | } |
| 418 | 418 | |
| 419 | - if (! File::isDirectory($this->_mainTmpPath)) { |
|
| 419 | + if (!File::isDirectory($this->_mainTmpPath)) { |
|
| 420 | 420 | throw new \RuntimeException('Could not create the tmpunrar folder ('.$this->_mainTmpPath.')'); |
| 421 | 421 | } |
| 422 | 422 | |
@@ -454,10 +454,10 @@ discard block |
||
| 454 | 454 | if ($this->_minSize > 0) { |
| 455 | 455 | $releasesQuery->where('releases.size', '>', (int) $this->_minSize * 1048576); |
| 456 | 456 | } |
| 457 | - if (! empty($groupID)) { |
|
| 457 | + if (!empty($groupID)) { |
|
| 458 | 458 | $releasesQuery->where('releases.groups_id', $groupID); |
| 459 | 459 | } |
| 460 | - if (! empty($guidChar)) { |
|
| 460 | + if (!empty($guidChar)) { |
|
| 461 | 461 | $releasesQuery->where('releases.leftguid', $guidChar); |
| 462 | 462 | } |
| 463 | 463 | $releasesQuery->select(['releases.id', 'releases.id as releases_id', 'releases.guid', 'releases.name', 'releases.size', 'releases.groups_id', 'releases.nfostatus', 'releases.fromname', 'releases.completion', 'releases.categories_id', 'releases.searchname', 'releases.predb_id', 'categories.disablepreview']) |
@@ -511,12 +511,12 @@ discard block |
||
| 511 | 511 | cli_set_process_title($this->_showCLIReleaseID.$this->_release->id); |
| 512 | 512 | |
| 513 | 513 | // Create folder to store temporary files. |
| 514 | - if (! $this->_createTempFolder()) { |
|
| 514 | + if (!$this->_createTempFolder()) { |
|
| 515 | 515 | continue; |
| 516 | 516 | } |
| 517 | 517 | |
| 518 | 518 | // Get NZB contents. |
| 519 | - if (! $this->_getNZBContents()) { |
|
| 519 | + if (!$this->_getNZBContents()) { |
|
| 520 | 520 | continue; |
| 521 | 521 | } |
| 522 | 522 | |
@@ -538,7 +538,7 @@ discard block |
||
| 538 | 538 | $this->_processMessageIDDownloads(); |
| 539 | 539 | |
| 540 | 540 | // Process compressed (RAR/ZIP) files inside the NZB. |
| 541 | - if (! $bookFlood && $this->_NZBHasCompressedFile) { |
|
| 541 | + if (!$bookFlood && $this->_NZBHasCompressedFile) { |
|
| 542 | 542 | // Download the RARs/ZIPs, extract the files inside them and insert the file info into the DB. |
| 543 | 543 | $this->_processNZBCompressedFiles(); |
| 544 | 544 | |
@@ -547,7 +547,7 @@ discard block |
||
| 547 | 547 | $this->_processNZBCompressedFiles(true); |
| 548 | 548 | } |
| 549 | 549 | |
| 550 | - if (! $this->_releaseHasPassword) { |
|
| 550 | + if (!$this->_releaseHasPassword) { |
|
| 551 | 551 | // Process the extracted files to get video/audio samples/etc. |
| 552 | 552 | $this->_processExtractedFiles(); |
| 553 | 553 | } |
@@ -591,10 +591,10 @@ discard block |
||
| 591 | 591 | { |
| 592 | 592 | // Per release defaults. |
| 593 | 593 | $this->tmpPath = $this->_mainTmpPath.$this->_release->guid.'/'; |
| 594 | - if (! File::isDirectory($this->tmpPath)) { |
|
| 595 | - if (! File::makeDirectory($this->tmpPath, 0777, true, false) && ! File::isDirectory($this->tmpPath)) { |
|
| 594 | + if (!File::isDirectory($this->tmpPath)) { |
|
| 595 | + if (!File::makeDirectory($this->tmpPath, 0777, true, false) && !File::isDirectory($this->tmpPath)) { |
|
| 596 | 596 | // We will try to create the main temp folder again, just in case there was a file lock or filesystem issue. |
| 597 | - if (! File::makeDirectory($this->tmpPath, 0777, true, false) && ! File::isDirectory($this->tmpPath)) { |
|
| 597 | + if (!File::makeDirectory($this->tmpPath, 0777, true, false) && !File::isDirectory($this->tmpPath)) { |
|
| 598 | 598 | $this->_echo('Unable to create directory: '.$this->tmpPath, 'warning'); |
| 599 | 599 | |
| 600 | 600 | return false; |
@@ -616,7 +616,7 @@ discard block |
||
| 616 | 616 | $nzbPath = $this->_nzb->NZBPath($this->_release->guid); |
| 617 | 617 | if ($nzbPath !== false) { |
| 618 | 618 | $nzbContents = Utility::unzipGzipFile($nzbPath); |
| 619 | - if (! $nzbContents) { |
|
| 619 | + if (!$nzbContents) { |
|
| 620 | 620 | if ($this->_echoCLI) { |
| 621 | 621 | $this->_echo('NZB is empty or broken for GUID: '.$this->_release->guid, 'warning'); |
| 622 | 622 | } |
@@ -677,7 +677,7 @@ discard block |
||
| 677 | 677 | } |
| 678 | 678 | |
| 679 | 679 | // Check if it's a rar/zip. |
| 680 | - if (! $this->_NZBHasCompressedFile && |
|
| 680 | + if (!$this->_NZBHasCompressedFile && |
|
| 681 | 681 | preg_match( |
| 682 | 682 | '/\.(part\d+|[r|z]\d+|rar|0+|0*10?|zipr\d{2,3}|zipx?)(\s*\.rar)*($|[ ")\]-])|"[a-f0-9]{32}\.[1-9]\d{1,2}".*\(\d+\/\d{2,}\)$/i', |
| 683 | 683 | $this->_currentNZBFile['title'] |
@@ -687,7 +687,7 @@ discard block |
||
| 687 | 687 | } |
| 688 | 688 | |
| 689 | 689 | // Look for a video sample, make sure it's not an image. |
| 690 | - if ($this->_processThumbnails && empty($this->_sampleMessageIDs) && isset($this->_currentNZBFile['segments']) && stripos($this->_currentNZBFile['title'], 'sample') !== false && ! preg_match('/\.jpe?g$/i', $this->_currentNZBFile['title']) |
|
| 690 | + if ($this->_processThumbnails && empty($this->_sampleMessageIDs) && isset($this->_currentNZBFile['segments']) && stripos($this->_currentNZBFile['title'], 'sample') !== false && !preg_match('/\.jpe?g$/i', $this->_currentNZBFile['title']) |
|
| 691 | 691 | ) { |
| 692 | 692 | // Get the amount of segments for this file. |
| 693 | 693 | $segCount = (\count($this->_currentNZBFile['segments']) - 1); |
@@ -701,7 +701,7 @@ discard block |
||
| 701 | 701 | } |
| 702 | 702 | |
| 703 | 703 | // Look for a JPG picture, make sure it's not a CD cover. |
| 704 | - if ($this->_processJPGSample && empty($this->_JPGMessageIDs) && isset($this->_currentNZBFile['segments']) && ! preg_match('/flac|lossless|mp3|music|inner-sanctum|sound/i', $this->_releaseGroupName) && preg_match('/\.jpe?g[. ")\]]/i', $this->_currentNZBFile['title']) |
|
| 704 | + if ($this->_processJPGSample && empty($this->_JPGMessageIDs) && isset($this->_currentNZBFile['segments']) && !preg_match('/flac|lossless|mp3|music|inner-sanctum|sound/i', $this->_releaseGroupName) && preg_match('/\.jpe?g[. ")\]]/i', $this->_currentNZBFile['title']) |
|
| 705 | 705 | ) { |
| 706 | 706 | // Get the amount of segments for this file. |
| 707 | 707 | $segCount = (\count($this->_currentNZBFile['segments']) - 1); |
@@ -753,7 +753,7 @@ discard block |
||
| 753 | 753 | $this->_reverse = $reverse; |
| 754 | 754 | |
| 755 | 755 | if ($this->_reverse) { |
| 756 | - if (! krsort($this->_nzbContents)) { |
|
| 756 | + if (!krsort($this->_nzbContents)) { |
|
| 757 | 757 | return; |
| 758 | 758 | } |
| 759 | 759 | } else { |
@@ -777,7 +777,7 @@ discard block |
||
| 777 | 777 | } |
| 778 | 778 | |
| 779 | 779 | // Probably not a rar/zip. |
| 780 | - if (! preg_match( |
|
| 780 | + if (!preg_match( |
|
| 781 | 781 | '/\.(part\d+|[r|z]\d+|rar|0+|0*10?|zipr\d{2,3}|zipx?)(\s*\.rar)*($|[ ")\]-])|"[a-f0-9]{32}\.[1-9]\d{1,2}".*\(\d+\/\d{2,}\)$/i', |
| 782 | 782 | $nzbFile['title'] |
| 783 | 783 | ) |
@@ -793,7 +793,7 @@ discard block |
||
| 793 | 793 | break; |
| 794 | 794 | } |
| 795 | 795 | $segment = (string) $nzbFile['segments'][$i]; |
| 796 | - if (! $this->_reverse) { |
|
| 796 | + if (!$this->_reverse) { |
|
| 797 | 797 | $this->_triedCompressedMids[] = $segment; |
| 798 | 798 | } elseif (\in_array($segment, $this->_triedCompressedMids, false)) { |
| 799 | 799 | // We already downloaded this file. |
@@ -845,7 +845,7 @@ discard block |
||
| 845 | 845 | { |
| 846 | 846 | $this->_compressedFilesChecked++; |
| 847 | 847 | // Give the data to archive info, so it can check if it's a rar. |
| 848 | - if (! $this->_archiveInfo->setData($compressedData, true)) { |
|
| 848 | + if (!$this->_archiveInfo->setData($compressedData, true)) { |
|
| 849 | 849 | if (config('app.debug') === true) { |
| 850 | 850 | $this->_debug('Data is probably not RAR or ZIP.'); |
| 851 | 851 | } |
@@ -875,7 +875,7 @@ discard block |
||
| 875 | 875 | } |
| 876 | 876 | |
| 877 | 877 | // Check if the compressed file is encrypted. |
| 878 | - if (! empty($this->_archiveInfo->isEncrypted) || (isset($dataSummary['is_encrypted']) && (int) $dataSummary['is_encrypted'] !== 0)) { |
|
| 878 | + if (!empty($this->_archiveInfo->isEncrypted) || (isset($dataSummary['is_encrypted']) && (int) $dataSummary['is_encrypted'] !== 0)) { |
|
| 879 | 879 | if (config('app.debug') === true) { |
| 880 | 880 | $this->_debug('ArchiveInfo: Compressed file has a password.'); |
| 881 | 881 | } |
@@ -887,13 +887,13 @@ discard block |
||
| 887 | 887 | |
| 888 | 888 | if ($this->_reverse) { |
| 889 | 889 | $fileData = $dataSummary['file_list'] ?? []; |
| 890 | - if (! empty($fileData)) { |
|
| 890 | + if (!empty($fileData)) { |
|
| 891 | 891 | $rarFileName = Arr::pluck($fileData, 'name'); |
| 892 | 892 | if (preg_match(NameFixer::PREDB_REGEX, $rarFileName[0], $hit)) { |
| 893 | 893 | $preCheck = Predb::whereTitle($hit[0])->first(); |
| 894 | 894 | $this->_release->preid = $preCheck !== null ? $preCheck->value('id') : 0; |
| 895 | 895 | (new NameFixer)->updateRelease($this->_release, $preCheck->title ?? ucwords($hit[0], '.'), 'RarInfo FileName Match', true, 'Filenames, ', true, true, $this->_release->preid); |
| 896 | - } elseif (! empty($dataSummary['archives']) && ! empty($dataSummary['archives'][$rarFileName[0]]['file_list'])) { |
|
| 896 | + } elseif (!empty($dataSummary['archives']) && !empty($dataSummary['archives'][$rarFileName[0]]['file_list'])) { |
|
| 897 | 897 | $archiveData = $dataSummary['archives'][$rarFileName[0]]['file_list']; |
| 898 | 898 | $archiveFileName = Arr::pluck($archiveData, 'name'); |
| 899 | 899 | if (preg_match(NameFixer::PREDB_REGEX, $archiveFileName[0], $match2)) { |
@@ -911,7 +911,7 @@ discard block |
||
| 911 | 911 | $this->_echo('r', 'primaryOver'); |
| 912 | 912 | } |
| 913 | 913 | |
| 914 | - if (! $this->_extractUsingRarInfo && $this->_unrarPath !== false) { |
|
| 914 | + if (!$this->_extractUsingRarInfo && $this->_unrarPath !== false) { |
|
| 915 | 915 | $fileName = $this->tmpPath.uniqid('', true).'.rar'; |
| 916 | 916 | File::put($fileName, $compressedData); |
| 917 | 917 | runCmd($this->_killString.$this->_unrarPath.'" e -ai -ep -c- -id -inul -kb -or -p- -r -y "'.$fileName.'" "'.$this->tmpPath.'unrar/"'); |
@@ -922,7 +922,7 @@ discard block |
||
| 922 | 922 | if ($this->_echoCLI) { |
| 923 | 923 | $this->_echo('z', 'primaryOver'); |
| 924 | 924 | } |
| 925 | - if (! $this->_extractUsingRarInfo) { |
|
| 925 | + if (!$this->_extractUsingRarInfo) { |
|
| 926 | 926 | $fileName = $this->tmpPath.uniqid('', true).'.zip'; |
| 927 | 927 | File::put($fileName, $compressedData); |
| 928 | 928 | // Use the unzip command instead of 7zip |
@@ -947,7 +947,7 @@ discard block |
||
| 947 | 947 | { |
| 948 | 948 | // Get a list of files inside the Compressed file. |
| 949 | 949 | $files = $this->_archiveInfo->getArchiveFileList(); |
| 950 | - if (! \is_array($files) || \count($files) === 0) { |
|
| 950 | + if (!\is_array($files) || \count($files) === 0) { |
|
| 951 | 951 | return false; |
| 952 | 952 | } |
| 953 | 953 | |
@@ -1017,8 +1017,8 @@ discard block |
||
| 1017 | 1017 | protected function _addFileInfo(&$file): void |
| 1018 | 1018 | { |
| 1019 | 1019 | // Don't add rar/zip files to the DB. |
| 1020 | - if (! isset($file['error']) && isset($file['source']) && |
|
| 1021 | - ! preg_match($this->_supportFileRegex.'|part\d+|[r|z]\d{1,3}|zipr\d{2,3}|\d{2,3}|zipx|zip|rar)(\s*\.rar)?$/i', $file['name']) |
|
| 1020 | + if (!isset($file['error']) && isset($file['source']) && |
|
| 1021 | + !preg_match($this->_supportFileRegex.'|part\d+|[r|z]\d{1,3}|zipr\d{2,3}|\d{2,3}|zipx|zip|rar)(\s*\.rar)?$/i', $file['name']) |
|
| 1022 | 1022 | ) { |
| 1023 | 1023 | // Cache the amount of files we find in the RAR or ZIP, return this to say we did find RAR or ZIP content. |
| 1024 | 1024 | // This is so we don't download more RAR or ZIP files for no reason. |
@@ -1029,7 +1029,7 @@ discard block |
||
| 1029 | 1029 | */ |
| 1030 | 1030 | if ($this->_addedFileInfo < 11 && ReleaseFile::query()->where(['releases_id' => $this->_release->id, 'name' => $file['name'], 'size' => $file['size']])->first() === null) { |
| 1031 | 1031 | $addReleaseFiles = ReleaseFile::addReleaseFiles($this->_release->id, $file['name'], $file['size'], $file['date'], $file['pass'], '', $file['crc32'] ?? ''); |
| 1032 | - if (! empty($addReleaseFiles)) { |
|
| 1032 | + if (!empty($addReleaseFiles)) { |
|
| 1033 | 1033 | $this->_addedFileInfo++; |
| 1034 | 1034 | |
| 1035 | 1035 | if ($this->_echoCLI) { |
@@ -1044,7 +1044,7 @@ discard block |
||
| 1044 | 1044 | $this->_releaseHasPassword = true; |
| 1045 | 1045 | $this->_passwordStatus = Releases::PASSWD_RAR; |
| 1046 | 1046 | } //Run a PreDB filename check on insert to try and match the release |
| 1047 | - elseif ($file['name'] !== '' && ! str_starts_with($file['name'], '.')) { |
|
| 1047 | + elseif ($file['name'] !== '' && !str_starts_with($file['name'], '.')) { |
|
| 1048 | 1048 | $this->_release['filename'] = $file['name']; |
| 1049 | 1049 | $this->_release['releases_id'] = $this->_release->id; |
| 1050 | 1050 | $this->_nameFixer->matchPreDbFiles($this->_release, 1, 1, true); |
@@ -1075,12 +1075,12 @@ discard block |
||
| 1075 | 1075 | // Get all the compressed files in the temp folder. |
| 1076 | 1076 | $files = $this->_getTempDirectoryContents('/.*\.([rz]\d{2,}|rar|zipx?|0{0,2}1)($|[^a-z0-9])/i'); |
| 1077 | 1077 | |
| 1078 | - if (! empty($files)) { |
|
| 1078 | + if (!empty($files)) { |
|
| 1079 | 1079 | foreach ($files as $file) { |
| 1080 | 1080 | // Check if the file exists. |
| 1081 | 1081 | if (File::isFile($file[0])) { |
| 1082 | 1082 | $rarData = @File::get($file[0]); |
| 1083 | - if (! empty($rarData)) { |
|
| 1083 | + if (!empty($rarData)) { |
|
| 1084 | 1084 | $this->_processCompressedData($rarData); |
| 1085 | 1085 | $foundCompressedFile = true; |
| 1086 | 1086 | } |
@@ -1090,7 +1090,7 @@ discard block |
||
| 1090 | 1090 | } |
| 1091 | 1091 | |
| 1092 | 1092 | // If we found no compressed files, break out. |
| 1093 | - if (! $foundCompressedFile) { |
|
| 1093 | + if (!$foundCompressedFile) { |
|
| 1094 | 1094 | break; |
| 1095 | 1095 | } |
| 1096 | 1096 | |
@@ -1101,7 +1101,7 @@ discard block |
||
| 1101 | 1101 | |
| 1102 | 1102 | // Get all the remaining files in the temp dir. |
| 1103 | 1103 | $files = $this->_getTempDirectoryContents(); |
| 1104 | - if (! empty($files)) { |
|
| 1104 | + if (!empty($files)) { |
|
| 1105 | 1105 | foreach ($files as $file) { |
| 1106 | 1106 | $file = $file->getPathname(); |
| 1107 | 1107 | |
@@ -1112,39 +1112,39 @@ discard block |
||
| 1112 | 1112 | |
| 1113 | 1113 | if (File::isFile($file)) { |
| 1114 | 1114 | // Process PAR2 files. |
| 1115 | - if (! $this->_foundPAR2Info && preg_match('/\.par2$/', $file)) { |
|
| 1115 | + if (!$this->_foundPAR2Info && preg_match('/\.par2$/', $file)) { |
|
| 1116 | 1116 | $this->_siftPAR2Info($file); |
| 1117 | 1117 | } // Process NFO files. |
| 1118 | 1118 | elseif ($this->_releaseHasNoNFO && preg_match('/(\.(nfo|inf|ofn)|info\.txt)$/i', $file)) { |
| 1119 | 1119 | $this->_processNfoFile($file); |
| 1120 | 1120 | } // Process audio files. |
| 1121 | - elseif ((! $this->_foundAudioInfo || ! $this->_foundAudioSample) && preg_match('/(.*)'.$this->_audioFileRegex.'$/i', $file, $fileType)) { |
|
| 1121 | + elseif ((!$this->_foundAudioInfo || !$this->_foundAudioSample) && preg_match('/(.*)'.$this->_audioFileRegex.'$/i', $file, $fileType)) { |
|
| 1122 | 1122 | // Try to get audio sample/audio media info. |
| 1123 | 1123 | File::move($file, $this->tmpPath.'audiofile.'.$fileType[2]); |
| 1124 | 1124 | $this->_getAudioInfo($this->tmpPath.'audiofile.'.$fileType[2], $fileType[2]); |
| 1125 | 1125 | File::delete($this->tmpPath.'audiofile.'.$fileType[2]); |
| 1126 | 1126 | } // Process JPG files. |
| 1127 | - elseif (! $this->_foundJPGSample && preg_match('/\.jpe?g$/i', $file)) { |
|
| 1127 | + elseif (!$this->_foundJPGSample && preg_match('/\.jpe?g$/i', $file)) { |
|
| 1128 | 1128 | $this->_getJPGSample($file); |
| 1129 | 1129 | File::delete($file); |
| 1130 | 1130 | } // Video sample // video clip // video media info. |
| 1131 | - elseif ((! $this->_foundSample || ! $this->_foundVideo || ! $this->_foundMediaInfo) && preg_match('/(.*)'.$this->_videoFileRegex.'$/i', $file)) { |
|
| 1131 | + elseif ((!$this->_foundSample || !$this->_foundVideo || !$this->_foundMediaInfo) && preg_match('/(.*)'.$this->_videoFileRegex.'$/i', $file)) { |
|
| 1132 | 1132 | $this->_processVideoFile($file); |
| 1133 | 1133 | } // Check file's magic info. |
| 1134 | 1134 | else { |
| 1135 | 1135 | $output = Utility::fileInfo($file); |
| 1136 | - if (! empty($output)) { |
|
| 1136 | + if (!empty($output)) { |
|
| 1137 | 1137 | switch (true) { |
| 1138 | - case ! $this->_foundJPGSample && preg_match('/^JPE?G/i', $output): |
|
| 1138 | + case !$this->_foundJPGSample && preg_match('/^JPE?G/i', $output): |
|
| 1139 | 1139 | $this->_getJPGSample($file); |
| 1140 | 1140 | File::delete($file); |
| 1141 | 1141 | break; |
| 1142 | 1142 | |
| 1143 | - case (! $this->_foundMediaInfo || ! $this->_foundSample || ! $this->_foundVideo) && preg_match('/Matroska data|MPEG v4|MPEG sequence, v2|\WAVI\W/i', $output): |
|
| 1143 | + case (!$this->_foundMediaInfo || !$this->_foundSample || !$this->_foundVideo) && preg_match('/Matroska data|MPEG v4|MPEG sequence, v2|\WAVI\W/i', $output): |
|
| 1144 | 1144 | $this->_processVideoFile($file); |
| 1145 | 1145 | break; |
| 1146 | 1146 | |
| 1147 | - case (! $this->_foundAudioSample || ! $this->_foundAudioInfo) && preg_match('/^FLAC|layer III|Vorbis audio/i', $output, $fileType): |
|
| 1147 | + case (!$this->_foundAudioSample || !$this->_foundAudioInfo) && preg_match('/^FLAC|layer III|Vorbis audio/i', $output, $fileType): |
|
| 1148 | 1148 | switch ($fileType[0]) { |
| 1149 | 1149 | case 'FLAC': |
| 1150 | 1150 | $fileType = 'FLAC'; |
@@ -1161,7 +1161,7 @@ discard block |
||
| 1161 | 1161 | File::delete($this->tmpPath.'audiofile.'.$fileType); |
| 1162 | 1162 | break; |
| 1163 | 1163 | |
| 1164 | - case ! $this->_foundPAR2Info && stripos($output, 'Parity') === 0: |
|
| 1164 | + case !$this->_foundPAR2Info && stripos($output, 'Parity') === 0: |
|
| 1165 | 1165 | $this->_siftPAR2Info($file); |
| 1166 | 1166 | break; |
| 1167 | 1167 | } |
@@ -1197,8 +1197,8 @@ discard block |
||
| 1197 | 1197 | protected function _processSampleMessageIDs(): void |
| 1198 | 1198 | { |
| 1199 | 1199 | // Download and process sample image. |
| 1200 | - if (! $this->_foundSample || ! $this->_foundVideo) { |
|
| 1201 | - if (! empty($this->_sampleMessageIDs)) { |
|
| 1200 | + if (!$this->_foundSample || !$this->_foundVideo) { |
|
| 1201 | + if (!empty($this->_sampleMessageIDs)) { |
|
| 1202 | 1202 | // Download it from usenet. |
| 1203 | 1203 | $sampleBinary = $this->_nntp->getMessages($this->_releaseGroupName, $this->_sampleMessageIDs, $this->_alternateNNTP); |
| 1204 | 1204 | if ($this->_nntp::isError($sampleBinary)) { |
@@ -1217,12 +1217,12 @@ discard block |
||
| 1217 | 1217 | File::put($fileLocation, $sampleBinary); |
| 1218 | 1218 | |
| 1219 | 1219 | // Try to get a sample picture. |
| 1220 | - if (! $this->_foundSample) { |
|
| 1220 | + if (!$this->_foundSample) { |
|
| 1221 | 1221 | $this->_foundSample = $this->_getSample($fileLocation); |
| 1222 | 1222 | } |
| 1223 | 1223 | |
| 1224 | 1224 | // Try to get a sample video. |
| 1225 | - if (! $this->_foundVideo) { |
|
| 1225 | + if (!$this->_foundVideo) { |
|
| 1226 | 1226 | $this->_foundVideo = $this->_getVideo($fileLocation); |
| 1227 | 1227 | } |
| 1228 | 1228 | } |
@@ -1243,8 +1243,8 @@ discard block |
||
| 1243 | 1243 | protected function _processMediaInfoMessageIDs(): void |
| 1244 | 1244 | { |
| 1245 | 1245 | // Download and process mediainfo. Also try to get a sample if we didn't get one yet. |
| 1246 | - if (! $this->_foundMediaInfo || ! $this->_foundSample || ! $this->_foundVideo) { |
|
| 1247 | - if (! empty($this->_MediaInfoMessageIDs)) { |
|
| 1246 | + if (!$this->_foundMediaInfo || !$this->_foundSample || !$this->_foundVideo) { |
|
| 1247 | + if (!empty($this->_MediaInfoMessageIDs)) { |
|
| 1248 | 1248 | // Try to download it from usenet. |
| 1249 | 1249 | $mediaBinary = $this->_nntp->getMessages($this->_releaseGroupName, $this->_MediaInfoMessageIDs, $this->_alternateNNTP); |
| 1250 | 1250 | if ($this->_nntp::isError($mediaBinary)) { |
@@ -1264,17 +1264,17 @@ discard block |
||
| 1264 | 1264 | File::put($fileLocation, $mediaBinary); |
| 1265 | 1265 | |
| 1266 | 1266 | // Try to get media info. |
| 1267 | - if (! $this->_foundMediaInfo) { |
|
| 1267 | + if (!$this->_foundMediaInfo) { |
|
| 1268 | 1268 | $this->_foundMediaInfo = $this->_getMediaInfo($fileLocation); |
| 1269 | 1269 | } |
| 1270 | 1270 | |
| 1271 | 1271 | // Try to get a sample picture. |
| 1272 | - if (! $this->_foundSample) { |
|
| 1272 | + if (!$this->_foundSample) { |
|
| 1273 | 1273 | $this->_foundSample = $this->_getSample($fileLocation); |
| 1274 | 1274 | } |
| 1275 | 1275 | |
| 1276 | 1276 | // Try to get a sample video. |
| 1277 | - if (! $this->_foundVideo) { |
|
| 1277 | + if (!$this->_foundVideo) { |
|
| 1278 | 1278 | $this->_foundVideo = $this->_getVideo($fileLocation); |
| 1279 | 1279 | } |
| 1280 | 1280 | } |
@@ -1295,8 +1295,8 @@ discard block |
||
| 1295 | 1295 | protected function _processAudioInfoMessageIDs(): void |
| 1296 | 1296 | { |
| 1297 | 1297 | // Download audio file, use media info to try to get the artist / album. |
| 1298 | - if (! $this->_foundAudioInfo || ! $this->_foundAudioSample) { |
|
| 1299 | - if (! empty($this->_AudioInfoMessageIDs)) { |
|
| 1298 | + if (!$this->_foundAudioInfo || !$this->_foundAudioSample) { |
|
| 1299 | + if (!empty($this->_AudioInfoMessageIDs)) { |
|
| 1300 | 1300 | // Try to download it from usenet. |
| 1301 | 1301 | $audioBinary = $this->_nntp->getMessages($this->_releaseGroupName, $this->_AudioInfoMessageIDs, $this->_alternateNNTP); |
| 1302 | 1302 | if ($this->_nntp::isError($audioBinary)) { |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | protected function _processJPGMessageIDs(): void |
| 1332 | 1332 | { |
| 1333 | 1333 | // Download JPG file. |
| 1334 | - if (! $this->_foundJPGSample && ! empty($this->_JPGMessageIDs)) { |
|
| 1334 | + if (!$this->_foundJPGSample && !empty($this->_JPGMessageIDs)) { |
|
| 1335 | 1335 | // Try to download it. |
| 1336 | 1336 | $jpgBinary = $this->_nntp->getMessages($this->_releaseGroupName, $this->_JPGMessageIDs, $this->_alternateNNTP); |
| 1337 | 1337 | if ($this->_nntp::isError($jpgBinary)) { |
@@ -1400,12 +1400,12 @@ discard block |
||
| 1400 | 1400 | $this->_passwordStatus = max([$this->_passwordStatus]); |
| 1401 | 1401 | |
| 1402 | 1402 | // Set the release to no password if password processing is off. |
| 1403 | - if (! $this->_processPasswords) { |
|
| 1403 | + if (!$this->_processPasswords) { |
|
| 1404 | 1404 | $this->_releaseHasPassword = false; |
| 1405 | 1405 | } |
| 1406 | 1406 | |
| 1407 | 1407 | // If we failed to get anything from the RAR/ZIPs update the release with what we have, if the rar/zip has no password. |
| 1408 | - if (! $this->_releaseHasPassword && $this->_NZBHasCompressedFile && $releaseFilesCount === 0) { |
|
| 1408 | + if (!$this->_releaseHasPassword && $this->_NZBHasCompressedFile && $releaseFilesCount === 0) { |
|
| 1409 | 1409 | $release = Release::query()->where('id', $this->_release->id); |
| 1410 | 1410 | $release->update( |
| 1411 | 1411 | $updateRows |
@@ -1459,19 +1459,19 @@ discard block |
||
| 1459 | 1459 | $retVal = $audVal = false; |
| 1460 | 1460 | |
| 1461 | 1461 | // Check if audio sample fetching is on. |
| 1462 | - if (! $this->_processAudioSample) { |
|
| 1462 | + if (!$this->_processAudioSample) { |
|
| 1463 | 1463 | $audVal = true; |
| 1464 | 1464 | } |
| 1465 | 1465 | |
| 1466 | 1466 | // Check if media info fetching is on. |
| 1467 | - if (! $this->_processAudioInfo) { |
|
| 1467 | + if (!$this->_processAudioInfo) { |
|
| 1468 | 1468 | $retVal = true; |
| 1469 | 1469 | } |
| 1470 | 1470 | |
| 1471 | 1471 | $rQuery = Release::query()->where('proc_pp', '=', 0)->where('id', $this->_release->id)->select(['searchname', 'fromname', 'categories_id'])->first(); |
| 1472 | 1472 | |
| 1473 | 1473 | $musicParent = (string) Category::MUSIC_ROOT; |
| 1474 | - if ($rQuery === null || ! preg_match( |
|
| 1474 | + if ($rQuery === null || !preg_match( |
|
| 1475 | 1475 | sprintf( |
| 1476 | 1476 | '/%d\d{3}|%d|%d|%d/', |
| 1477 | 1477 | $musicParent[0], |
@@ -1487,7 +1487,7 @@ discard block |
||
| 1487 | 1487 | |
| 1488 | 1488 | if (File::isFile($fileLocation)) { |
| 1489 | 1489 | // Check if media info is enabled. |
| 1490 | - if (! $retVal) { |
|
| 1490 | + if (!$retVal) { |
|
| 1491 | 1491 | // Get the media info for the file. |
| 1492 | 1492 | try { |
| 1493 | 1493 | $xmlArray = $this->mediaInfo->getInfo($fileLocation, false); |
@@ -1500,7 +1500,7 @@ discard block |
||
| 1500 | 1500 | $ext = strtoupper($fileExtension); |
| 1501 | 1501 | |
| 1502 | 1502 | // Form a new search name. |
| 1503 | - if (! empty($track->get('recorded_date')) && preg_match('/(?:19|20)\d\d/', $track->get('recorded_date')->getFullname(), $Year)) { |
|
| 1503 | + if (!empty($track->get('recorded_date')) && preg_match('/(?:19|20)\d\d/', $track->get('recorded_date')->getFullname(), $Year)) { |
|
| 1504 | 1504 | $newName = $track->get('performer')->getFullName().' - '.$track->get('album')->getFullName().' ('.$Year[0].') '.$ext; |
| 1505 | 1505 | } else { |
| 1506 | 1506 | $newName = $track->get('performer')->getFullName().' - '.$track->get('album')->getFullName().' '.$ext; |
@@ -1562,7 +1562,7 @@ discard block |
||
| 1562 | 1562 | } |
| 1563 | 1563 | |
| 1564 | 1564 | // Check if creating audio samples is enabled. |
| 1565 | - if (! $audVal) { |
|
| 1565 | + if (!$audVal) { |
|
| 1566 | 1566 | // File name to store audio file. |
| 1567 | 1567 | $audioFileName = ($this->_release->guid.'.ogg'); |
| 1568 | 1568 | |
@@ -1586,7 +1586,7 @@ discard block |
||
| 1586 | 1586 | // Try to move the temp audio file. |
| 1587 | 1587 | $renamed = File::move($this->tmpPath.$audioFileName, $this->_audioSavePath.$audioFileName); |
| 1588 | 1588 | |
| 1589 | - if (! $renamed) { |
|
| 1589 | + if (!$renamed) { |
|
| 1590 | 1590 | // Try to copy it if it fails. |
| 1591 | 1591 | $copied = File::copy($this->tmpPath.$audioFileName, $this->_audioSavePath.$audioFileName); |
| 1592 | 1592 | |
@@ -1594,7 +1594,7 @@ discard block |
||
| 1594 | 1594 | File::delete($this->tmpPath.$audioFileName); |
| 1595 | 1595 | |
| 1596 | 1596 | // If it didn't copy continue. |
| 1597 | - if (! $copied) { |
|
| 1597 | + if (!$copied) { |
|
| 1598 | 1598 | return false; |
| 1599 | 1599 | } |
| 1600 | 1600 | } |
@@ -1646,7 +1646,7 @@ discard block |
||
| 1646 | 1646 | $time = $this->ffprobe->format($videoLocation)->get('duration'); |
| 1647 | 1647 | } |
| 1648 | 1648 | |
| 1649 | - if (empty($time) || ! preg_match('/time=(\d{1,2}:\d{1,2}:)?(\d{1,2})\.(\d{1,2})\s*bitrate=/i', $time, $numbers)) { |
|
| 1649 | + if (empty($time) || !preg_match('/time=(\d{1,2}:\d{1,2}:)?(\d{1,2})\.(\d{1,2})\s*bitrate=/i', $time, $numbers)) { |
|
| 1650 | 1650 | return ''; |
| 1651 | 1651 | } |
| 1652 | 1652 | |
@@ -1667,7 +1667,7 @@ discard block |
||
| 1667 | 1667 | */ |
| 1668 | 1668 | protected function _getSample(string $fileLocation): bool |
| 1669 | 1669 | { |
| 1670 | - if (! $this->_processThumbnails) { |
|
| 1670 | + if (!$this->_processThumbnails) { |
|
| 1671 | 1671 | return false; |
| 1672 | 1672 | } |
| 1673 | 1673 | |
@@ -1732,7 +1732,7 @@ discard block |
||
| 1732 | 1732 | */ |
| 1733 | 1733 | protected function _getVideo(string $fileLocation): bool |
| 1734 | 1734 | { |
| 1735 | - if (! $this->_processVideo) { |
|
| 1735 | + if (!$this->_processVideo) { |
|
| 1736 | 1736 | return false; |
| 1737 | 1737 | } |
| 1738 | 1738 | |
@@ -1787,7 +1787,7 @@ discard block |
||
| 1787 | 1787 | } |
| 1788 | 1788 | |
| 1789 | 1789 | // If longer than 60 or we could not get the video length, run the old way. |
| 1790 | - if (! $newMethod && $this->ffprobe->isValid($fileLocation)) { |
|
| 1790 | + if (!$newMethod && $this->ffprobe->isValid($fileLocation)) { |
|
| 1791 | 1791 | try { |
| 1792 | 1792 | $video = $this->ffmpeg->open($fileLocation); |
| 1793 | 1793 | $videoSample = $video->clip(TimeCode::fromSeconds(0), TimeCode::fromSeconds($this->_ffMPEGDuration)); |
@@ -1810,14 +1810,14 @@ discard block |
||
| 1810 | 1810 | |
| 1811 | 1811 | // Try to move the file to the new path. |
| 1812 | 1812 | // If we couldn't rename it, try to copy it. |
| 1813 | - if (! @File::move($fileName, $newFile)) { |
|
| 1813 | + if (!@File::move($fileName, $newFile)) { |
|
| 1814 | 1814 | $copied = @File::copy($fileName, $newFile); |
| 1815 | 1815 | |
| 1816 | 1816 | // Delete the old file. |
| 1817 | 1817 | File::delete($fileName); |
| 1818 | 1818 | |
| 1819 | 1819 | // If it didn't copy, continue. |
| 1820 | - if (! $copied) { |
|
| 1820 | + if (!$copied) { |
|
| 1821 | 1821 | return false; |
| 1822 | 1822 | } |
| 1823 | 1823 | } |
@@ -1843,7 +1843,7 @@ discard block |
||
| 1843 | 1843 | */ |
| 1844 | 1844 | protected function _getMediaInfo($fileLocation): bool |
| 1845 | 1845 | { |
| 1846 | - if (! $this->_processMediaInfo) { |
|
| 1846 | + if (!$this->_processMediaInfo) { |
|
| 1847 | 1847 | return false; |
| 1848 | 1848 | } |
| 1849 | 1849 | |
@@ -1912,7 +1912,7 @@ discard block |
||
| 1912 | 1912 | $filesAdded = 0; |
| 1913 | 1913 | |
| 1914 | 1914 | foreach ($this->_par2Info->getFileList() as $file) { |
| 1915 | - if (! isset($file['name'])) { |
|
| 1915 | + if (!isset($file['name'])) { |
|
| 1916 | 1916 | continue; |
| 1917 | 1917 | } |
| 1918 | 1918 | |
@@ -1935,7 +1935,7 @@ discard block |
||
| 1935 | 1935 | } |
| 1936 | 1936 | |
| 1937 | 1937 | // Try to get a new name. |
| 1938 | - if (! $foundName) { |
|
| 1938 | + if (!$foundName) { |
|
| 1939 | 1939 | $this->_release->textstring = $file['name']; |
| 1940 | 1940 | $this->_release->releases_id = $this->_release->id; |
| 1941 | 1941 | if ($this->_nameFixer->checkName($this->_release, $this->_echoCLI, 'PAR2, ', 1, 1)) { |
@@ -1965,7 +1965,7 @@ discard block |
||
| 1965 | 1965 | protected function _processVideoFile($fileLocation): void |
| 1966 | 1966 | { |
| 1967 | 1967 | // Try to get a sample with it. |
| 1968 | - if (! $this->_foundSample) { |
|
| 1968 | + if (!$this->_foundSample) { |
|
| 1969 | 1969 | $this->_foundSample = $this->_getSample($fileLocation); |
| 1970 | 1970 | } |
| 1971 | 1971 | |
@@ -1973,12 +1973,12 @@ discard block |
||
| 1973 | 1973 | * Don't get it here if _sampleMessageIDs is empty |
| 1974 | 1974 | * or has 1 message-id (Saves downloading another part). |
| 1975 | 1975 | */ |
| 1976 | - if (! $this->_foundVideo && \count($this->_sampleMessageIDs) < 2) { |
|
| 1976 | + if (!$this->_foundVideo && \count($this->_sampleMessageIDs) < 2) { |
|
| 1977 | 1977 | $this->_foundVideo = $this->_getVideo($fileLocation); |
| 1978 | 1978 | } |
| 1979 | 1979 | |
| 1980 | 1980 | // Try to get media info with it. |
| 1981 | - if (! $this->_foundMediaInfo) { |
|
| 1981 | + if (!$this->_foundMediaInfo) { |
|
| 1982 | 1982 | $this->_foundMediaInfo = $this->_getMediaInfo($fileLocation); |
| 1983 | 1983 | } |
| 1984 | 1984 | } |
@@ -2000,24 +2000,24 @@ discard block |
||
| 2000 | 2000 | $bf = true; |
| 2001 | 2001 | } |
| 2002 | 2002 | |
| 2003 | - if (! $af && preg_match('/\.rar($|[ ")\]-])/i', $a)) { |
|
| 2003 | + if (!$af && preg_match('/\.rar($|[ ")\]-])/i', $a)) { |
|
| 2004 | 2004 | $a = preg_replace('/\.rar(?:$|[ ")\]-])/i', '.*rar', $a); |
| 2005 | 2005 | $af = true; |
| 2006 | 2006 | } |
| 2007 | - if (! $bf && preg_match('/\.rar($|[ ")\]-])/i', $b)) { |
|
| 2007 | + if (!$bf && preg_match('/\.rar($|[ ")\]-])/i', $b)) { |
|
| 2008 | 2008 | $b = preg_replace('/\.rar(?:$|[ ")\]-])/i', '.*rar', $b); |
| 2009 | 2009 | $bf = true; |
| 2010 | 2010 | } |
| 2011 | 2011 | |
| 2012 | - if (! $af && ! $bf) { |
|
| 2012 | + if (!$af && !$bf) { |
|
| 2013 | 2013 | return strnatcasecmp($a, $b); |
| 2014 | 2014 | } |
| 2015 | 2015 | |
| 2016 | - if (! $bf) { |
|
| 2016 | + if (!$bf) { |
|
| 2017 | 2017 | return -1; |
| 2018 | 2018 | } |
| 2019 | 2019 | |
| 2020 | - if (! $af) { |
|
| 2020 | + if (!$af) { |
|
| 2021 | 2021 | return 1; |
| 2022 | 2022 | } |
| 2023 | 2023 | |
@@ -2042,12 +2042,12 @@ discard block |
||
| 2042 | 2042 | protected function _resetReleaseStatus(): void |
| 2043 | 2043 | { |
| 2044 | 2044 | // Only process for samples, previews and images if not disabled. |
| 2045 | - $this->_foundVideo = ! $this->_processVideo; |
|
| 2046 | - $this->_foundMediaInfo = ! $this->_processMediaInfo; |
|
| 2047 | - $this->_foundAudioInfo = ! $this->_processAudioInfo; |
|
| 2048 | - $this->_foundAudioSample = ! $this->_processAudioSample; |
|
| 2049 | - $this->_foundJPGSample = ! $this->_processJPGSample; |
|
| 2050 | - $this->_foundSample = ! $this->_processThumbnails; |
|
| 2045 | + $this->_foundVideo = !$this->_processVideo; |
|
| 2046 | + $this->_foundMediaInfo = !$this->_processMediaInfo; |
|
| 2047 | + $this->_foundAudioInfo = !$this->_processAudioInfo; |
|
| 2048 | + $this->_foundAudioSample = !$this->_processAudioSample; |
|
| 2049 | + $this->_foundJPGSample = !$this->_processJPGSample; |
|
| 2050 | + $this->_foundSample = !$this->_processThumbnails; |
|
| 2051 | 2051 | $this->_foundPAR2Info = false; |
| 2052 | 2052 | |
| 2053 | 2053 | $this->_passwordStatus = Releases::PASSWD_NONE; |
@@ -34,11 +34,11 @@ discard block |
||
| 34 | 34 | $re = new ReleaseExtra; |
| 35 | 35 | $data = Release::getByGuid($guid); |
| 36 | 36 | $releaseRegex = ''; |
| 37 | - if (! empty($data)) { |
|
| 37 | + if (!empty($data)) { |
|
| 38 | 38 | $releaseRegex = ReleaseRegex::query()->where('releases_id', '=', $data['id'])->first(); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - if (! $data) { |
|
| 41 | + if (!$data) { |
|
| 42 | 42 | return redirect()->back(); |
| 43 | 43 | } |
| 44 | 44 | |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | if ($data['imdbid'] !== '' && $data['imdbid'] !== 0000000) { |
| 65 | 65 | $movie = new Movie(['Settings' => $this->settings]); |
| 66 | 66 | $mov = $movie->getMovieInfo($data['imdbid']); |
| 67 | - if (! empty($mov['title'])) { |
|
| 67 | + if (!empty($mov['title'])) { |
|
| 68 | 68 | $mov['title'] = str_replace(['/', '\\'], '', $mov['title']); |
| 69 | 69 | $mov['actors'] = makeFieldLinks($mov, 'actors', 'movies'); |
| 70 | 70 | $mov['genre'] = makeFieldLinks($mov, 'genre', 'movies'); |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | switch ($action) { |
| 27 | 27 | case 'delete': |
| 28 | 28 | $show = UserSerie::getShow($this->userdata->id, $videoId); |
| 29 | - if (! $show) { |
|
| 29 | + if (!$show) { |
|
| 30 | 30 | return redirect()->back(); |
| 31 | 31 | } |
| 32 | 32 | |
@@ -46,12 +46,12 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | $show = Video::getByVideoID($videoId); |
| 49 | - if (! $show) { |
|
| 49 | + if (!$show) { |
|
| 50 | 50 | return redirect()->to('myshows'); |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | if ($action === 'doadd') { |
| 54 | - $category = ($request->has('category') && \is_array($request->input('category')) && ! empty($request->input('category'))) ? $request->input('category') : []; |
|
| 54 | + $category = ($request->has('category') && \is_array($request->input('category')) && !empty($request->input('category'))) ? $request->input('category') : []; |
|
| 55 | 55 | UserSerie::addShow($this->userdata->id, $videoId, $category); |
| 56 | 56 | if ($request->has('from')) { |
| 57 | 57 | return redirect()->to($request->input('from')); |
@@ -85,12 +85,12 @@ discard block |
||
| 85 | 85 | case 'doedit': |
| 86 | 86 | $show = UserSerie::getShow($this->userdata->id, $videoId); |
| 87 | 87 | |
| 88 | - if (! $show) { |
|
| 88 | + if (!$show) { |
|
| 89 | 89 | return redirect()->to('myshows'); |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | if ($action === 'doedit') { |
| 93 | - $category = ($request->has('category') && \is_array($request->input('category')) && ! empty($request->input('category'))) ? $request->input('category') : []; |
|
| 93 | + $category = ($request->has('category') && \is_array($request->input('category')) && !empty($request->input('category'))) ? $request->input('category') : []; |
|
| 94 | 94 | UserSerie::updateShow($this->userdata->id, $videoId, $category); |
| 95 | 95 | if ($request->has('from')) { |
| 96 | 96 | return redirect()->to($request->input('from')); |
@@ -136,9 +136,9 @@ discard block |
||
| 136 | 136 | if ($shows !== null) { |
| 137 | 137 | foreach ($shows as $showk => $show) { |
| 138 | 138 | $showcats = explode('|', $show['categories']); |
| 139 | - if (\is_array($showcats) && ! empty($showcats)) { |
|
| 139 | + if (\is_array($showcats) && !empty($showcats)) { |
|
| 140 | 140 | foreach ($showcats as $scat) { |
| 141 | - if (! empty($scat)) { |
|
| 141 | + if (!empty($scat)) { |
|
| 142 | 142 | $catArr[] = $categories[$scat]; |
| 143 | 143 | } |
| 144 | 144 | } |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | |
| 58 | 58 | if ($payload['type'] === 'InvoiceSettled') { |
| 59 | 59 | // Check if we have the invoice_id in payments table and if we do, update the user account |
| 60 | - $checkOrder = Payment::query()->where('invoice_id', '=', $payload['invoiceId'])->where('payment_status', '=', 'Settled')->where(function ($query) { |
|
| 60 | + $checkOrder = Payment::query()->where('invoice_id', '=', $payload['invoiceId'])->where('payment_status', '=', 'Settled')->where(function($query) { |
|
| 61 | 61 | return $query->where('invoice_status', 'Pending')->orWhereNull('invoice_status'); |
| 62 | 62 | })->first(); |
| 63 | 63 | if ($checkOrder !== null) { |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | $res = User::getByRssToken($request->input('r')); |
| 37 | - if (! $res) { |
|
| 37 | + if (!$res) { |
|
| 38 | 38 | return Utility::showApiError(100); |
| 39 | 39 | } |
| 40 | 40 | |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | return Utility::showApiError(501); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - if (! $request->input('id')) { |
|
| 55 | + if (!$request->input('id')) { |
|
| 56 | 56 | return Utility::showApiError(200, 'Parameter id is required'); |
| 57 | 57 | } |
| 58 | 58 | |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | $nzbPath = (new NZB)->getNZBPath($request->input('id')); |
| 88 | 88 | |
| 89 | - if (! File::exists($nzbPath)) { |
|
| 89 | + if (!File::exists($nzbPath)) { |
|
| 90 | 90 | return Utility::showApiError(300, 'NZB file not found!'); |
| 91 | 91 | } |
| 92 | 92 | |
@@ -113,9 +113,9 @@ discard block |
||
| 113 | 113 | 'X-DNZB-Details' => url('/details/'.$request->input('id')), |
| 114 | 114 | ]; |
| 115 | 115 | |
| 116 | - if (! empty($relData['imdbid']) && $relData['imdbid'] > 0) { |
|
| 116 | + if (!empty($relData['imdbid']) && $relData['imdbid'] > 0) { |
|
| 117 | 117 | $headers['X-DNZB-MoreInfo'] = 'http://www.imdb.com/title/tt'.$relData['imdbid']; |
| 118 | - } elseif (! empty($relData['tvdb']) && $relData['tvdb'] > 0) { |
|
| 118 | + } elseif (!empty($relData['tvdb']) && $relData['tvdb'] > 0) { |
|
| 119 | 119 | $headers['X-DNZB-MoreInfo'] = 'http://www.thetvdb.com/?tab=series&id='.$relData['tvdb']; |
| 120 | 120 | } |
| 121 | 121 | |
@@ -130,15 +130,15 @@ discard block |
||
| 130 | 130 | $cleanName = str_replace([',', ' ', '/', '\\'], '_', $relData['searchname']); |
| 131 | 131 | |
| 132 | 132 | // Stream the file content |
| 133 | - return response()->streamDownload(function () use ($nzbPath) { |
|
| 133 | + return response()->streamDownload(function() use ($nzbPath) { |
|
| 134 | 134 | $bufferSize = 1000000; // 1 MB chunks |
| 135 | 135 | $gz = gzopen($nzbPath, 'rb'); |
| 136 | 136 | |
| 137 | - if (! $gz) { |
|
| 137 | + if (!$gz) { |
|
| 138 | 138 | throw new RuntimeException('Failed to open gzipped file for streaming.'); |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - while (! gzeof($gz)) { |
|
| 141 | + while (!gzeof($gz)) { |
|
| 142 | 142 | echo gzread($gz, $bufferSize); |
| 143 | 143 | flush(); // Ensure chunks are sent immediately |
| 144 | 144 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $releases = new Releases; |
| 118 | 118 | |
| 119 | 119 | // Set Query Parameters based on Request objects |
| 120 | - $outputXML = ! ($request->has('o') && $request->input('o') === 'json'); |
|
| 120 | + $outputXML = !($request->has('o') && $request->input('o') === 'json'); |
|
| 121 | 121 | $minSize = $request->has('minsize') && $request->input('minsize') > 0 ? $request->input('minsize') : 0; |
| 122 | 122 | $offset = $this->offset($request); |
| 123 | 123 | |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | |
| 259 | 259 | $this->addCoverURL( |
| 260 | 260 | $relData, |
| 261 | - function ($release) { |
|
| 261 | + function($release) { |
|
| 262 | 262 | return Utility::getCoverURL(['type' => 'movies', 'id' => $release->imdbid]); |
| 263 | 263 | } |
| 264 | 264 | ); |
@@ -300,9 +300,9 @@ discard block |
||
| 300 | 300 | |
| 301 | 301 | if ($rel && $rel->isNotEmpty()) { |
| 302 | 302 | $data = ReleaseNfo::getReleaseNfo($rel->id); |
| 303 | - if (! empty($data)) { |
|
| 303 | + if (!empty($data)) { |
|
| 304 | 304 | if ($request->has('o') && $request->input('o') === 'file') { |
| 305 | - return response()->streamDownload(function () use ($data) { |
|
| 305 | + return response()->streamDownload(function() use ($data) { |
|
| 306 | 306 | echo $data['nfo']; |
| 307 | 307 | }, $rel['searchname'].'.nfo', ['Content-type:' => 'application/octet-stream']); |
| 308 | 308 | } |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | header('Content-type: text/xml'); |
| 345 | 345 | } else { |
| 346 | 346 | // JSON encode the XMLWriter response |
| 347 | - $response = json_encode(xml_to_array($response), JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT + JSON_UNESCAPED_SLASHES); |
|
| 347 | + $response = json_encode(xml_to_array($response), JSON_THROW_ON_ERROR|JSON_PRETTY_PRINT + JSON_UNESCAPED_SLASHES); |
|
| 348 | 348 | header('Content-type: application/json'); |
| 349 | 349 | } |
| 350 | 350 | if ($response === false) { |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | 'search' => ['available' => 'yes', 'supportedParams' => 'q'], |
| 388 | 388 | 'tv-search' => ['available' => 'yes', 'supportedParams' => 'q,vid,tvdbid,traktid,rid,tvmazeid,imdbid,tmdbid,season,ep'], |
| 389 | 389 | 'movie-search' => ['available' => 'yes', 'supportedParams' => 'q,imdbid, tmdbid, traktid'], |
| 390 | - 'audio-search' => ['available' => 'no', 'supportedParams' => ''], |
|
| 390 | + 'audio-search' => ['available' => 'no', 'supportedParams' => ''], |
|
| 391 | 391 | ], |
| 392 | 392 | 'categories' => $this->type === 'caps' |
| 393 | 393 | ? Category::getForMenu() |
@@ -402,9 +402,9 @@ discard block |
||
| 402 | 402 | { |
| 403 | 403 | $maxAge = -1; |
| 404 | 404 | if ($request->has('maxage')) { |
| 405 | - if (! $request->filled('maxage')) { |
|
| 405 | + if (!$request->filled('maxage')) { |
|
| 406 | 406 | return Utility::showApiError(201, 'Incorrect parameter (maxage must not be empty)'); |
| 407 | - } elseif (! is_numeric($request->input('maxage'))) { |
|
| 407 | + } elseif (!is_numeric($request->input('maxage'))) { |
|
| 408 | 408 | return Utility::showApiError(201, 'Incorrect parameter (maxage must be numeric)'); |
| 409 | 409 | } else { |
| 410 | 410 | $maxAge = (int) $request->input('maxage'); |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | if ($request->has('cat')) { |
| 424 | 424 | $categoryIDs = urldecode($request->input('cat')); |
| 425 | 425 | // Append Web-DL category ID if HD present for SickBeard / Sonarr compatibility. |
| 426 | - if (str_contains($categoryIDs, (string) Category::TV_HD) && ! str_contains($categoryIDs, (string) Category::TV_WEBDL) && (int) Settings::settingValue('catwebdl') === 0) { |
|
| 426 | + if (str_contains($categoryIDs, (string) Category::TV_HD) && !str_contains($categoryIDs, (string) Category::TV_WEBDL) && (int) Settings::settingValue('catwebdl') === 0) { |
|
| 427 | 427 | $categoryIDs .= (','.Category::TV_WEBDL); |
| 428 | 428 | } |
| 429 | 429 | $categoryID = explode(',', $categoryIDs); |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - if (! $yesMode) { |
|
| 57 | - if (! $this->confirm('Are you sure you want to install NNTmux? This will wipe your database!!')) { |
|
| 56 | + if (!$yesMode) { |
|
| 57 | + if (!$this->confirm('Are you sure you want to install NNTmux? This will wipe your database!!')) { |
|
| 58 | 58 | $this->info('Installation aborted by user.'); |
| 59 | 59 | exit; |
| 60 | 60 | } |
@@ -97,33 +97,33 @@ discard block |
||
| 97 | 97 | $zip_path = config('nntmux_settings.tmp_unzip_path'); |
| 98 | 98 | $unrar_path = config('nntmux.tmp_unrar_path'); |
| 99 | 99 | |
| 100 | - if (! File::isWritable($nzb_path)) { |
|
| 100 | + if (!File::isWritable($nzb_path)) { |
|
| 101 | 101 | $this->warn($nzb_path.' is not writable. Please fix folder permissions'); |
| 102 | 102 | |
| 103 | 103 | return false; |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - if (! file_exists($unrar_path)) { |
|
| 106 | + if (!file_exists($unrar_path)) { |
|
| 107 | 107 | $this->info('Creating missing '.$unrar_path.' folder'); |
| 108 | - if (! @File::makeDirectory($unrar_path) && ! File::isDirectory($unrar_path)) { |
|
| 108 | + if (!@File::makeDirectory($unrar_path) && !File::isDirectory($unrar_path)) { |
|
| 109 | 109 | throw new \RuntimeException('Unable to create '.$unrar_path.' folder'); |
| 110 | 110 | } |
| 111 | 111 | $this->info('Folder '.$unrar_path.' successfully created'); |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - if (! is_writable($unrar_path)) { |
|
| 114 | + if (!is_writable($unrar_path)) { |
|
| 115 | 115 | $this->warn($unrar_path.' is not writable. Please fix folder permissions'); |
| 116 | 116 | |
| 117 | 117 | return false; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - if (! File::isWritable($covers_path)) { |
|
| 120 | + if (!File::isWritable($covers_path)) { |
|
| 121 | 121 | $this->warn($covers_path.' is not writable. Please fix folder permissions'); |
| 122 | 122 | |
| 123 | 123 | return false; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - if (! File::isWritable($zip_path)) { |
|
| 126 | + if (!File::isWritable($zip_path)) { |
|
| 127 | 127 | $this->warn($zip_path.' is not writable. Please fix folder permissions'); |
| 128 | 128 | |
| 129 | 129 | return false; |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | GROUP BY r.id |
| 276 | 276 | ORDER BY %s %s %s", |
| 277 | 277 | $this->uSQL($userShows, 'videos_id'), |
| 278 | - (! empty($excludedCats) ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''), |
|
| 278 | + (!empty($excludedCats) ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''), |
|
| 279 | 279 | NZB::NZB_ADDED, |
| 280 | 280 | Category::TV_ROOT, |
| 281 | 281 | Category::TV_OTHER, |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | { |
| 346 | 346 | // Delete NZB from disk. |
| 347 | 347 | $nzbPath = $nzb->NZBPath($identifiers['g']); |
| 348 | - if (! empty($nzbPath)) { |
|
| 348 | + if (!empty($nzbPath)) { |
|
| 349 | 349 | File::delete($nzbPath); |
| 350 | 350 | } |
| 351 | 351 | |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | */ |
| 386 | 386 | public function updateMulti($guids, $category, $grabs, $videoId, $episodeId, $anidbId, $imdbId) |
| 387 | 387 | { |
| 388 | - if (! \is_array($guids) || \count($guids) < 1) { |
|
| 388 | + if (!\is_array($guids) || \count($guids) < 1) { |
|
| 389 | 389 | return false; |
| 390 | 390 | } |
| 391 | 391 | |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | $sql = '(1=2 '; |
| 410 | 410 | foreach ($userQuery as $query) { |
| 411 | 411 | $sql .= sprintf('OR (r.%s = %d', $type, $query->$type); |
| 412 | - if (! empty($query->categories)) { |
|
| 412 | + if (!empty($query->categories)) { |
|
| 413 | 413 | $catsArr = explode('|', $query->categories); |
| 414 | 414 | if (\count($catsArr) > 1) { |
| 415 | 415 | $sql .= sprintf(' AND r.categories_id IN (%s)', implode(',', $catsArr)); |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | $orderBy = $this->getBrowseOrder($orderBy); |
| 454 | 454 | } |
| 455 | 455 | |
| 456 | - $searchFields = Arr::where($searchArr, static function ($value) { |
|
| 456 | + $searchFields = Arr::where($searchArr, static function($value) { |
|
| 457 | 457 | return $value !== -1; |
| 458 | 458 | }); |
| 459 | 459 | |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | $searchResult = $this->elasticSearch->indexSearch($phrases, $limit); |
| 464 | 464 | } else { |
| 465 | 465 | $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', '', [], $searchFields); |
| 466 | - if (! empty($searchResult)) { |
|
| 466 | + if (!empty($searchResult)) { |
|
| 467 | 467 | $searchResult = Arr::wrap(Arr::get($searchResult, 'id')); |
| 468 | 468 | } |
| 469 | 469 | } |
@@ -554,7 +554,7 @@ discard block |
||
| 554 | 554 | $searchResult = $this->elasticSearch->indexSearchApi($searchName, $limit); |
| 555 | 555 | } else { |
| 556 | 556 | $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', $searchName, ['searchname']); |
| 557 | - if (! empty($searchResult)) { |
|
| 557 | + if (!empty($searchResult)) { |
|
| 558 | 558 | $searchResult = Arr::wrap(Arr::get($searchResult, 'id')); |
| 559 | 559 | } |
| 560 | 560 | } |
@@ -570,7 +570,7 @@ discard block |
||
| 570 | 570 | ((int) $groupName !== -1 ? sprintf(' AND r.groups_id = %d ', UsenetGroup::getIDByName($groupName)) : ''), |
| 571 | 571 | $catQuery, |
| 572 | 572 | (\count($excludedCats) > 0 ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''), |
| 573 | - (! empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''), |
|
| 573 | + (!empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''), |
|
| 574 | 574 | ($minSize > 0 ? sprintf('AND r.size >= %d', $minSize) : '') |
| 575 | 575 | ); |
| 576 | 576 | $baseSql = sprintf( |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | if ($releases !== null) { |
| 605 | 605 | return $releases; |
| 606 | 606 | } |
| 607 | - if ($searchName !== -1 && ! empty($searchResult)) { |
|
| 607 | + if ($searchName !== -1 && !empty($searchResult)) { |
|
| 608 | 608 | $releases = self::fromQuery($sql); |
| 609 | 609 | } elseif ($searchName !== -1 && empty($searchResult)) { |
| 610 | 610 | $releases = collect(); |
@@ -659,11 +659,11 @@ discard block |
||
| 659 | 659 | $show = self::fromQuery($showQry); |
| 660 | 660 | |
| 661 | 661 | if ($show->isNotEmpty()) { |
| 662 | - if ((! empty($episode) && ! empty($series)) && $show[0]->episodes !== '') { |
|
| 662 | + if ((!empty($episode) && !empty($series)) && $show[0]->episodes !== '') { |
|
| 663 | 663 | $showSql .= ' AND r.tv_episodes_id IN ('.$show[0]->episodes.') AND tve.series = '.$series; |
| 664 | - } elseif (! empty($episode) && $show[0]->episodes !== '') { |
|
| 664 | + } elseif (!empty($episode) && $show[0]->episodes !== '') { |
|
| 665 | 665 | $showSql = sprintf('AND r.tv_episodes_id IN (%s)', $show[0]->episodes); |
| 666 | - } elseif (! empty($series) && empty($episode)) { |
|
| 666 | + } elseif (!empty($series) && empty($episode)) { |
|
| 667 | 667 | // If $series is set but episode is not, return Season Packs and Episodes |
| 668 | 668 | $showSql .= ' AND r.tv_episodes_id IN ('.$show[0]->episodes.') AND tve.series = '.$series; |
| 669 | 669 | } |
@@ -677,26 +677,26 @@ discard block |
||
| 677 | 677 | } |
| 678 | 678 | |
| 679 | 679 | // If $name is set it is a fallback search, add available SxxExx/airdate info to the query |
| 680 | - if (! empty($name) && $showSql === '') { |
|
| 681 | - if (! empty($series) && (int) $series < 1900) { |
|
| 680 | + if (!empty($name) && $showSql === '') { |
|
| 681 | + if (!empty($series) && (int) $series < 1900) { |
|
| 682 | 682 | $name .= sprintf(' S%s', str_pad($series, 2, '0', STR_PAD_LEFT)); |
| 683 | - if (! empty($episode) && ! str_contains($episode, '/')) { |
|
| 683 | + if (!empty($episode) && !str_contains($episode, '/')) { |
|
| 684 | 684 | $name .= sprintf('E%s', str_pad($episode, 2, '0', STR_PAD_LEFT)); |
| 685 | 685 | } |
| 686 | 686 | // If season is not empty but episode is, add a wildcard to the search |
| 687 | 687 | if (empty($episode)) { |
| 688 | 688 | $name .= '*'; |
| 689 | 689 | } |
| 690 | - } elseif (! empty($airDate)) { |
|
| 690 | + } elseif (!empty($airDate)) { |
|
| 691 | 691 | $name .= sprintf(' %s', str_replace(['/', '-', '.', '_'], ' ', $airDate)); |
| 692 | 692 | } |
| 693 | 693 | } |
| 694 | - if (! empty($name)) { |
|
| 694 | + if (!empty($name)) { |
|
| 695 | 695 | if (config('nntmux.elasticsearch_enabled') === true) { |
| 696 | 696 | $searchResult = $this->elasticSearch->indexSearchTMA($name, $limit); |
| 697 | 697 | } else { |
| 698 | 698 | $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', $name, ['searchname']); |
| 699 | - if (! empty($searchResult)) { |
|
| 699 | + if (!empty($searchResult)) { |
|
| 700 | 700 | $searchResult = Arr::wrap(Arr::get($searchResult, 'id')); |
| 701 | 701 | } |
| 702 | 702 | } |
@@ -712,11 +712,11 @@ discard block |
||
| 712 | 712 | NZB::NZB_ADDED, |
| 713 | 713 | $this->showPasswords(), |
| 714 | 714 | $showSql, |
| 715 | - (! empty($name) && ! empty($searchResult)) ? 'AND r.id IN ('.implode(',', $searchResult).')' : '', |
|
| 715 | + (!empty($name) && !empty($searchResult)) ? 'AND r.id IN ('.implode(',', $searchResult).')' : '', |
|
| 716 | 716 | Category::getCategorySearch($cat, 'tv'), |
| 717 | 717 | $maxAge > 0 ? sprintf('AND r.postdate > NOW() - INTERVAL %d DAY', $maxAge) : '', |
| 718 | 718 | $minSize > 0 ? sprintf('AND r.size >= %d', $minSize) : '', |
| 719 | - ! empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '' |
|
| 719 | + !empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '' |
|
| 720 | 720 | ); |
| 721 | 721 | $baseSql = sprintf( |
| 722 | 722 | "SELECT r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, r.haspreview, r.jpgstatus, |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | if ($releases !== null) { |
| 753 | 753 | return $releases; |
| 754 | 754 | } |
| 755 | - $releases = ((! empty($name) && ! empty($searchResult)) || empty($name)) ? self::fromQuery($sql) : []; |
|
| 755 | + $releases = ((!empty($name) && !empty($searchResult)) || empty($name)) ? self::fromQuery($sql) : []; |
|
| 756 | 756 | if (count($releases) !== 0 && $releases->isNotEmpty()) { |
| 757 | 757 | $releases[0]->_totalrows = $this->getPagerCount( |
| 758 | 758 | preg_replace('#LEFT(\s+OUTER)?\s+JOIN\s+(?!tv_episodes)\s+.*ON.*=.*\n#i', ' ', $baseSql) |
@@ -800,11 +800,11 @@ discard block |
||
| 800 | 800 | |
| 801 | 801 | $show = self::fromQuery($showQry); |
| 802 | 802 | if ($show->isNotEmpty()) { |
| 803 | - if ((! empty($episode) && ! empty($series)) && $show[0]->episodes !== '') { |
|
| 803 | + if ((!empty($episode) && !empty($series)) && $show[0]->episodes !== '') { |
|
| 804 | 804 | $showSql .= ' AND r.tv_episodes_id IN ('.$show[0]->episodes.') AND tve.series = '.$series; |
| 805 | - } elseif (! empty($episode) && $show[0]->episodes !== '') { |
|
| 805 | + } elseif (!empty($episode) && $show[0]->episodes !== '') { |
|
| 806 | 806 | $showSql = sprintf('AND r.tv_episodes_id IN (%s)', $show[0]->episodes); |
| 807 | - } elseif (! empty($series) && empty($episode)) { |
|
| 807 | + } elseif (!empty($series) && empty($episode)) { |
|
| 808 | 808 | // If $series is set but episode is not, return Season Packs and Episodes |
| 809 | 809 | $showSql .= ' AND r.tv_episodes_id IN ('.$show[0]->episodes.') AND tve.series = '.$series; |
| 810 | 810 | } |
@@ -817,26 +817,26 @@ discard block |
||
| 817 | 817 | } |
| 818 | 818 | } |
| 819 | 819 | // If $name is set it is a fallback search, add available SxxExx/airdate info to the query |
| 820 | - if (! empty($name) && $showSql === '') { |
|
| 821 | - if (! empty($series) && (int) $series < 1900) { |
|
| 820 | + if (!empty($name) && $showSql === '') { |
|
| 821 | + if (!empty($series) && (int) $series < 1900) { |
|
| 822 | 822 | $name .= sprintf(' S%s', str_pad($series, 2, '0', STR_PAD_LEFT)); |
| 823 | - if (! empty($episode) && ! str_contains($episode, '/')) { |
|
| 823 | + if (!empty($episode) && !str_contains($episode, '/')) { |
|
| 824 | 824 | $name .= sprintf('E%s', str_pad($episode, 2, '0', STR_PAD_LEFT)); |
| 825 | 825 | } |
| 826 | 826 | // If season is not empty but episode is, add a wildcard to the search |
| 827 | 827 | if (empty($episode)) { |
| 828 | 828 | $name .= '*'; |
| 829 | 829 | } |
| 830 | - } elseif (! empty($airDate)) { |
|
| 830 | + } elseif (!empty($airDate)) { |
|
| 831 | 831 | $name .= sprintf(' %s', str_replace(['/', '-', '.', '_'], ' ', $airDate)); |
| 832 | 832 | } |
| 833 | 833 | } |
| 834 | - if (! empty($name)) { |
|
| 834 | + if (!empty($name)) { |
|
| 835 | 835 | if (config('nntmux.elasticsearch_enabled') === true) { |
| 836 | 836 | $searchResult = $this->elasticSearch->indexSearchTMA($name, $limit); |
| 837 | 837 | } else { |
| 838 | 838 | $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', $name, ['searchname']); |
| 839 | - if (! empty($searchResult)) { |
|
| 839 | + if (!empty($searchResult)) { |
|
| 840 | 840 | $searchResult = Arr::wrap(Arr::get($searchResult, 'id')); |
| 841 | 841 | } |
| 842 | 842 | } |
@@ -852,11 +852,11 @@ discard block |
||
| 852 | 852 | NZB::NZB_ADDED, |
| 853 | 853 | $this->showPasswords(), |
| 854 | 854 | $showSql, |
| 855 | - (! empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''), |
|
| 855 | + (!empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''), |
|
| 856 | 856 | Category::getCategorySearch($cat, 'tv'), |
| 857 | 857 | ($maxAge > 0 ? sprintf('AND r.postdate > NOW() - INTERVAL %d DAY', $maxAge) : ''), |
| 858 | 858 | ($minSize > 0 ? sprintf('AND r.size >= %d', $minSize) : ''), |
| 859 | - ! empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '' |
|
| 859 | + !empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '' |
|
| 860 | 860 | ); |
| 861 | 861 | $baseSql = sprintf( |
| 862 | 862 | "SELECT r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.tv_episodes_id, r.haspreview, r.jpgstatus, |
@@ -906,12 +906,12 @@ discard block |
||
| 906 | 906 | */ |
| 907 | 907 | public function animeSearch($aniDbID, int $offset = 0, int $limit = 100, string $name = '', array $cat = [-1], int $maxAge = -1, array $excludedCategories = []): mixed |
| 908 | 908 | { |
| 909 | - if (! empty($name)) { |
|
| 909 | + if (!empty($name)) { |
|
| 910 | 910 | if (config('nntmux.elasticsearch_enabled') === true) { |
| 911 | 911 | $searchResult = $this->elasticSearch->indexSearchTMA($name, $limit); |
| 912 | 912 | } else { |
| 913 | 913 | $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', $name, ['searchname']); |
| 914 | - if (! empty($searchResult)) { |
|
| 914 | + if (!empty($searchResult)) { |
|
| 915 | 915 | $searchResult = Arr::wrap(Arr::get($searchResult, 'id')); |
| 916 | 916 | } |
| 917 | 917 | } |
@@ -928,8 +928,8 @@ discard block |
||
| 928 | 928 | $this->showPasswords(), |
| 929 | 929 | NZB::NZB_ADDED, |
| 930 | 930 | ($aniDbID > -1 ? sprintf(' AND r.anidbid = %d ', $aniDbID) : ''), |
| 931 | - (! empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''), |
|
| 932 | - ! empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '', |
|
| 931 | + (!empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''), |
|
| 932 | + !empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '', |
|
| 933 | 933 | Category::getCategorySearch($cat), |
| 934 | 934 | ($maxAge > 0 ? sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxAge) : '') |
| 935 | 935 | ); |
@@ -976,12 +976,12 @@ discard block |
||
| 976 | 976 | */ |
| 977 | 977 | public function moviesSearch(int $imDbId = -1, int $tmDbId = -1, int $traktId = -1, int $offset = 0, int $limit = 100, string $name = '', array $cat = [-1], int $maxAge = -1, int $minSize = 0, array $excludedCategories = []): mixed |
| 978 | 978 | { |
| 979 | - if (! empty($name)) { |
|
| 979 | + if (!empty($name)) { |
|
| 980 | 980 | if (config('nntmux.elasticsearch_enabled') === true) { |
| 981 | 981 | $searchResult = $this->elasticSearch->indexSearchTMA($name, $limit); |
| 982 | 982 | } else { |
| 983 | 983 | $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', $name, ['searchname']); |
| 984 | - if (! empty($searchResult)) { |
|
| 984 | + if (!empty($searchResult)) { |
|
| 985 | 985 | $searchResult = Arr::wrap(Arr::get($searchResult, 'id')); |
| 986 | 986 | } |
| 987 | 987 | } |
@@ -998,11 +998,11 @@ discard block |
||
| 998 | 998 | %s %s %s %s %s %s %s', |
| 999 | 999 | NZB::NZB_ADDED, |
| 1000 | 1000 | $this->showPasswords(), |
| 1001 | - (! empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''), |
|
| 1001 | + (!empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''), |
|
| 1002 | 1002 | ($imDbId !== -1 && is_numeric($imDbId)) ? sprintf(' AND m.imdbid = \'%s\' ', $imDbId) : '', |
| 1003 | 1003 | ($tmDbId !== -1 && is_numeric($tmDbId)) ? sprintf(' AND m.tmdbid = %d ', $tmDbId) : '', |
| 1004 | 1004 | ($traktId !== -1 && is_numeric($traktId)) ? sprintf(' AND m.traktid = %d ', $traktId) : '', |
| 1005 | - ! empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '', |
|
| 1005 | + !empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '', |
|
| 1006 | 1006 | Category::getCategorySearch($cat, 'movies'), |
| 1007 | 1007 | $maxAge > 0 ? sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxAge) : '', |
| 1008 | 1008 | $minSize > 0 ? sprintf('AND r.size >= %d', $minSize) : '' |
@@ -1058,7 +1058,7 @@ discard block |
||
| 1058 | 1058 | } |
| 1059 | 1059 | |
| 1060 | 1060 | $results = $this->search(['searchname' => getSimilarName($name)], -1, '', '', -1, -1, 0, config('nntmux.items_per_page'), '', -1, $excludedCats, 'basic', [$parentCat]); |
| 1061 | - if (! $results) { |
|
| 1061 | + if (!$results) { |
|
| 1062 | 1062 | return $ret; |
| 1063 | 1063 | } |
| 1064 | 1064 | |