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

Update handling of requests for nzb files

Browse Source
This commit is contained in:
DariusIII
2018-04-05 00:01:54 +02:00
parent 1f867ae6a3
commit 48158ea131
52 changed files with 94 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GetNzbController.php
+23 -23
View File
@@ -12,16 +12,15 @@ use App\Models\UsersRelease;
use Illuminate\Http\Request;
use Blacklight\utility\Utility;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\File;
class GetNzbController extends BasePageController
{
/**
* @param $guid
* @param \Illuminate\Http\Request request()
*
* @param \Illuminate\Http\Request $request
* @throws \Exception
*/
public function getNzb($guid)
public function getNzb(Request $request)
{
$this->setPrefs();
@@ -34,11 +33,11 @@ class GetNzbController extends BasePageController
Utility::showApiError(101);
}
} else {
if (! request()->has('i') || ! request()->has('r')) {
if (! $request->has('i') || ! $request->has('r')) {
Utility::showApiError(200);
}
$res = User::getByIdAndRssToken(request()->input('i'), request()->input('r'));
$res = User::getByIdAndRssToken($request->input('i'), $request->input('r'));
if (! $res) {
Utility::showApiError(100);
}
@@ -52,15 +51,15 @@ class GetNzbController extends BasePageController
}
// Remove any suffixed id with .nzb which is added to help weblogging programs see nzb traffic.
if ($guid) {
str_ireplace('.nzb', '', $guid);
if ($request->has('id')) {
str_ireplace('.nzb', '', $request->input('id'));
}
//
// A hash of the users ip to record against the download
//
$hosthash = '';
if ((int) Settings::settingValue('..storeuserips') === 1) {
$hosthash = User::getHostHash(request()->ip(), Settings::settingValue('..siteseed'));
$hosthash = User::getHostHash($request->ip(), Settings::settingValue('..siteseed'));
}
// Check download limit on user role.
@@ -69,17 +68,17 @@ class GetNzbController extends BasePageController
Utility::showApiError(501);
}
if (! $guid) {
if (! $request->input('id')) {
Utility::showApiError(200, 'Parameter id is required');
}
// Remove any suffixed id with .nzb which is added to help weblogging programs see nzb traffic.
request()->merge(['id' => str_ireplace('.nzb', '', request()->input('id'))]);
$request->merge(['id' => str_ireplace('.nzb', '', $request->input('id'))]);
$rel = new Releases(['Settings' => $this->settings]);
// User requested a zip of guid,guid,guid releases.
if (request()->has('zip') && request()->input('zip') === '1') {
$guids = explode(',', request()->input('id'));
if ($request->has('zip') && $request->input('zip') === '1') {
$guids = explode(',', $request->input('id'));
if ($requests['num'] + \count($guids) > $maxDownloads) {
Utility::showApiError(501);
}
@@ -91,7 +90,7 @@ class GetNzbController extends BasePageController
Release::updateGrab($guid);
UserDownload::addDownloadRequest($uid, $guid);
if (request()->has('del') && (int) request()->input('del') === 1) {
if ($request->has('del') && (int) $request->input('del') === 1) {
UsersRelease::delCartByUserAndRelease($guid, $uid);
}
}
@@ -104,18 +103,19 @@ class GetNzbController extends BasePageController
$this->show404();
}
$nzbPath = (new NZB())->getNZBPath(request()->input('id'));
if (! file_exists($nzbPath)) {
$nzbPath = (new NZB())->getNZBPath($request->input('id'));
if (! File::exists($nzbPath)) {
Utility::showApiError(300, 'NZB file not found!');
}
$relData = Release::getByGuid($guid);
$relData = Release::getByGuid($request->input('id'));
if ($relData !== null) {
Release::updateGrab($guid);
Release::updateGrab($request->input('id'));
UserDownload::addDownloadRequest($uid, $relData['id']);
User::incrementGrabs($uid);
if (request()->has('del') && (int) request()->input('del') === 1) {
UsersRelease::delCartByUserAndRelease($guid, $uid);
if ($request->has('del') && (int) $request->input('del') === 1) {
UsersRelease::delCartByUserAndRelease($request->input('id'), $uid);
}
} else {
Utility::showApiError(300, 'Release not found!');
@@ -135,9 +135,9 @@ class GetNzbController extends BasePageController
header('Content-Type: application/x-nzb');
header('Expires: '.date('r', time() + 31536000));
// Set X-DNZB header data.
header('X-DNZB-Failure: '.$this->serverurl.'failed/'.'?guid='.$guid.'&userid='.$uid.'&rsstoken='.$rssToken);
header('X-DNZB-Failure: '.$this->serverurl.'failed/'.'?guid='.$request->input('id').'&userid='.$uid.'&rsstoken='.$rssToken);
header('X-DNZB-Category: '.$relData['category_name']);
header('X-DNZB-Details: '.$this->serverurl.'details/'.$guid);
header('X-DNZB-Details: '.$this->serverurl.'details/'.$request->input('id'));
if (! empty($relData['imdbid']) && $relData['imdbid'] > 0) {
header('X-DNZB-MoreInfo: http://www.imdb.com/title/tt'.$relData['imdbid']);
} elseif (! empty($relData['tvdb']) && $relData['tvdb'] > 0) {
@@ -145,7 +145,7 @@ class GetNzbController extends BasePageController
}
header('X-DNZB-Name: '.$cleanName);
if ((int) $relData['nfostatus'] === 1) {
header('X-DNZB-NFO: '.$this->serverurl.'nfo/'.$guid);
header('X-DNZB-NFO: '.$this->serverurl.'nfo/'.$request->input('id'));
}
header('X-DNZB-RCode: 200');
header('X-DNZB-RText: OK, NZB content follows.');