Browse Source

remove torrent file limits

main
ghost 1 year ago
parent
commit
b25cc173c5
  1. 2
      .env
  2. 2
      config/services.yaml
  3. 40
      src/Controller/PageController.php

2
.env

@ -63,6 +63,4 @@ APP_PAGE_TITLE_LENGTH_MIN=10 @@ -63,6 +63,4 @@ APP_PAGE_TITLE_LENGTH_MIN=10
APP_PAGE_TITLE_LENGTH_MAX=255
APP_PAGE_DESCRIPTION_LENGTH_MIN=0
APP_PAGE_DESCRIPTION_LENGTH_MAX=10000
APP_PAGE_TORRENT_FILE_QUANTITY_MIN=1
APP_PAGE_TORRENT_FILE_QUANTITY_MAX=100
APP_TORRENT_FILE_SIZE_MAX=1024000

2
config/services.yaml

@ -16,8 +16,6 @@ parameters: @@ -16,8 +16,6 @@ parameters:
app.page.title.length.max: '%env(APP_PAGE_TITLE_LENGTH_MAX)%'
app.page.description.length.min: '%env(APP_PAGE_DESCRIPTION_LENGTH_MIN)%'
app.page.description.length.max: '%env(APP_PAGE_DESCRIPTION_LENGTH_MAX)%'
app.page.torrent.file.quantity.min: '%env(APP_PAGE_TORRENT_FILE_QUANTITY_MIN)%'
app.page.torrent.file.quantity.max: '%env(APP_PAGE_TORRENT_FILE_QUANTITY_MAX)%'
app.torrent.size.max: '%env(APP_TORRENT_FILE_SIZE_MAX)%'
services:

40
src/Controller/PageController.php

@ -120,11 +120,7 @@ class PageController extends AbstractController @@ -120,11 +120,7 @@ class PageController extends AbstractController
'error' => [],
'attribute' =>
[
'placeholder' => sprintf(
$translator->trans('Append %s-%s torrent files'),
$this->getParameter('app.page.torrent.file.quantity.min'),
$this->getParameter('app.page.torrent.file.quantity.max')
)
'placeholder' => $translator->trans('Select torrent file')
]
],
'sensitive' =>
@ -170,17 +166,16 @@ class PageController extends AbstractController @@ -170,17 +166,16 @@ class PageController extends AbstractController
}
/// Torrents
$total = 0;
$torrents = [];
if ($files = $request->files->get('torrents'))
{
foreach ($files as $file)
{
//// Quantity
$total++;
//// File size
/// Torrent
if ($file = $request->files->get('torrent'))
{
//// Validate torrent file
if (filesize($file->getPathName()) > $this->getParameter('app.torrent.size.max'))
{
$form['torrents']['error'][] = $translator->trans('Torrent file out of size limit');
@ -189,16 +184,12 @@ class PageController extends AbstractController @@ -189,16 +184,12 @@ class PageController extends AbstractController
}
//// Validate torrent format
try
{
\Rhilip\Bencode\TorrentFile::load(
$file->getPathName()
);
}
catch (ParseException $e)
if (!$torrentService->readTorrentFileByFilepath($file->getPathName()))
{
$form['torrents']['error'][] = $translator->trans('Could not parse torrent file');
continue;
}
}
//// Content
@ -206,7 +197,7 @@ class PageController extends AbstractController @@ -206,7 +197,7 @@ class PageController extends AbstractController
$file->getPathName(),
$user->getId(),
time(),
(array) $locales,
[$request->get('locale')],
(bool) $request->get('sensitive'),
$user->isApproved()
);
@ -215,17 +206,6 @@ class PageController extends AbstractController @@ -215,17 +206,6 @@ class PageController extends AbstractController
}
}
if ($total < $this->getParameter('app.page.torrent.file.quantity.min') ||
$total > $this->getParameter('app.page.torrent.file.quantity.max'))
{
$form['torrents']['error'][] = sprintf(
$translator->trans('Torrents quantity out of %s-%s range'),
number_format($this->getParameter('app.page.torrent.file.quantity.min')),
number_format($this->getParameter('app.page.torrent.file.quantity.max'))
);
}
if (empty($form['locale']['error']) &&
empty($form['title']['error']) &&
empty($form['description']['error']) &&

Loading…
Cancel
Save