YGGverse
/
YGGtracker
mirror of https://github.com/YGGverse/YGGtracker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

add search filters counter #35

main
ghost 1 year ago
parent
e3503bc4bd
commit
5523034307
2 changed files with 97 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 87
      src/Controller/SearchController.php
  2. 55
      templates/default/search/module.html.twig

87
src/Controller/SearchController.php
Unescape View File

@ -9,6 +9,7 @@ use Symfony\Component\HttpFoundation\Response; @@ -9,6 +9,7 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request;
use App\Service\UserService;
use App\Service\TorrentService;
use App\Service\ActivityService;
class SearchController extends AbstractController
@ -16,6 +17,7 @@ class SearchController extends AbstractController @@ -16,6 +17,7 @@ class SearchController extends AbstractController
public function module(
Request $request,
UserService $userService,
TorrentService $torrentService,
ActivityService $activityService
): Response
{
@ -23,8 +25,12 @@ class SearchController extends AbstractController @@ -23,8 +25,12 @@ class SearchController extends AbstractController
$locales = [];
$categories = [];
// Request
$query = $request->get('query') ? urldecode($request->get('query')) : '';
$filter = $request->get('filter') ? true : false;
// Extended search
if ($request->get('filter'))
if ($filter)
{
// Init user
$user = $this->initUser(
@ -33,26 +39,37 @@ class SearchController extends AbstractController @@ -33,26 +39,37 @@ class SearchController extends AbstractController
$activityService
);
// Keywords
$keywords = explode(' ', $query);
// Locales
foreach (explode('|', $this->getParameter('app.locales')) as $locale)
{
if ($request->get('locales'))
{
$locales[] =
[
'value' => $locale,
'checked' => in_array($locale, (array) $request->get('locales')) ? true : false,
];
$checked = in_array($locale, (array) $request->get('locales'));
}
else
{
$locales[] =
[
'value' => $locale,
'checked' => in_array($locale, $user->getLocales()) ? true : false,
];
$checked = in_array($locale, $user->getLocales());
}
$locales[] =
[
'value' => $locale,
'checked' => $checked,
'total' => $torrentService->findTorrentsTotal(
0,
$keywords,
[$locale],
$request->get('categories') ? $request->get('categories') : $user->getCategories(),
$sensitive,
!$user->isModerator() ? true : null,
!$user->isModerator() ? true : null,
)
];
}
// Categories
@ -60,30 +77,52 @@ class SearchController extends AbstractController @@ -60,30 +77,52 @@ class SearchController extends AbstractController
{
if ($request->get('categories'))
{
$categories[] =
[
'value' => $category,
'checked' => in_array($category, (array) $request->get('categories')) ? true : false,
];
$checked = in_array($category, (array) $request->get('categories'));
}
else
{
$categories[] =
[
'value' => $category,
'checked' => in_array($category, $user->getCategories()) ? true : false,
];
$checked = in_array($category, $user->getCategories());
}
$categories[] =
[
'value' => $category,
'checked' => $checked,
'total' => $torrentService->findTorrentsTotal(
0,
$keywords,
$request->get('locales') ? $request->get('locales') : $user->getLocales(),
[$category],
$sensitive,
!$user->isModerator() ? true : null,
!$user->isModerator() ? true : null,
)
];
}
// Sensitive
$sensitive =
[
'checked' => $request->get('sensitive'),
'total' => $torrentService->findTorrentsTotal(
0,
$keywords,
$request->get('locales') ? $request->get('locales') : $user->getLocales(),
$request->get('categories') ? $request->get('categories') : $user->getCategories(),
true,
!$user->isModerator() ? true : null,
!$user->isModerator() ? true : null,
)
];
}
return $this->render(
'default/search/module.html.twig',
[
'query' => $request->get('query') ? urldecode($request->get('query')) : '',
'filter' => $request->get('filter'),
'sensitive' => $request->get('sensitive'),
'query' => $query,
'filter' => $filter,
'sensitive' => $sensitive,
'locales' => $locales,
'categories' => $categories,
]

55
templates/default/search/module.html.twig
Unescape View File

@ -9,16 +9,21 @@ @@ -9,16 +9,21 @@
</div>
<div class="padding-t-16-px padding-b-8-px padding-x-24-px border-top-default">
{% for locale in locales | sort %}
<div class="margin-t-4-px margin-b-8-px margin-r-8-px display-inline-block min-width-120-px">
{% if locale.checked %}
<input name="locales[]" id="{{ locale.value }}" type="checkbox" value="{{ locale.value }}" checked="checked" />
{% else %}
<input name="locales[]" id="{{ locale.value }}" type="checkbox" value="{{ locale.value }}" />
{% endif %}
<label class="margin-x-4-px" for="{{ locale.value }}">
{{ locale.value | locale_name(locale.value) | u.title }}
</label>
</div>
{#{% if locale.total %}#}
<div class="margin-t-4-px margin-b-8-px margin-r-8-px display-inline-block min-width-120-px">
{% if locale.checked %}
<input name="locales[]" id="{{ locale.value }}" type="checkbox" value="{{ locale.value }}" checked="checked" />
{% else %}
<input name="locales[]" id="{{ locale.value }}" type="checkbox" value="{{ locale.value }}" />
{% endif %}
<label class="margin-x-4-px" for="{{ locale.value }}">
{{ locale.value | locale_name(locale.value) | u.title }}
<span class="text-color-night">
({{ locale.total }})
</span>
</label>
</div>
{#{% endif %}#}
{% endfor %}
</div>
<div class="margin-b-4-px padding-x-4-px text-right">
@ -26,29 +31,37 @@ @@ -26,29 +31,37 @@
</div>
<div class="padding-t-16-px padding-b-8-px padding-x-24-px border-top-default">
{% for category in categories | sort %}
<div class="margin-t-4-px margin-b-8-px margin-r-8-px display-inline-block min-width-120-px">
{% if category.checked %}
<input name="categories[]" id="{{ category.value }}" type="checkbox" value="{{ category.value }}" checked="checked" />
{% else %}
<input name="categories[]" id="{{ category.value }}" type="checkbox" value="{{ category.value }}" />
{% endif %}
<label class="margin-x-4-px" for="{{ category.value }}">
{{ category.value | trans_category | u.title }}
</label>
</div>
{#{% if category.total %}#}
<div class="margin-t-4-px margin-b-8-px margin-r-8-px display-inline-block min-width-120-px">
{% if category.checked %}
<input name="categories[]" id="{{ category.value }}" type="checkbox" value="{{ category.value }}" checked="checked" />
{% else %}
<input name="categories[]" id="{{ category.value }}" type="checkbox" value="{{ category.value }}" />
{% endif %}
<label class="margin-x-4-px" for="{{ category.value }}">
{{ category.value | trans_category | u.title }}
<span class="text-color-night">
({{ category.total }})
</span>
</label>
</div>
{#{% endif %}#}
{% endfor %}
</div>
<div class="margin-b-4-px padding-x-4-px text-right">
{{ 'other' | trans | u.title }}
</div>
<div class="padding-t-16-px padding-b-8-px padding-x-24-px border-top-default">
{% if sensitive %}
{% if sensitive.checked %}
<input name="sensitive" id="sensitive" type="checkbox" value="true" checked="checked" />
{% else %}
<input name="sensitive" id="sensitive" type="checkbox" value="true" />
{% endif %}
<label class="margin-x-4-px" for="sensitive">
{{ 'Sensitive' | trans }}
<span class="text-color-night">
({{ sensitive.total }})
</span>
</label>
</div>
</div>

Write Preview
Loading…
Cancel
Save