@@ -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; |