From 256cbf4f9685c0b0b4964aabd791b713fa609baa Mon Sep 17 00:00:00 2001
From: Azuny <crippyua@gmail.com>
Date: Wed, 16 Aug 2017 17:59:29 +0300
Subject: [PATCH 1/2] Add date filter to search results

---
 nyaa/search.py                     | 14 ++++++++++++--
 nyaa/static/js/main.js             | 16 ++++++++++++++++
 nyaa/templates/layout.html         |  5 +++++
 nyaa/templates/search_results.html | 18 ++++++++++++++++++
 nyaa/views/main.py                 |  5 +++++
 5 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/nyaa/search.py b/nyaa/search.py
index 56619739..694e778f 100644
--- a/nyaa/search.py
+++ b/nyaa/search.py
@@ -36,7 +36,7 @@ def _generate_query_string(term, category, filter, user):
 
 
 def search_elastic(term='', user=None, sort='id', order='desc',
-                   category='0_0', quality_filter='0', page=1,
+                   category='0_0', quality_filter='0', date_filter='', page=1,
                    rss=False, admin=False, logged_in_user=None,
                    per_page=75, max_search_results=1000):
     # This function can easily be memcached now
@@ -136,6 +136,10 @@ def search_elastic(term='', user=None, sort='id', order='desc',
                     default_operator="AND",
                     query=term)
 
+    if date_filter:
+        date_min, date_max = date_filter.replace('-00', '-01').split(' - ')[:2]
+        s = s.filter('range', created_time={'gte': date_min, 'lte': date_max})
+
     # User view (/user/username)
     if user:
         s = s.filter('term', uploader_id=user)
@@ -227,7 +231,7 @@ def wrapper(*args, **kwargs):
 
 
 def search_db(term='', user=None, sort='id', order='desc', category='0_0',
-              quality_filter='0', page=1, rss=False, admin=False,
+              quality_filter='0', date_filter='', page=1, rss=False, admin=False,
               logged_in_user=None, per_page=75):
     sort_keys = {
         'id': models.Torrent.id,
@@ -354,6 +358,12 @@ def search_db(term='', user=None, sort='id', order='desc', category='0_0',
         qpc.filter((models.Torrent.main_category_id == main_cat_id) &
                    (models.Torrent.sub_category_id == sub_cat_id))
 
+    if date_filter:
+        date_min, date_max = date_filter.replace('-00', '-01').split(' - ')[:2]
+        date_min += ' 00:00:00'
+        date_max += ' 23:59:59'
+        qpc.filter((models.Torrent.created_time <= date_max) & (models.Torrent.created_time >= date_min))
+
     if filter_tuple:
         qpc.filter(models.Torrent.flags.op('&')(
             int(filter_tuple[0])).is_(filter_tuple[1]))
diff --git a/nyaa/static/js/main.js b/nyaa/static/js/main.js
index c7d9cb89..0c9c68b5 100644
--- a/nyaa/static/js/main.js
+++ b/nyaa/static/js/main.js
@@ -71,6 +71,22 @@ $(document).ready(function() {
 		$(this).blur().children('i').toggleClass('fa-folder-open fa-folder');
 		$(this).next().stop().slideToggle(250);
 	});
+
+    // Date range picker
+    $(function() {
+        var el = $('input[name="d"');
+        el.daterangepicker({
+            "linkedCalendars": false,
+            "autoUpdateInput": true,
+            "startDate": el.attr('value') ? el.attr('value') : moment().subtract(6, 'days'),
+            "endDate": el.attr('value') ? el.attr('value').replace(/.* - /, '') : moment(),
+            "autoApply": true,
+            "locale": {
+                "format": "YYYY-MM-DD",
+                "separator": " - "
+            },
+        });
+    });
 });
 
 function _format_time_difference(seconds) {
diff --git a/nyaa/templates/layout.html b/nyaa/templates/layout.html
index 43da9cb8..9acd6c3d 100644
--- a/nyaa/templates/layout.html
+++ b/nyaa/templates/layout.html
@@ -48,6 +48,11 @@
 		<script src="{{ static_cachebuster('js/bootstrap-select.js') }}"></script>
 		<script src="{{ static_cachebuster('js/main.js') }}"></script>
 
+		<!-- Include Date Range Picker -->
+		<script type="text/javascript" src="//cdn.jsdelivr.net/momentjs/latest/moment.min.js"></script>
+		<script type="text/javascript" src="//cdn.jsdelivr.net/bootstrap.daterangepicker/2/daterangepicker.js"></script>
+		<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/bootstrap.daterangepicker/2/daterangepicker.css" />
+
 		<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
 		<!--[if lt IE 9]>
 			<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
diff --git a/nyaa/templates/search_results.html b/nyaa/templates/search_results.html
index 51a230af..a57ab7bd 100644
--- a/nyaa/templates/search_results.html
+++ b/nyaa/templates/search_results.html
@@ -17,6 +17,24 @@
 {% endif %}
 {% endif %}
 
+{% if 'q' in request.args %}
+<div class="row">
+	<div class="col-md-3">
+		<form action="{{ url_for('main.home') }}" method="get" style="display:flex">
+			{% for arg, value in request.args.items() %}
+			{% if arg != 'd' %}
+			<input type="hidden" name="{{ arg }}" value="{{ value }}"/>
+			{% endif %}
+			{% endfor %}
+			<input class="form-control" type="text" name="d" value="{{ request.args['d'] }}">
+			<button class="btn btn-primary">
+				<i class="fa fa-calendar fa-fw"></i>
+			</button>
+		</form>
+	</div>
+</div>
+{% endif %}
+
 {% if (use_elastic and torrent_query.hits.total > 0) or (torrent_query.items) %}
 <div class="table-responsive">
 	<table class="table table-bordered table-hover table-striped torrent-list">
diff --git a/nyaa/views/main.py b/nyaa/views/main.py
index f9c54e06..7ecba98b 100644
--- a/nyaa/views/main.py
+++ b/nyaa/views/main.py
@@ -54,6 +54,7 @@ def home(rss):
 
     category = chain_get(req_args, 'c', 'cats')
     quality_filter = chain_get(req_args, 'f', 'filter')
+    date_filter = chain_get(req_args, 'd', 'date')
 
     user_name = chain_get(req_args, 'u', 'user')
     page_number = chain_get(req_args, 'p', 'page', 'offset')
@@ -67,6 +68,9 @@ def home(rss):
 
     results_per_page = app.config.get('RESULTS_PER_PAGE', DEFAULT_PER_PAGE)
 
+    if not re.match(r'^\d{4}-\d{2}-\d{2} - \d{4}-\d{2}-\d{2}$', str(date_filter)):
+        date_filter = ''
+
     user_id = None
     if user_name:
         user = models.User.by_username(user_name)
@@ -100,6 +104,7 @@ def home(rss):
         'order': sort_order or 'desc',
         'category': category or '0_0',
         'quality_filter': quality_filter or '0',
+        'date_filter': date_filter,
         'page': page_number,
         'rss': render_as_rss,
         'per_page': results_per_page

From ba6a7fb2cb8d41f19b11001aabe39f8ab06b239b Mon Sep 17 00:00:00 2001
From: Azuny <crippyua@gmail.com>
Date: Thu, 17 Aug 2017 09:53:52 +0300
Subject: [PATCH 2/2] Change daterangepicker CDN to cloudflare

---
 nyaa/search.py             | 3 ++-
 nyaa/templates/layout.html | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nyaa/search.py b/nyaa/search.py
index 694e778f..55e76929 100644
--- a/nyaa/search.py
+++ b/nyaa/search.py
@@ -362,7 +362,8 @@ def search_db(term='', user=None, sort='id', order='desc', category='0_0',
         date_min, date_max = date_filter.replace('-00', '-01').split(' - ')[:2]
         date_min += ' 00:00:00'
         date_max += ' 23:59:59'
-        qpc.filter((models.Torrent.created_time <= date_max) & (models.Torrent.created_time >= date_min))
+        qpc.filter((models.Torrent.created_time <= date_max) &
+                   (models.Torrent.created_time >= date_min))
 
     if filter_tuple:
         qpc.filter(models.Torrent.flags.op('&')(
diff --git a/nyaa/templates/layout.html b/nyaa/templates/layout.html
index 9acd6c3d..ab62c55b 100644
--- a/nyaa/templates/layout.html
+++ b/nyaa/templates/layout.html
@@ -49,9 +49,10 @@
 		<script src="{{ static_cachebuster('js/main.js') }}"></script>
 
 		<!-- Include Date Range Picker -->
-		<script type="text/javascript" src="//cdn.jsdelivr.net/momentjs/latest/moment.min.js"></script>
-		<script type="text/javascript" src="//cdn.jsdelivr.net/bootstrap.daterangepicker/2/daterangepicker.js"></script>
-		<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/bootstrap.daterangepicker/2/daterangepicker.css" />
+		<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js" integrity="sha256-1hjUhpc44NwiNg8OwMu2QzJXhD8kcj+sJA3aCQZoUjg=" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-daterangepicker/2.1.25/daterangepicker.min.js" integrity="sha256-WniDtKHyk2OPgNtTFKu/sL8zGBzmCfMcmEKRAqfi25c=" crossorigin="anonymous"></script>
+		<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-daterangepicker/2.1.25/daterangepicker.min.css" integrity="sha256-RqJuUJ19HEfsKUNMC+6GLSatrHeroWygib75lro4BMU=" crossorigin="anonymous" />
+
 
 		<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
 		<!--[if lt IE 9]>