oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #912 from mishfit/allowEmptyFileQueryFilters

Browse source 
Allow empty fileQuery filters
This commit is contained in:
ZeroNet 2017-05-06 02:11:29 +02:00 committed by GitHub
commit e9b2c76a88
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Ui/UiWebsocket.py
View file

@ -106,7 +106,7 @@ class UiWebsocket(object):
except Exception, err: except Exception, err:
if config.debug: # Allow websocket errors to appear on /Debug if config.debug: # Allow websocket errors to appear on /Debug
sys.modules["main"].DebugHook.handleError() sys.modules["main"].DebugHook.handleError()
self.log.error("WebSocket handleRequest error: %s" % Debug.formatException(err)) self.log.error("WebSocket handleRequest error: %s \n %s" % (Debug.formatException(err), message))
self.cmd("error", "Internal error: %s" % Debug.formatException(err, "html")) self.cmd("error", "Internal error: %s" % Debug.formatException(err, "html"))
# Has permission to run the command # Has permission to run the command
@ -516,10 +516,10 @@ class UiWebsocket(object):
ws.event("siteChanged", self.site, {"event": ["file_deleted", inner_path]}) ws.event("siteChanged", self.site, {"event": ["file_deleted", inner_path]})
# Find data in json files # Find data in json files
def actionFileQuery(self, to, dir_inner_path, query): def actionFileQuery(self, to, dir_inner_path, query=None):
# s = time.time() # s = time.time()
dir_path = self.site.storage.getPath(dir_inner_path) dir_path = self.site.storage.getPath(dir_inner_path)
rows = list(QueryJson.query(dir_path, query)) rows = list(QueryJson.query(dir_path, query or ""))
# self.log.debug("FileQuery %s %s done in %s" % (dir_inner_path, query, time.time()-s)) # self.log.debug("FileQuery %s %s done in %s" % (dir_inner_path, query, time.time()-s))
return self.response(to, rows) return self.response(to, rows)