@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | use Illuminate\Support\Facades\DB; |
16 | 16 | |
17 | 17 | $colorCli = new ColorCLI; |
18 | -if (! isset($argv[1])) { |
|
18 | +if (!isset($argv[1])) { |
|
19 | 19 | $colorCli->error('This script is not intended to be run manually, it is called from Multiprocessing.'); |
20 | 20 | exit(); |
21 | 21 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | if (preg_match('/[a-fA-F0-9]{32,40}/i', $release->name, $hits)) { |
88 | 88 | $nameFixer->matchPredbHash($hits[0], $release, true, 1, true); |
89 | 89 | } |
90 | - if ($nameFixer->matched === false && ! empty($release->filehash) && preg_match('/[a-fA-F0-9]{32,40}/i', $release->filehash, $hits)) { |
|
90 | + if ($nameFixer->matched === false && !empty($release->filehash) && preg_match('/[a-fA-F0-9]{32,40}/i', $release->filehash, $hits)) { |
|
91 | 91 | $colorCli->primaryOver('h'); |
92 | 92 | $nameFixer->matchPredbHash($hits[0], $release, true, 1, true); |
93 | 93 | } |
@@ -98,12 +98,12 @@ discard block |
||
98 | 98 | } |
99 | 99 | $nameFixer->reset(); |
100 | 100 | |
101 | - if ((int) $release->proc_uid === NameFixer::PROC_UID_NONE && (! empty($release->uid) || ! empty($release->mediainfo))) { |
|
101 | + if ((int) $release->proc_uid === NameFixer::PROC_UID_NONE && (!empty($release->uid) || !empty($release->mediainfo))) { |
|
102 | 102 | $colorCli->primaryOver('U'); |
103 | - if (! empty($release->uid)) { |
|
103 | + if (!empty($release->uid)) { |
|
104 | 104 | $nameFixer->checkName($release, true, 'UID, ', 1, true); |
105 | 105 | } |
106 | - if (empty($nameFixer->matched) && ! empty($release->mediainfo)) { |
|
106 | + if (empty($nameFixer->matched) && !empty($release->mediainfo)) { |
|
107 | 107 | $nameFixer->checkName($release, true, 'Mediainfo, ', 1, true); |
108 | 108 | } |
109 | 109 | } |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | } |
116 | 116 | $nameFixer->reset(); |
117 | 117 | |
118 | - if ((int) $release->proc_crc32 === NameFixer::PROC_CRC_NONE && ! empty($release->crc)) { |
|
118 | + if ((int) $release->proc_crc32 === NameFixer::PROC_CRC_NONE && !empty($release->crc)) { |
|
119 | 119 | $colorCli->primaryOver('C'); |
120 | 120 | $nameFixer->checkName($release, true, 'CRC32, ', 1, true); |
121 | 121 | } |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | } |
140 | 140 | $nameFixer->reset(); |
141 | 141 | |
142 | - if ((int) $release->proc_hash16k === NameFixer::PROC_HASH16K_NONE && ! empty($release->hash)) { |
|
142 | + if ((int) $release->proc_hash16k === NameFixer::PROC_HASH16K_NONE && !empty($release->hash)) { |
|
143 | 143 | $colorCli->primaryOver('H'); |
144 | 144 | $nameFixer->checkName($release, true, 'PAR2 hash, ', 1, true); |
145 | 145 | } |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | } |
152 | 152 | $nameFixer->reset(); |
153 | 153 | |
154 | - if ((int) $release->nfostatus === Nfo::NFO_FOUND && (int) $release->proc_nfo === NameFixer::PROC_NFO_NONE && ! empty($release->textstring) && ! preg_match('/^=newz\[NZB\]=\w+/', $release->textstring)) { |
|
154 | + if ((int) $release->nfostatus === Nfo::NFO_FOUND && (int) $release->proc_nfo === NameFixer::PROC_NFO_NONE && !empty($release->textstring) && !preg_match('/^=newz\[NZB\]=\w+/', $release->textstring)) { |
|
155 | 155 | $colorCli->primaryOver('n'); |
156 | 156 | $nameFixer->done = $nameFixer->matched = false; |
157 | 157 | $nameFixer->checkName($release, true, 'NFO, ', 1, true); |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | |
190 | 190 | if ((int) $release->proc_par2 === NameFixer::PROC_PAR2_NONE) { |
191 | 191 | $colorCli->primaryOver('p'); |
192 | - if (! isset($nzbcontents)) { |
|
192 | + if (!isset($nzbcontents)) { |
|
193 | 193 | $nntp = new NNTP; |
194 | 194 | $compressedHeaders = config('nntmux_nntp.compressed_headers'); |
195 | 195 | if ((config('nntmux_nntp.use_alternate_nntp_server') === true ? $nntp->doConnect($compressedHeaders, true) : $nntp->doConnect()) !== true) { |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | $nzbSplitLevel = (int) Settings::settingValue('nzbsplitlevel'); |
67 | 67 | $this->nzbSplitLevel = $nzbSplitLevel ?? 1; |
68 | 68 | $this->siteNzbPath = config('nntmux_settings.path_to_nzbs'); |
69 | - if (! Str::endsWith($this->siteNzbPath, '/')) { |
|
69 | + if (!Str::endsWith($this->siteNzbPath, '/')) { |
|
70 | 70 | $this->siteNzbPath .= '/'; |
71 | 71 | } |
72 | 72 | $this->_nzbCommentString = sprintf( |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $XMLWriter->startElement('head'); |
111 | 111 | $XMLWriter->startElement('meta'); |
112 | 112 | $XMLWriter->writeAttribute('type', 'category'); |
113 | - $XMLWriter->text(! empty($release->category->parent) ? $release->category->parent->title.' >'.$release->category->title : 'Other > Misc'); |
|
113 | + $XMLWriter->text(!empty($release->category->parent) ? $release->category->parent->title.' >'.$release->category->title : 'Other > Misc'); |
|
114 | 114 | $XMLWriter->endElement(); |
115 | 115 | $XMLWriter->startElement('meta'); |
116 | 116 | $XMLWriter->writeAttribute('type', 'name'); |
@@ -172,20 +172,20 @@ discard block |
||
172 | 172 | $XMLWriter->endDocument(); |
173 | 173 | $path = ($this->buildNZBPath($release->guid, $this->nzbSplitLevel, true).$release->guid.'.nzb.gz'); |
174 | 174 | $fp = gzopen($path, 'wb7'); |
175 | - if (! $fp) { |
|
175 | + if (!$fp) { |
|
176 | 176 | return false; |
177 | 177 | } |
178 | 178 | gzwrite($fp, $XMLWriter->outputMemory()); |
179 | 179 | gzclose($fp); |
180 | 180 | unset($XMLWriter); |
181 | - if (! File::isFile($path)) { |
|
181 | + if (!File::isFile($path)) { |
|
182 | 182 | echo "ERROR: $path does not exist.\n"; |
183 | 183 | |
184 | 184 | return false; |
185 | 185 | } |
186 | 186 | // Mark release as having NZB. |
187 | 187 | $release->update(['nzbstatus' => self::NZB_ADDED]); |
188 | - if (! empty($nzb_guid)) { |
|
188 | + if (!empty($nzb_guid)) { |
|
189 | 189 | $release->update(['nzb_guid' => DB::raw('UNHEX( '.escapeString(md5($nzb_guid)).' )')]); |
190 | 190 | } |
191 | 191 | |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | |
217 | 217 | $nzbPath = $this->siteNzbPath.$nzbPath; |
218 | 218 | |
219 | - if ($createIfNotExist && ! File::isDirectory($nzbPath) && ! File::makeDirectory($nzbPath, 0777, true) && ! File::isDirectory($nzbPath)) { |
|
219 | + if ($createIfNotExist && !File::isDirectory($nzbPath) && !File::makeDirectory($nzbPath, 0777, true) && !File::isDirectory($nzbPath)) { |
|
220 | 220 | throw new \RuntimeException(sprintf('Directory "%s" was not created', $nzbPath)); |
221 | 221 | } |
222 | 222 | |
@@ -272,12 +272,12 @@ discard block |
||
272 | 272 | $i = 0; |
273 | 273 | $result = []; |
274 | 274 | |
275 | - if (! $nzb) { |
|
275 | + if (!$nzb) { |
|
276 | 276 | return $result; |
277 | 277 | } |
278 | 278 | |
279 | 279 | $xml = @simplexml_load_string(str_replace("\x0F", '', $nzb)); |
280 | - if (! $xml || strtolower($xml->getName()) !== 'nzb') { |
|
280 | + if (!$xml || strtolower($xml->getName()) !== 'nzb') { |
|
281 | 281 | return $result; |
282 | 282 | } |
283 | 283 | |
@@ -291,9 +291,9 @@ discard block |
||
291 | 291 | // Strip file / part count to get proper sorting. |
292 | 292 | $i = preg_replace('#\d+[- ._]?(/|\||[o0]f)[- ._]?\d+?(?![- ._]\d)#i', '', $i); |
293 | 293 | // Change .rar and .par2 to be sorted before .part0x.rar and .volxxx+xxx.par2 |
294 | - if (str_contains($i, '.par2') && ! preg_match('#\.vol\d+\+\d+\.par2#i', $i)) { |
|
294 | + if (str_contains($i, '.par2') && !preg_match('#\.vol\d+\+\d+\.par2#i', $i)) { |
|
295 | 295 | $i = str_replace('.par2', '.vol0.par2', $i); |
296 | - } elseif (preg_match('#\.rar[^a-z0-9]#i', $i) && ! preg_match('#\.part\d+\.rar$#i', $i)) { |
|
296 | + } elseif (preg_match('#\.rar[^a-z0-9]#i', $i) && !preg_match('#\.part\d+\.rar$#i', $i)) { |
|
297 | 297 | $i = preg_replace('#\.rar(?:[^a-z0-9])#i', '.part0.rar', $i); |
298 | 298 | } |
299 | 299 | } |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | $fileSize = $numSegments = 0; |
327 | 327 | |
328 | 328 | // Parts. |
329 | - if (! isset($result[$i]['segments'])) { |
|
329 | + if (!isset($result[$i]['segments'])) { |
|
330 | 330 | $result[$i]['segments'] = []; |
331 | 331 | } |
332 | 332 | |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | $result[$i]['partsactual'] = $numSegments; |
346 | 346 | |
347 | 347 | // Groups. |
348 | - if (! isset($result[$i]['groups'])) { |
|
348 | + if (!isset($result[$i]['groups'])) { |
|
349 | 349 | $result[$i]['groups'] = []; |
350 | 350 | } |
351 | 351 | foreach ($file->groups->group as $g) { |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | $this->echoCLI = config('nntmux.echocli'); |
110 | 110 | $groupID = ''; |
111 | 111 | |
112 | - if (! empty($groupName)) { |
|
112 | + if (!empty($groupName)) { |
|
113 | 113 | $groupInfo = UsenetGroup::getByName($groupName); |
114 | 114 | if ($groupInfo !== null) { |
115 | 115 | $groupID = $groupInfo['id']; |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $this->colorCLI->header('Starting release update process ('.now()->format('Y-m-d H:i:s').')'); |
121 | 121 | } |
122 | 122 | |
123 | - if (! file_exists(config('nntmux_settings.path_to_nzbs'))) { |
|
123 | + if (!file_exists(config('nntmux_settings.path_to_nzbs'))) { |
|
124 | 124 | if ($this->echoCLI) { |
125 | 125 | $this->colorCLI->error('Bad or missing nzb directory - '.config('nntmux_settings.path_to_nzbs')); |
126 | 126 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | $cat = new Categorize; |
182 | 182 | $categorized = $total = 0; |
183 | 183 | $releasesQuery = Release::query()->where(['categories_id' => Category::OTHER_MISC, 'iscategorized' => 0]); |
184 | - if (! empty($groupId)) { |
|
184 | + if (!empty($groupId)) { |
|
185 | 185 | $releasesQuery->where('groups_id', $groupId); |
186 | 186 | } |
187 | 187 | $releases = $releasesQuery->select(['id', 'fromname', 'groups_id', $type])->get(); |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | $this->colorCLI->header('Process Releases -> Attempting to find complete collections.'); |
218 | 218 | } |
219 | 219 | |
220 | - $where = (! empty($groupID) ? ' AND c.groups_id = '.$groupID.' ' : ' '); |
|
220 | + $where = (!empty($groupID) ? ' AND c.groups_id = '.$groupID.' ' : ' '); |
|
221 | 221 | |
222 | 222 | $this->processStuckCollections($groupID); |
223 | 223 | $this->collectionFileCheckStage1($groupID); |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | if ($this->echoCLI) { |
231 | 231 | $countQuery = Collection::query()->where('filecheck', self::COLLFC_COMPPART); |
232 | 232 | |
233 | - if (! empty($groupID)) { |
|
233 | + if (!empty($groupID)) { |
|
234 | 234 | $countQuery->where('groups_id', $groupID); |
235 | 235 | } |
236 | 236 | $count = $countQuery->count('id'); |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | $this->colorCLI->header('Process Releases -> Calculating collection sizes (in bytes).'); |
258 | 258 | } |
259 | 259 | // Get the total size in bytes of the collection for collections where filecheck = 2. |
260 | - DB::transaction(function () use ($groupID, $startTime) { |
|
260 | + DB::transaction(function() use ($groupID, $startTime) { |
|
261 | 261 | $checked = DB::update( |
262 | 262 | sprintf( |
263 | 263 | ' |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | AND c.filesize = 0 %s', |
274 | 274 | self::COLLFC_SIZED, |
275 | 275 | self::COLLFC_COMPPART, |
276 | - (! empty($groupID) ? ' AND c.groups_id = '.$groupID : ' ') |
|
276 | + (!empty($groupID) ? ' AND c.groups_id = '.$groupID : ' ') |
|
277 | 277 | ) |
278 | 278 | ); |
279 | 279 | if ($checked > 0 && $this->echoCLI) { |
@@ -312,16 +312,16 @@ discard block |
||
312 | 312 | |
313 | 313 | $groupMinimums = UsenetGroup::getGroupByID($grpID['id']); |
314 | 314 | if ($groupMinimums !== null) { |
315 | - if (! empty($groupMinimums['minsizetoformrelease']) && $groupMinimums['minsizetoformrelease'] > 0) { |
|
315 | + if (!empty($groupMinimums['minsizetoformrelease']) && $groupMinimums['minsizetoformrelease'] > 0) { |
|
316 | 316 | $groupMinSizeSetting = (int) $groupMinimums['minsizetoformrelease']; |
317 | 317 | } |
318 | - if (! empty($groupMinimums['minfilestoformrelease']) && $groupMinimums['minfilestoformrelease'] > 0) { |
|
318 | + if (!empty($groupMinimums['minfilestoformrelease']) && $groupMinimums['minfilestoformrelease'] > 0) { |
|
319 | 319 | $groupMinFilesSetting = (int) $groupMinimums['minfilestoformrelease']; |
320 | 320 | } |
321 | 321 | } |
322 | 322 | |
323 | 323 | if (Collection::query()->where('filecheck', self::COLLFC_SIZED)->where('filesize', '>', 0)->first() !== null) { |
324 | - DB::transaction(function () use ( |
|
324 | + DB::transaction(function() use ( |
|
325 | 325 | $groupMinSizeSetting, |
326 | 326 | $minSizeSetting, |
327 | 327 | $minSizeDeleted, |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | $collectionsQuery = Collection::query() |
394 | 394 | ->where('collections.filecheck', self::COLLFC_SIZED) |
395 | 395 | ->where('collections.filesize', '>', 0); |
396 | - if (! empty($groupID)) { |
|
396 | + if (!empty($groupID)) { |
|
397 | 397 | $collectionsQuery->where('collections.groups_id', $groupID); |
398 | 398 | } |
399 | 399 | $collectionsQuery->select(['collections.*', 'usenet_groups.name as gname']) |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | $releaseID = Release::insertRelease( |
449 | 449 | [ |
450 | 450 | 'name' => $cleanRelName, |
451 | - 'searchname' => ! empty($cleanedName) ? mb_convert_encoding($cleanedName, 'UTF-8', mb_list_encodings()) : $cleanRelName, |
|
451 | + 'searchname' => !empty($cleanedName) ? mb_convert_encoding($cleanedName, 'UTF-8', mb_list_encodings()) : $cleanRelName, |
|
452 | 452 | 'totalpart' => $collection->totalfiles, |
453 | 453 | 'groups_id' => $collection->groups_id, |
454 | 454 | 'guid' => createGUID(), |
@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | |
465 | 465 | if ($releaseID !== null) { |
466 | 466 | // Update collections table to say we inserted the release. |
467 | - DB::transaction(static function () use ($collection, $releaseID) { |
|
467 | + DB::transaction(static function() use ($collection, $releaseID) { |
|
468 | 468 | Collection::query()->where('id', $collection->id)->update(['filecheck' => self::COLLFC_INSERTED, 'releases_id' => $releaseID]); |
469 | 469 | }, 10); |
470 | 470 | |
@@ -525,7 +525,7 @@ discard block |
||
525 | 525 | } |
526 | 526 | } else { |
527 | 527 | // The release was already in the DB, so delete the collection. |
528 | - DB::transaction(static function () use ($collection) { |
|
528 | + DB::transaction(static function() use ($collection) { |
|
529 | 529 | Collection::query()->where('collectionhash', $collection->collectionhash)->delete(); |
530 | 530 | }, 10); |
531 | 531 | |
@@ -566,7 +566,7 @@ discard block |
||
566 | 566 | } |
567 | 567 | |
568 | 568 | $releasesQuery = Release::query()->with('category.parent')->where('nzbstatus', '=', 0); |
569 | - if (! empty($groupID)) { |
|
569 | + if (!empty($groupID)) { |
|
570 | 570 | $releasesQuery->where('releases.groups_id', $groupID); |
571 | 571 | } |
572 | 572 | $releases = $releasesQuery->select(['id', 'guid', 'name', 'categories_id'])->get(); |
@@ -669,7 +669,7 @@ discard block |
||
669 | 669 | ), true); |
670 | 670 | } |
671 | 671 | |
672 | - DB::transaction(function () use ($deletedCount, $startTime) { |
|
672 | + DB::transaction(function() use ($deletedCount, $startTime) { |
|
673 | 673 | $deleted = 0; |
674 | 674 | $deleteQuery = Collection::query() |
675 | 675 | ->where('dateadded', '<', now()->subHours(Settings::settingValue('partretentionhours'))) |
@@ -832,7 +832,7 @@ discard block |
||
832 | 832 | $releases = Release::query() |
833 | 833 | ->select(['id', 'guid']) |
834 | 834 | ->where('passwordstatus', '=', Releases::PASSWD_RAR) |
835 | - ->orWhereIn('id', function ($query) { |
|
835 | + ->orWhereIn('id', function($query) { |
|
836 | 836 | $query->select('releases_id') |
837 | 837 | ->from('release_files') |
838 | 838 | ->where('passworded', '=', Releases::PASSWD_RAR); |
@@ -891,7 +891,7 @@ discard block |
||
891 | 891 | foreach ($genrelist as $genre) { |
892 | 892 | $musicInfoQuery = MusicInfo::query()->where('genre_id', (int) $genre['id'])->select(['id']); |
893 | 893 | $releases = Release::query() |
894 | - ->joinSub($musicInfoQuery, 'mi', function ($join) { |
|
894 | + ->joinSub($musicInfoQuery, 'mi', function($join) { |
|
895 | 895 | $join->on('releases.musicinfo_id', '=', 'mi.id'); |
896 | 896 | }) |
897 | 897 | ->select(['releases.id', 'releases.guid']) |
@@ -977,18 +977,18 @@ discard block |
||
977 | 977 | */ |
978 | 978 | private function collectionFileCheckStage1(int $groupID): void |
979 | 979 | { |
980 | - DB::transaction(static function () use ($groupID) { |
|
980 | + DB::transaction(static function() use ($groupID) { |
|
981 | 981 | $collectionsCheck = Collection::query()->select(['collections.id']) |
982 | 982 | ->join('binaries', 'binaries.collections_id', '=', 'collections.id') |
983 | 983 | ->where('collections.totalfiles', '>', 0) |
984 | 984 | ->where('collections.filecheck', '=', self::COLLFC_DEFAULT); |
985 | - if (! empty($groupID)) { |
|
985 | + if (!empty($groupID)) { |
|
986 | 986 | $collectionsCheck->where('collections.groups_id', $groupID); |
987 | 987 | } |
988 | 988 | $collectionsCheck->groupBy('binaries.collections_id', 'collections.totalfiles', 'collections.id') |
989 | 989 | ->havingRaw('COUNT(binaries.id) IN (collections.totalfiles, collections.totalfiles+1)'); |
990 | 990 | |
991 | - Collection::query()->joinSub($collectionsCheck, 'r', function ($join) { |
|
991 | + Collection::query()->joinSub($collectionsCheck, 'r', function($join) { |
|
992 | 992 | $join->on('collections.id', '=', 'r.id'); |
993 | 993 | })->update(['collections.filecheck' => self::COLLFC_COMPCOLL]); |
994 | 994 | }, 10); |
@@ -1009,25 +1009,25 @@ discard block |
||
1009 | 1009 | */ |
1010 | 1010 | private function collectionFileCheckStage2(int $groupID): void |
1011 | 1011 | { |
1012 | - DB::transaction(static function () use ($groupID) { |
|
1012 | + DB::transaction(static function() use ($groupID) { |
|
1013 | 1013 | $collectionsCheck = Collection::query()->select(['collections.id']) |
1014 | 1014 | ->join('binaries', 'binaries.collections_id', '=', 'collections.id') |
1015 | 1015 | ->where('binaries.filenumber', '=', 0) |
1016 | 1016 | ->where('collections.totalfiles', '>', 0) |
1017 | 1017 | ->where('collections.filecheck', '=', self::COLLFC_COMPCOLL); |
1018 | - if (! empty($groupID)) { |
|
1018 | + if (!empty($groupID)) { |
|
1019 | 1019 | $collectionsCheck->where('collections.groups_id', $groupID); |
1020 | 1020 | } |
1021 | 1021 | $collectionsCheck->groupBy('collections.id'); |
1022 | 1022 | |
1023 | - Collection::query()->joinSub($collectionsCheck, 'r', function ($join) { |
|
1023 | + Collection::query()->joinSub($collectionsCheck, 'r', function($join) { |
|
1024 | 1024 | $join->on('collections.id', '=', 'r.id'); |
1025 | 1025 | })->update(['collections.filecheck' => self::COLLFC_ZEROPART]); |
1026 | 1026 | }, 10); |
1027 | 1027 | |
1028 | - DB::transaction(static function () use ($groupID) { |
|
1028 | + DB::transaction(static function() use ($groupID) { |
|
1029 | 1029 | $collectionQuery = Collection::query()->where('filecheck', '=', self::COLLFC_COMPCOLL); |
1030 | - if (! empty($groupID)) { |
|
1030 | + if (!empty($groupID)) { |
|
1031 | 1031 | $collectionQuery->where('groups_id', $groupID); |
1032 | 1032 | } |
1033 | 1033 | $collectionQuery->update(['filecheck' => self::COLLFC_TEMPCOMP]); |
@@ -1045,7 +1045,7 @@ discard block |
||
1045 | 1045 | */ |
1046 | 1046 | private function collectionFileCheckStage3(string $where): void |
1047 | 1047 | { |
1048 | - DB::transaction(static function () use ($where) { |
|
1048 | + DB::transaction(static function() use ($where) { |
|
1049 | 1049 | DB::update( |
1050 | 1050 | sprintf( |
1051 | 1051 | ' |
@@ -1069,7 +1069,7 @@ discard block |
||
1069 | 1069 | ); |
1070 | 1070 | }, 10); |
1071 | 1071 | |
1072 | - DB::transaction(static function () use ($where) { |
|
1072 | + DB::transaction(static function() use ($where) { |
|
1073 | 1073 | DB::update( |
1074 | 1074 | sprintf( |
1075 | 1075 | ' |
@@ -1106,7 +1106,7 @@ discard block |
||
1106 | 1106 | */ |
1107 | 1107 | private function collectionFileCheckStage4(string &$where): void |
1108 | 1108 | { |
1109 | - DB::transaction(static function () use ($where) { |
|
1109 | + DB::transaction(static function() use ($where) { |
|
1110 | 1110 | DB::update( |
1111 | 1111 | sprintf( |
1112 | 1112 | ' |
@@ -1136,9 +1136,9 @@ discard block |
||
1136 | 1136 | */ |
1137 | 1137 | private function collectionFileCheckStage5(int $groupId): void |
1138 | 1138 | { |
1139 | - DB::transaction(static function () use ($groupId) { |
|
1139 | + DB::transaction(static function() use ($groupId) { |
|
1140 | 1140 | $collectionQuery = Collection::query()->whereIn('filecheck', [self::COLLFC_TEMPCOMP, self::COLLFC_ZEROPART]); |
1141 | - if (! empty($groupId)) { |
|
1141 | + if (!empty($groupId)) { |
|
1142 | 1142 | $collectionQuery->where('groups_id', $groupId); |
1143 | 1143 | } |
1144 | 1144 | $collectionQuery->update(['filecheck' => self::COLLFC_COMPCOLL]); |
@@ -1156,7 +1156,7 @@ discard block |
||
1156 | 1156 | */ |
1157 | 1157 | private function collectionFileCheckStage6(string &$where): void |
1158 | 1158 | { |
1159 | - DB::transaction(function () use ($where) { |
|
1159 | + DB::transaction(function() use ($where) { |
|
1160 | 1160 | DB::update( |
1161 | 1161 | sprintf( |
1162 | 1162 | " |
@@ -1186,10 +1186,10 @@ discard block |
||
1186 | 1186 | { |
1187 | 1187 | $lastRun = Settings::settingValue('last_run_time'); |
1188 | 1188 | |
1189 | - DB::transaction(function () use ($groupID, $lastRun) { |
|
1189 | + DB::transaction(function() use ($groupID, $lastRun) { |
|
1190 | 1190 | $objQuery = Collection::query() |
1191 | 1191 | ->where('added', '<', Carbon::createFromFormat('Y-m-d H:i:s', $lastRun)->subHours($this->collectionTimeout)); |
1192 | - if (! empty($groupID)) { |
|
1192 | + if (!empty($groupID)) { |
|
1193 | 1193 | $objQuery->where('groups_id', $groupID); |
1194 | 1194 | } |
1195 | 1195 | $obj = $objQuery->delete(); |
@@ -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; |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | ]; |
152 | 152 | $primaryConnections = $this->_tmux->getUSPConnections('primary', $primaryUSP); |
153 | 153 | $alternateConnections = $this->_tmux->getUSPConnections('alternate', $alternateUSP); |
154 | - if ($this->_isConnected() && (($alternate && $this->_currentServer === config('nntmux_nntp.alternate_server') && ($this->_primaryNntpConnections < $alternateConnections['alternate']['active'])) || (! $alternate && $this->_currentServer === config('nntmux_nntp.server') && ($this->_primaryNntpConnections < $primaryConnections['primary']['active'])))) { |
|
154 | + if ($this->_isConnected() && (($alternate && $this->_currentServer === config('nntmux_nntp.alternate_server') && ($this->_primaryNntpConnections < $alternateConnections['alternate']['active'])) || (!$alternate && $this->_currentServer === config('nntmux_nntp.server') && ($this->_primaryNntpConnections < $primaryConnections['primary']['active'])))) { |
|
155 | 155 | return true; |
156 | 156 | } |
157 | 157 | |
@@ -160,20 +160,20 @@ discard block |
||
160 | 160 | $ret = $connected = $cError = $aError = false; |
161 | 161 | |
162 | 162 | // Set variables to connect based on if we are using the alternate provider or not. |
163 | - if (! $alternate) { |
|
163 | + if (!$alternate) { |
|
164 | 164 | $sslEnabled = (bool) config('nntmux_nntp.ssl'); |
165 | 165 | $this->_currentServer = config('nntmux_nntp.server'); |
166 | 166 | $this->_currentPort = config('nntmux_nntp.port'); |
167 | 167 | $userName = config('nntmux_nntp.username'); |
168 | 168 | $password = config('nntmux_nntp.password'); |
169 | - $socketTimeout = ! empty(config('nntmux_nntp.socket_timeout')) ? config('nntmux_nntp.socket_timeout') : $this->_socketTimeout; |
|
169 | + $socketTimeout = !empty(config('nntmux_nntp.socket_timeout')) ? config('nntmux_nntp.socket_timeout') : $this->_socketTimeout; |
|
170 | 170 | } else { |
171 | 171 | $sslEnabled = (bool) config('nntmux_nntp.alternate_server_ssl'); |
172 | 172 | $this->_currentServer = config('nntmux_nntp.alternate_server'); |
173 | 173 | $this->_currentPort = config('nntmux_nntp.alternate_server_port'); |
174 | 174 | $userName = config('nntmux_nntp.alternate_server_username'); |
175 | 175 | $password = config('nntmux_nntp.alternate_server_password'); |
176 | - $socketTimeout = ! empty(config('nntmux_nntp.alternate_server_socket_timeout')) ? config('nntmux_nntp.alternate_server_socket_timeout') : $this->_socketTimeout; |
|
176 | + $socketTimeout = !empty(config('nntmux_nntp.alternate_server_socket_timeout')) ? config('nntmux_nntp.alternate_server_socket_timeout') : $this->_socketTimeout; |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | $enc = ($sslEnabled ? ' (ssl)' : ' (non-ssl)'); |
@@ -186,19 +186,19 @@ discard block |
||
186 | 186 | $authenticated = false; |
187 | 187 | |
188 | 188 | // If we are not connected, try to connect. |
189 | - if (! $connected) { |
|
189 | + if (!$connected) { |
|
190 | 190 | $ret = $this->connect($this->_currentServer, $sslEnabled, $this->_currentPort, 5, $socketTimeout); |
191 | 191 | } |
192 | 192 | // Check if we got an error while connecting. |
193 | 193 | $cErr = self::isError($ret); |
194 | 194 | |
195 | 195 | // If no error, we are connected. |
196 | - if (! $cErr) { |
|
196 | + if (!$cErr) { |
|
197 | 197 | // Say that we are connected so we don't retry. |
198 | 198 | $connected = true; |
199 | 199 | // When there is no error it returns bool if we are allowed to post or not. |
200 | 200 | $this->_postingAllowed = $ret; |
201 | - } elseif (! $cError) { |
|
201 | + } elseif (!$cError) { |
|
202 | 202 | $cError = $ret->getMessage(); |
203 | 203 | } |
204 | 204 | |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | } |
209 | 209 | |
210 | 210 | // If we have no more retries and could not connect, return an error. |
211 | - if ($retries === 0 && ! $connected) { |
|
211 | + if ($retries === 0 && !$connected) { |
|
212 | 212 | $message = |
213 | 213 | 'Cannot connect to server '. |
214 | 214 | $this->_currentServer. |
@@ -233,9 +233,9 @@ discard block |
||
233 | 233 | $aErr = self::isError($ret2); |
234 | 234 | |
235 | 235 | // If there was no error, then we are authenticated. |
236 | - if (! $aErr) { |
|
236 | + if (!$aErr) { |
|
237 | 237 | $authenticated = true; |
238 | - } elseif (! $aError) { |
|
238 | + } elseif (!$aError) { |
|
239 | 239 | $aError = $ret2->getMessage(); |
240 | 240 | } |
241 | 241 | |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | } |
246 | 246 | |
247 | 247 | // If we ran out of retries, return an error. |
248 | - if ($retries === 0 && ! $authenticated) { |
|
248 | + if ($retries === 0 && !$authenticated) { |
|
249 | 249 | $message = |
250 | 250 | 'Cannot authenticate to server '. |
251 | 251 | $this->_currentServer. |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | // If we are connected and authenticated, try enabling compression if we have it enabled. |
262 | 262 | if ($connected && $authenticated) { |
263 | 263 | // Check if we should use compression on the connection. |
264 | - if (! $compression || config('nntmux_nntp.compressed_headers') === false) { |
|
264 | + if (!$compression || config('nntmux_nntp.compressed_headers') === false) { |
|
265 | 265 | $this->_compressionSupported = false; |
266 | 266 | } |
267 | 267 | |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | $message = $this->_getMessage($groupName, $wanted); |
545 | 545 | |
546 | 546 | // Append the body to $body. |
547 | - if (! self::isError($message)) { |
|
547 | + if (!self::isError($message)) { |
|
548 | 548 | $body .= $message; |
549 | 549 | |
550 | 550 | if ($messageSize === 0) { |
@@ -553,7 +553,7 @@ discard block |
||
553 | 553 | |
554 | 554 | // If there is an error try the alternate provider or return the PEAR error. |
555 | 555 | } elseif ($alternate) { |
556 | - if (! $aConnected) { |
|
556 | + if (!$aConnected) { |
|
557 | 557 | $compressedHeaders = config('nntmux_nntp.compressed_headers'); |
558 | 558 | // Check if the current connected server is the alternate or not. |
559 | 559 | $aConnected = $this->_currentServer === config('nntmux_nntp.server') ? $nntp->doConnect($compressedHeaders, true) : $nntp->doConnect(); |
@@ -642,7 +642,7 @@ discard block |
||
642 | 642 | } |
643 | 643 | |
644 | 644 | // Check if it's an article number or message-ID. |
645 | - if (! is_numeric($identifier)) { |
|
645 | + if (!is_numeric($identifier)) { |
|
646 | 646 | // If it's a message-ID, check if it has the required triangular brackets. |
647 | 647 | $identifier = $this->_formatMessageID($identifier); |
648 | 648 | } |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | $emptyLine = false; |
663 | 663 | foreach ($article as $line) { |
664 | 664 | // If we found the empty line it means we are done reading the header and we will start reading the body. |
665 | - if (! $emptyLine) { |
|
665 | + if (!$emptyLine) { |
|
666 | 666 | if ($line === '') { |
667 | 667 | $emptyLine = true; |
668 | 668 | |
@@ -720,7 +720,7 @@ discard block |
||
720 | 720 | } |
721 | 721 | |
722 | 722 | // Check if it's an article number or message-id. |
723 | - if (! is_numeric($identifier)) { |
|
723 | + if (!is_numeric($identifier)) { |
|
724 | 724 | // Verify we have the required triangular brackets if it is a message-id. |
725 | 725 | $identifier = $this->_formatMessageID($identifier); |
726 | 726 | } |
@@ -770,7 +770,7 @@ discard block |
||
770 | 770 | */ |
771 | 771 | public function postArticle(array|string $groups, string $subject, \Exception|string $body, string $from, bool $yEnc = true, bool $compress = true, string $extra = ''): mixed |
772 | 772 | { |
773 | - if (! $this->_postingAllowed) { |
|
773 | + if (!$this->_postingAllowed) { |
|
774 | 774 | $message = 'You do not have the right to post articles on server '.$this->_currentServer; |
775 | 775 | |
776 | 776 | return $this->throwError($this->colorCli->climate()->error($message)); |
@@ -904,7 +904,7 @@ discard block |
||
904 | 904 | if ($this->_compressionEnabled) { |
905 | 905 | return true; |
906 | 906 | } |
907 | - if (! $this->_compressionSupported) { |
|
907 | + if (!$this->_compressionSupported) { |
|
908 | 908 | return false; |
909 | 909 | } |
910 | 910 | |
@@ -918,7 +918,7 @@ discard block |
||
918 | 918 | return $response; |
919 | 919 | } |
920 | 920 | if ($response !== 290) { |
921 | - if (! $secondTry) { |
|
921 | + if (!$secondTry) { |
|
922 | 922 | // Retry. |
923 | 923 | $this->cmdQuit(); |
924 | 924 | if ($this->_checkConnection()) { |
@@ -976,7 +976,7 @@ discard block |
||
976 | 976 | $possibleTerm = false; |
977 | 977 | $data = null; |
978 | 978 | |
979 | - while (! feof($this->_socket)) { |
|
979 | + while (!feof($this->_socket)) { |
|
980 | 980 | // Did we find a possible ending ? (.\r\n) |
981 | 981 | if ($possibleTerm) { |
982 | 982 | // Loop, sleeping shortly, to allow the server time to upload data, if it has any. |
@@ -991,7 +991,7 @@ discard block |
||
991 | 991 | stream_set_blocking($this->_socket, 1); |
992 | 992 | |
993 | 993 | // Don't sleep on last iteration. |
994 | - if (! empty($buffer)) { |
|
994 | + if (!empty($buffer)) { |
|
995 | 995 | break; |
996 | 996 | } |
997 | 997 | if ($i < 2) { |
@@ -1004,7 +1004,7 @@ discard block |
||
1004 | 1004 | // Remove .\r\n from end, decompress data. |
1005 | 1005 | $deComp = @gzuncompress(mb_substr($data, 0, -3, '8bit')); |
1006 | 1006 | |
1007 | - if (! empty($deComp)) { |
|
1007 | + if (!empty($deComp)) { |
|
1008 | 1008 | $bytesReceived = \strlen($data); |
1009 | 1009 | if ($this->_echo && $bytesReceived > 10240) { |
1010 | 1010 | $this->colorCli->climate()->primaryOver( |
@@ -1076,7 +1076,7 @@ discard block |
||
1076 | 1076 | } |
1077 | 1077 | |
1078 | 1078 | // Check if the last char is >, if not add it. |
1079 | - if (! str_ends_with($messageID, '>')) { |
|
1079 | + if (!str_ends_with($messageID, '>')) { |
|
1080 | 1080 | $messageID .= '>'; |
1081 | 1081 | } |
1082 | 1082 | |
@@ -1103,7 +1103,7 @@ discard block |
||
1103 | 1103 | } |
1104 | 1104 | |
1105 | 1105 | // Check if this is an article number or message-id. |
1106 | - if (! is_numeric($identifier)) { |
|
1106 | + if (!is_numeric($identifier)) { |
|
1107 | 1107 | // It's a message-id so check if it has the triangular brackets. |
1108 | 1108 | $identifier = $this->_formatMessageID($identifier); |
1109 | 1109 | } |
@@ -1117,7 +1117,7 @@ discard block |
||
1117 | 1117 | $body = ''; |
1118 | 1118 | if ($response === NET_NNTP_PROTOCOL_RESPONSECODE_BODY_FOLLOWS) { |
1119 | 1119 | // Continue until connection is lost |
1120 | - while (! feof($this->_socket)) { |
|
1120 | + while (!feof($this->_socket)) { |
|
1121 | 1121 | // Retrieve and append up to 1024 characters from the server. |
1122 | 1122 | $line = fgets($this->_socket, 1024); |
1123 | 1123 | |
@@ -1367,6 +1367,6 @@ discard block |
||
1367 | 1367 | */ |
1368 | 1368 | public function _isConnected(bool $feOf = true): bool |
1369 | 1369 | { |
1370 | - return is_resource($this->_socket) && (! $feOf || ! feof($this->_socket)); |
|
1370 | + return is_resource($this->_socket) && (!$feOf || !feof($this->_socket)); |
|
1371 | 1371 | } |
1372 | 1372 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $this->info('Paths checked successfully'); |
63 | 63 | } |
64 | 64 | |
65 | - if (! $error && $this->addAdminUser()) { |
|
65 | + if (!$error && $this->addAdminUser()) { |
|
66 | 66 | File::put(base_path().'/_install/install.lock', 'application install locked on '.now()); |
67 | 67 | $this->info('Generating application key'); |
68 | 68 | $this->call('key:generate', ['--force' => true]); |
@@ -91,15 +91,15 @@ discard block |
||
91 | 91 | $unrar_path = config('nntmux_settings.unrar_path'); |
92 | 92 | |
93 | 93 | $nzbPathCheck = File::isWritable($nzb_path); |
94 | - if (! $nzbPathCheck) { |
|
94 | + if (!$nzbPathCheck) { |
|
95 | 95 | $this->warn($nzb_path.' is not writable. Please fix folder permissions'); |
96 | 96 | |
97 | 97 | return false; |
98 | 98 | } |
99 | 99 | |
100 | - if (! file_exists($unrar_path)) { |
|
100 | + if (!file_exists($unrar_path)) { |
|
101 | 101 | $this->info('Creating missing '.$unrar_path.' folder'); |
102 | - if (! @File::makeDirectory($unrar_path) && ! File::isDirectory($unrar_path)) { |
|
102 | + if (!@File::makeDirectory($unrar_path) && !File::isDirectory($unrar_path)) { |
|
103 | 103 | throw new \RuntimeException('Unable to create '.$unrar_path.' folder'); |
104 | 104 | } |
105 | 105 | $this->info('Folder '.$unrar_path.' successfully created'); |
@@ -112,14 +112,14 @@ discard block |
||
112 | 112 | } |
113 | 113 | |
114 | 114 | $coversPathCheck = File::isWritable($covers_path); |
115 | - if (! $coversPathCheck) { |
|
115 | + if (!$coversPathCheck) { |
|
116 | 116 | $this->warn($covers_path.' is not writable. Please fix folder permissions'); |
117 | 117 | |
118 | 118 | return false; |
119 | 119 | } |
120 | 120 | |
121 | 121 | $tmpPathCheck = File::isWritable($tmp_path); |
122 | - if (! $tmpPathCheck) { |
|
122 | + if (!$tmpPathCheck) { |
|
123 | 123 | $this->warn($tmp_path.' is not writable. Please fix folder permissions'); |
124 | 124 | |
125 | 125 | return false; |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | // Get the default user role. |
148 | 148 | $userDefault = Role::query()->where('isdefault', '=', 1)->first(); |
149 | 149 | |
150 | - if (! empty($error)) { |
|
150 | + if (!empty($error)) { |
|
151 | 151 | return $this->showRegistrationForm($request, $error); |
152 | 152 | } |
153 | 153 | |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | break; |
171 | 171 | case 'view': |
172 | 172 | // See if it is a valid invite. |
173 | - if (($inviteCode !== null) && ! Invite::isValid($inviteCode)) { |
|
173 | + if (($inviteCode !== null) && !Invite::isValid($inviteCode)) { |
|
174 | 174 | $error = 'Invalid invitation token!'; |
175 | 175 | $showRegister = 0; |
176 | 176 | } else { |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | } |
203 | 203 | |
204 | 204 | if ((int) Settings::settingValue('registerstatus') === Settings::REGISTER_STATUS_INVITE) { |
205 | - if (! empty($inviteCode)) { |
|
205 | + if (!empty($inviteCode)) { |
|
206 | 206 | if (Invite::isValid($inviteCode)) { |
207 | 207 | $error = ''; |
208 | 208 | $showRegister = 1; |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | } |
150 | 150 | |
151 | 151 | // convert from a string array to an int array as we want to use int |
152 | - $book_reqids_ids = array_map(function ($value) { |
|
152 | + $book_reqids_ids = array_map(function($value) { |
|
153 | 153 | return (int) $value; |
154 | 154 | }, $book_reqids_ids); |
155 | 155 | $this->smarty->assign('book_reqids_ids', $book_reqids_ids); |
@@ -159,14 +159,14 @@ discard block |
||
159 | 159 | $books_selected = explode(',', Settings::settingValue('book_reqids')); |
160 | 160 | |
161 | 161 | // convert from a string array to an int array |
162 | - $books_selected = array_map(function ($value) { |
|
162 | + $books_selected = array_map(function($value) { |
|
163 | 163 | return (int) $value; |
164 | 164 | }, $books_selected); |
165 | 165 | $this->smarty->assign('book_reqids_selected', $books_selected); |
166 | 166 | |
167 | 167 | $this->smarty->assign('themelist', Utility::getThemesList()); |
168 | 168 | |
169 | - if (! str_contains(config('settings.nntp_server'), 'astra')) { |
|
169 | + if (!str_contains(config('settings.nntp_server'), 'astra')) { |
|
170 | 170 | $this->smarty->assign('compress_headers_warning', 'compress_headers_warning'); |
171 | 171 | } |
172 | 172 |
@@ -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->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); |