Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1fbce40

Browse files
changed img viewer to vue
1 parent 7e55de9 commit 1fbce40

File tree

8 files changed

+824
-19
lines changed

8 files changed

+824
-19
lines changed
39 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
145 Bytes
Binary file not shown.

‎gallery/loadFiles.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ def getFirstFile(self, files, first_file = True, search = None):
2626
continue
2727
files_in_dir = file_first
2828
break
29-
if (type(files_in_dir) == list):
29+
if (type(files_in_dir) == listandfiles_in_dir):
3030
files_in_dir = files_in_dir[0]
3131
files_content.append({
3232
'dir_name': file,
3333
'dir_name_encoded': file,
34-
'files_in_dir': LoadFiles.encodeUrl(file+'/'+files_in_dir)
34+
'files_in_dir': LoadFiles.encodeUrl(file+'/'+files_in_diriffiles_in_direlse'')
3535
})
3636
return files_content
3737

@@ -43,7 +43,7 @@ def getPhotosFiles(self, dir_name):
4343
file_path = self.path_to_scan + '/' + file
4444
if os.path.isdir(file_path) == True or '.ini' in file:
4545
continue
46-
files_content.append(file_path)
46+
files_content.append(('/static/'+file_path).strip())
4747
return files_content
4848

4949
@staticmethod

‎gallery/views.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from gallery.pagination import Pagination
44
from django.http import HttpResponse
55
from shutil import rmtree
6-
import random, os, ast
6+
import random, ast, os, sys, stat, json
77

88
def index(request, last_item = None):
99
s = LoadFiles()
@@ -19,7 +19,8 @@ def view(request, folder_name, last_item = None):
1919
s = LoadFiles()
2020
r = Pagination(last_item)
2121
return render(request, 'view.html', {
22-
'files': s.getPhotosFiles(folder_name)[r.prev:r.lastPage],
22+
'files_json': json.dumps(s.getPhotosFiles(folder_name)[r.prev:r.lastPage]),
23+
# 'files': json.dumps(s.getPhotosFiles(folder_name)[r.prev:r.lastPage]),
2324
'folder_name': folder_name,
2425
'next': r.next,
2526
'prev': r.prev
@@ -53,5 +54,8 @@ def removeDir(request):
5354
requestPost = request.body.decode('utf-8')
5455
requestPost = ast.literal_eval(requestPost) if requestPost and type(requestPost) == str else requestPost
5556
if ("oldDirName" in requestPost):
56-
rmtree(LoadFiles.PATH + '/'+ requestPost["oldDirName"])
57+
path = LoadFiles.PATH + '/'+ requestPost["oldDirName"]
58+
if(os.chmod(path, stat.S_IXGRP)):
59+
os.chmod(path, stat.S_IWOTH)
60+
rmtree(path)
5761
return HttpResponse("Done", content_type='text/plain')

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /