From 386220ee9405162b710af93a984e91fccc76ad57 Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 27 Dec 2021 17:23:39 +0700 Subject: [PATCH] consolidate request attributes into parent class --- tubearchivist/home/views.py | 44 ++++++++++--------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/tubearchivist/home/views.py b/tubearchivist/home/views.py index 0b9c230..6d3cc34 100644 --- a/tubearchivist/home/views.py +++ b/tubearchivist/home/views.py @@ -162,13 +162,15 @@ class ArchivistResultsView(ArchivistViewConfig): result = search.get_data()[0]["source"] return result - def initiate_vars(self, page_get, user_id, search_get=False): + def initiate_vars(self, request): """search in es for vidoe hits""" - self.user_id = user_id + page_get = int(request.GET.get("page", 0)) + self.user_id = request.user.id self.config_builder(self.user_id) - self.search_get = search_get + self.search_get = request.GET.get("search", False) + search_encoded = self._url_encode(self.search_get) self.pagination_handler = Pagination( - page_get, self.user_id, search_get=self._url_encode(search_get) + page_get=page_get, user_id=self.user_id, search_get=search_encoded ) self.sort_by = self._sort_by_overwrite() self._initial_data() @@ -193,14 +195,9 @@ class HomeView(ArchivistResultsView): def get(self, request): """handle get requests""" - user_id = request.user.id - page_get = int(request.GET.get("page", 0)) - search_get = request.GET.get("search", False) - - self.initiate_vars(page_get, user_id, search_get) + self.initiate_vars(request) self._update_view_data() self.find_results() - self.context.update({"search_form": VideoSearchForm()}) return render(request, "home/home.html", self.context) @@ -292,13 +289,9 @@ class DownloadView(ArchivistResultsView): def get(self, request): """handle get request""" - user_id = request.user.id - page_get = int(request.GET.get("page", 0)) - - self.initiate_vars(page_get, user_id) + self.initiate_vars(request) self._update_view_data() self.find_results() - self.context.update( { "title": "Downloads", @@ -358,9 +351,7 @@ class ChannelIdView(ArchivistResultsView): def get(self, request, channel_id): """get request""" - user_id = request.user.id - page_get = int(request.GET.get("page", 0)) - self.initiate_vars(page_get, user_id) + self.initiate_vars(request) self._update_view_data(channel_id) self.find_results() @@ -410,10 +401,7 @@ class ChannelView(ArchivistResultsView): def get(self, request): """handle get request""" - user_id = request.user.id - page_get = int(request.GET.get("page", 0)) - - self.initiate_vars(page_get, user_id) + self.initiate_vars(request) self._update_view_data() self.find_results() self.context.update( @@ -464,13 +452,9 @@ class PlaylistIdView(ArchivistResultsView): def get(self, request, playlist_id): """handle get request""" - user_id = request.user.id - page_get = int(request.GET.get("page", 0)) - self.initiate_vars(page_get, user_id) - + self.initiate_vars(request) playlist_info, channel_info = self._get_info(playlist_id) playlist_name = playlist_info["playlist_name"] - self._update_view_data(playlist_id, playlist_info) self.find_results() self.context.update( @@ -544,11 +528,7 @@ class PlaylistView(ArchivistResultsView): def get(self, request): """handle get request""" - user_id = request.user.id - page_get = int(request.GET.get("page", 0)) - search_get = request.GET.get("search", False) - - self.initiate_vars(page_get, user_id, search_get) + self.initiate_vars(request) self._update_view_data() self.find_results() self.context.update(