added view section

Author: LunguGeorgeProgramator

gallery/__pycache__/loadFiles.cpython-37.pyc

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+import os
+import urllib.parse
+
+class LoadFiles:
+
+    PATH = "c:/Users/George/venv/myProjects/gallery-pic"
+
+    def __init__(self, path_to_scan = None):
+        self.path_to_scan = path_to_scan if path_to_scan else self.PATH
+
+    def scanDirFunc(self):
+        files = os.listdir(self.path_to_scan)
+        return files
+
+    def getFirstFile(self, files, first_file = True):
+        files_content = []
+        for file in files:
+            if(os.path.isdir(self.path_to_scan + '/' + file) == False):
+                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),
+                'files_in_dir': LoadFiles.encodeUrl(file+'/'+files_in_dir)
+            })
+        return files_content
+    
+    def getPhotosFiles(self, dir_name):
+        files_content = []
+        dir_name = LoadFiles.decodeUrl(dir_name)
+        self.path_to_scan = self.path_to_scan + '/' + dir_name
+        for file in self.scanDirFunc():
+            file_path = self.path_to_scan + '/' + file
+            if(os.path.isdir(file_path) == True):
+                continue
+            files_content.append(file_path)
+        return files_content
+    
+    @staticmethod
+    def encodeUrl(str_var):
+        return urllib.parse.quote(str_var)
+    
+    @staticmethod
+    def decodeUrl(str_var):
+        return urllib.parse.unquote(str_var)
+
+

gallery/__pycache__/pagination.cpython-37.pyc

@@ -1,6 +1,6 @@
 class Pagination:
 
-    MAX_ON_PAGE = 500
+    MAX_ON_PAGE = 50
 
     def __init__(self, last_page = None):
         self.__last_page = self.lastPageSetter(last_page, self.MAX_ON_PAGE)
@@ -15,28 +15,20 @@ def lastPage(self):
     def next(self):
         return self.__next
 
-    # @next.setter
-    def nextSetter(self, value, max_pages):
-        return value + max_pages
-
     @property
     def prev(self):
         return self.__prev
 
     # @prev.setter
     def lastPageSetter(self, value, max_pages):
-        return int(value if value != None else max_pages)
+        value = int(value) if value else max_pages
+        return value if value > 0 else max_pages
 
+    # @next.setter
+    def nextSetter(self, value, max_pages):
+        return value + max_pages
+    
     # @prev.setter
     def prevSetter(self, value, max_pages):
         prev_var = (value if value else 0) - max_pages
-        return 0 if prev_var < 0 else prev_var
-
-    # def setMaxPagination(max, search):
-    #     return search ? max : ( >= max ? max : $this->getLastPage());
-    
-
-    # function setMinPagination($search) : int {
-    #     return $search ?  0 : $this->getPrev();
-    # }
-
+        return 0 if prev_var < 0 else prev_var

gallery/__pycache__/scan_dir_class.cpython-37.pyc

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

gallery/__pycache__/urls.cpython-37.pyc

@@ -1,22 +1,20 @@
 from django.shortcuts import render
-from gallery.scan_dir_class import ScanDir
+from gallery.loadFiles import LoadFiles 
 from gallery.pagination import Pagination
 import random
 
-
 def index(request, last_item = None):
     r = Pagination(last_item)
-    s = ScanDir()
-    files = s.scanDirFunc()
-    files = s.scanDirFunc()[r.prev:r.next]
-    return render(request, 'index.html', {
-        'var_test': 's', 
-        'files': files, 
+    s = LoadFiles()
+    files = s.scanDirFunc()[r.prev:r.lastPage]
+    return render(request, 'index.html', { 
         'complete_list': s.getFirstFile(files),
         'next': r.next,
-        'prev': r.prev,
+        'prev': r.prev
     })
 
-def view(request):
-    return render(request, 'view.html', {'var_test': 's2'})
+def view(request, folder_name):
+    return render(request, 'view.html', {
+        'files': LoadFiles().getPhotosFiles(folder_name)
+    })