HelloZeroNet
/
ZeroNet
mirror of https://github.com/HelloZeroNet/ZeroNet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'py3' into patch-3

This commit is contained in:
ZeroNet 2020-10-29 03:24:09 +01:00 committed by GitHub
parent bf98655b49 e2b1cf3938
commit ccb01681f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -10,7 +10,7 @@ services:
cache: pip cache: pip
before_install: before_install:
- pip install --upgrade pip wheel - pip install --upgrade pip wheel
- pip install --upgrade codecov coveralls flake8 pytest pytest-cov selenium - pip install --upgrade codecov coveralls flake8 mock pytest==4.6.3 pytest-cov selenium
# - docker build -t zeronet . # - docker build -t zeronet .
# - docker run -d -v $PWD:/root/data -p 15441:15441 -p 127.0.0.1:43110:43110 zeronet # - docker run -d -v $PWD:/root/data -p 15441:15441 -p 127.0.0.1:43110:43110 zeronet
install: install:

11
plugins/OptionalManager/UiWebsocketPlugin.py
View File

@ -139,7 +139,7 @@ class UiWebsocketPlugin(object):
wheres = {} wheres = {}
wheres_raw = [] wheres_raw = []
if "bigfile" in filter: if "bigfile" in filter:
wheres["size >"] = 1024 * 1024 * 10 wheres["size >"] = 1024 * 1024 * 1
if "downloaded" in filter: if "downloaded" in filter:
wheres_raw.append("(is_downloaded = 1 OR is_pinned = 1)") wheres_raw.append("(is_downloaded = 1 OR is_pinned = 1)")
if "pinned" in filter: if "pinned" in filter:
@ -166,11 +166,14 @@ class UiWebsocketPlugin(object):
row["address"] = address row["address"] = address
if row["size"] > 1024 * 1024: if row["size"] > 1024 * 1024:
has_info = self.addBigfileInfo(row) has_bigfile_info = self.addBigfileInfo(row)
else: else:
has_info = False has_bigfile_info = False
if not has_info: if not has_bigfile_info and "bigfile" in filter:
continue
if not has_bigfile_info:
if row["is_downloaded"]: if row["is_downloaded"]:
row["bytes_downloaded"] = row["size"] row["bytes_downloaded"] = row["size"]
row["downloaded_percent"] = 100 row["downloaded_percent"] = 100

4
plugins/UiFileManager/media/js/all.js
View File

@ -2187,7 +2187,6 @@
}).call(this); }).call(this);
/* ---- FileItemList.coffee ---- */ /* ---- FileItemList.coffee ---- */
@ -2483,7 +2482,7 @@
hasProp = {}.hasOwnProperty, hasProp = {}.hasOwnProperty,
indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
BINARY_EXTENSIONS = ["png", "gif", "jpg", "pdf", "doc", "msgpack", "zip", "rar", "gz", "tar", "exe"]; BINARY_EXTENSIONS = ["png", "gif", "jpg", "pdf", "doc", "msgpack", "zip", "rar", "gz", "tar", "exe", "wav", "ogg", "ogm", "oga", "ogv", "mp3"];
FileList = (function(superClass) { FileList = (function(superClass) {
extend(FileList, superClass); extend(FileList, superClass);
@ -2906,6 +2905,7 @@
}).call(this); }).call(this);
/* ---- UiFileManager.coffee ---- */ /* ---- UiFileManager.coffee ---- */

2
src/Config.py
View File

@ -14,7 +14,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.7.2" self.version = "0.7.2"
self.rev = 4538 self.rev = 4540
self.argv = argv self.argv = argv
self.action = None self.action = None
self.test_parser = None self.test_parser = None