added a search file form

Author: LunguGeorgeProgramator

gallery/__pycache__/loadFiles.cpython-37.pyc

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import os
+import os, re
 import urllib.parse
 
 class LoadFiles:
@@ -13,17 +13,19 @@ def scanDirFunc(self):
         files = os.listdir(self.path_to_scan)
         return files
 
-    def getFirstFile(self, files, first_file = True):
+    def getFirstFile(self, files, first_file = True, search = None):
         files_content = []
         for file in files:
             if(os.path.isdir(self.path_to_scan + '/' + file) == False):
                 continue
+            if search and not re.search(re.escape(search), file, flags=re.I):
+                continue
             files_in_dir = os.listdir(self.path_to_scan + '/' + file)
             if(first_file == True):
                 files_in_dir = files_in_dir[0]
             files_content.append({
                 'dir_name': file,
-                'dir_name_encoded': LoadFiles.encodeUrl(file),
+                'dir_name_encoded': file,
                 'files_in_dir': LoadFiles.encodeUrl(file+'/'+files_in_dir)
             })
         return files_content

gallery/__pycache__/urls.cpython-37.pyc

@@ -5,6 +5,8 @@
 urlpatterns = [
     path('', views.index, name='index_main'),
     url(r'^(?P<last_item>\d+)$', views.index, name='index_main'),
+    path('search', views.search, name='search_main'),
+    url(r'^search/(?P<search>.+)$', views.search, name='search_main'),
     path('view/<folder_name>', views.view, name='view_main'),
     url(r'^view/(?P<folder_name>.+)/(?P<last_item>\d+)$', views.view, name='view_main'),
 ]

gallery/__pycache__/views.cpython-37.pyc

@@ -4,8 +4,8 @@
 import random
 
 def index(request, last_item = None):
-    r = Pagination(last_item)
     s = LoadFiles()
+    r = Pagination(last_item)
     files = s.scanDirFunc()[r.prev:r.lastPage]
     return render(request, 'index.html', { 
         'complete_list': s.getFirstFile(files),
@@ -14,11 +14,25 @@ def index(request, last_item = None):
     })
 
 def view(request, folder_name, last_item = None):
+    s = LoadFiles()
     r = Pagination(last_item)
     return render(request, 'view.html', {
-        'files': LoadFiles().getPhotosFiles(folder_name)[r.prev:r.lastPage],
+        'files': s.getPhotosFiles(folder_name)[r.prev:r.lastPage],
         'folder_name': folder_name,
         'next': r.next,
         'prev': r.prev
     })
 
+def search(request, search = None):
+    s = LoadFiles()
+    files = s.scanDirFunc()
+    search_get = request.GET['search']
+    if search_get:
+        search = search_get
+    if not search_get and not search: # check if empty string
+        files = []
+    return render(request, 'index.html', { 
+        'complete_list': s.getFirstFile(files, True, search),
+        'next': None,
+        'prev': None
+    })

gallery/loadFiles.py

@@ -4,13 +4,30 @@
 {% endblock %}
 {% load static %}
 <div class="container">
+    {% if prev != None %}
     <nav aria-label="...">
         <ul class="pagination">
             <li class="page-item"><a class="page-link" href="{% url 'index_main' prev %}">Previous</a></li>
             <li class="page-item"><a class="page-link" href="{% url 'index_main' next %}"> Next</a></li>
             <li class="page-item"><a class="page-link" href="{% url 'index_main' %}">Main page</a></li>
         </ul>
     </nav>  
+    {% endif %}
+
+    <div class="row">
+    	<form action="{% url 'search_main' %}" class="form-inline" method="get">
+			<div class="form-group mx-sm-3 mb-2">
+				<label for="inputSearch" class="sr-only">Search:</label>
+				<input type="text" class="form-control" id="search" placeholder="Search" name="search">
+			</div>
+			<button type="submit" class="btn btn-primary mb-2">Submit</button>
+			<div class="form-group mx-sm-3 mb-2">
+			  <a href="{% url 'index_main' %}">Reset</a>
+			</div>
+    	</form>
+    </div>
+      
+
     <div class="row">
         {% for file in complete_list %}
         <div class="col-3">
@@ -23,11 +40,13 @@
         </div>
         {% endfor %} 
     </div>
+    {% if prev != None %}
     <nav aria-label="...">
         <ul class="pagination">
             <li class="page-item"><a class="page-link" href="{% url 'index_main' prev %}">Previous</a></li>
             <li class="page-item"><a class="page-link" href="{% url 'index_main' next %}"> Next</a></li>
             <li class="page-item"><a class="page-link" href="{% url 'index_main' %}">Main page</a></li>
         </ul>
     </nav>  
+    {% endif %} 
 </div>

gallery/urls.py

@@ -10,17 +10,11 @@
 	};
 </script>
 <div class="container">
-    <nav aria-label="...">
-        <ul class="pagination">
-            <li class="page-item"><a class="page-link" href="{% url 'view_main' folder_name prev %}">Previous</a></li>
-            <li class="page-item"><a class="page-link" href="{% url 'view_main' folder_name next %}"> Next</a></li>
-            <li class="page-item"><a class="page-link" href="{% url 'index_main' %}">Main page</a></li>
-        </ul>
-    </nav>  
     <div class="row">
         <div class="row zoomwall" id="zoomwall" >
             {% for file in files %}
-                <img class="col-3" src="{% static file %}">
+            <!-- class="col-3" -->
+                <img src="{% static file %}">
             {% endfor %} 
         </div>
     </div>
@@ -31,4 +25,5 @@
             <li class="page-item"><a class="page-link" href="{% url 'index_main' %}">Main page</a></li>
         </ul>
     </nav>  
+    <div class="row"><i>{{ folder_name }}</i></div>
 </div>