@@ -15,11 +15,23 @@ def index(request):
1515 # Page from the theme
1616 return render (request , 'pages/dashboard.html' , context = context )
1717
18+ # def get_files_from_directory(directory_path):
19+ # files = []
20+ # for root, _, filenames in os.walk(directory_path):
21+ # for filename in filenames:
22+ # file_path = os.path.join(root, filename)
23+ # files.append({
24+ # 'file': file_path.split('/media/')[1],
25+ # 'filename': filename,
26+ # 'file_path': file_path
27+ # })
28+ # return files
29+
1830def get_files_from_directory (directory_path ):
1931 files = []
20- for root , _ , filenames in os .walk (directory_path ):
21- for filename in filenames :
22- file_path = os .path .join ( root , filename )
32+ for filename in os .listdir (directory_path ):
33+ file_path = os . path . join ( directory_path , filename )
34+ if os .path .isfile ( file_path ):
2335 files .append ({
2436 'file' : file_path .split ('/media/' )[1 ],
2537 'filename' : filename ,
@@ -34,17 +46,15 @@ def file_manager(request):
3446 selected_directory = request .GET .get ('directory' , '' )
3547
3648 files = []
37- if selected_directory :
38- selected_directory_path = os .path .join (media_path , selected_directory )
39- if os .path .isdir (selected_directory_path ):
40- files = get_files_from_directory (selected_directory_path )
49+ selected_directory_path = os .path .join (media_path , selected_directory )
50+ if os .path .isdir (selected_directory_path ):
51+ files = get_files_from_directory (selected_directory_path )
4152
4253 context = {
4354 'directories' : directories ,
4455 'files' : files ,
4556 'selected_directory' : selected_directory ,
4657 'segment' : 'file_manager' ,
47- 'MEDIA_ROOT' : settings .MEDIA_ROOT
4858 }
4959 return render (request , 'pages/file-manager.html' , context )
5060
0 commit comments