projects
/
qcg-portal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5ec84e9
)
fix ignoring current and parent directory in listing
author
Maciej Tronowski
<mtro@man.poznan.pl>
Wed, 2 Sep 2015 15:40:51 +0000
(17:40 +0200)
committer
Dawid Jagieła
<lightnir@gmail.com>
Sat, 12 Sep 2015 10:08:57 +0000
(12:08 +0200)
filex/views.py
patch
|
blob
|
history
diff --git
a/filex/views.py
b/filex/views.py
index
3215fd8
..
108f7c3
100644
(file)
--- a/
filex/views.py
+++ b/
filex/views.py
@@
-1,4
+1,3
@@
-from itertools import islice
import logging
import mimetypes
import os
import logging
import mimetypes
import os
@@
-62,12
+61,12
@@
class ListView(FTPView):
listing = ftp.listing(make_url(params, 'path'))
data = []
listing = ftp.listing(make_url(params, 'path'))
data = []
- # ignore . and .. from beginning of the listing
- for item in islice(listing, 2, None):
- item['size'] = filesizeformat(item['size'])
- item['date'] = date_format(item['date'], 'CUSTOM_DATETIME_FORMAT')
+ for item in listing:
+ if item['name'] not in ['.', '..']:
+ item['size'] = filesizeformat(item['size'])
+ item['date'] = date_format(item['date'], 'CUSTOM_DATETIME_FORMAT')
- data.append(item)
+ data.append(item)
return JsonResponse(data, safe=False)
return JsonResponse(data, safe=False)