pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some small fixes and cosmetic adjustments

Browse source
This commit is contained in:
Salandora 2015-10-09 02:26:33 +02:00
parent 070fd4a47f
commit fd0456ed26
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/octoprint/filemanager/storage.py
View file

@ -1150,16 +1150,23 @@ class LocalFileStorage(StorageInterface):
if not filter or filter(entry, entry_data):
def get_size(start_path):
total_size = 0
for dirpath, dirnames, filenames in os.walk(start_path):
for f in filenames:
fp = os.path.join(dirpath, f)
for root, dirs, files in os.walk(start_path):
for f in files:
if f is ".metadata.yaml":
continue
fp = os.path.join(root, f)
total_size += os.path.getsize(fp)
return total_size
# only add folders passing the optional filter
extended_entry_data = dict()
extended_entry_data.update(entry_data)
extended_entry_data["size"] = get_size(entry_path)
stat = os.stat(entry_path)
if stat:
extended_entry_data["date"] = int(stat.st_ctime)
result[entry] = extended_entry_data

5
src/octoprint/static/js/app/viewmodels/files.js
View file

@ -99,7 +99,10 @@ $(function() {
return data["type"] && (data["type"] == "model" || data["type"] == "folder");
},
"emptyFolder": function(data) {
return data["type"] && data["type"] != "folder" || (data["size"] && data["size"] != 0);
if (data["type"] && data["type"] != "folder")
return true;
return data.children.length != 0;
}
},
"name",

2
src/octoprint/templates/sidebar/files.jinja2
View file

@ -3,7 +3,7 @@
</form>
<div class="gcode_files">
<!-- ko if: currentPath() != "" -->
<div class="entry" data-bind="click: function() { var path = $root.currentPath().split('/'); path.shift(); $root.changeFolderByPath(path.join('/')); }"><i class="icon-arrow-left"></i> {{ _('Back') }}</div>
<div class="entry" data-bind="click: function() { var path = $root.currentPath().split('/'); path.pop(); $root.changeFolderByPath(path.join('/')); }"><i class="icon-arrow-left"></i> {{ _('Back') }}</div>
<!-- /ko -->
<!-- ko if: listStyle() == 'folders_files' -->