IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix various encoding issues with multibyte paths and filenames.

Browse Source 
Fixes #1986. Fixes #1940.
This commit is contained in:
Surinder Kumar
2016-12-05 13:10:56 +09:00
committed by Dave Page
parent c4c3d2b6b8
commit a64824a851
4 changed files with 87 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
web/pgadmin/tools/sqleditor/__init__.py
View File

@@ -1201,11 +1201,16 @@ def load_file():
file_data = json.loads(request.data, encoding='utf-8')
file_path = unquote(file_data['file_name'])
if hasattr(str, 'decode'):
file_path = unquote(file_data['file_name']).encode('utf-8').decode('utf-8')
# retrieve storage directory path
storage_manager_path = get_storage_directory()
if storage_manager_path:
# generate full path of file
file_path = os.path.join(storage_manager_path, file_path.lstrip('/'))
file_path = os.path.join(
storage_manager_path,
file_path.lstrip('/')
)
file_data = None
@@ -1224,7 +1229,10 @@ def load_file():
is_binary = is_binary_string(fileObj.read(1024))
if not is_binary:
fileObj.seek(0)
file_data = fileObj.read()
if hasattr(str, 'decode'):
file_data = fileObj.read().decode('utf-8')
else:
file_data = fileObj.read()
else:
return internal_server_error(
errormsg=gettext("File type not supported")
@@ -1262,17 +1270,28 @@ def save_file():
# generate full path of file
file_path = unquote(file_data['file_name'])
if hasattr(str, 'decode'):
file_path = unquote(
file_data['file_name']
).encode('utf-8').decode('utf-8')
if storage_manager_path is not None:
file_path = os.path.join(
storage_manager_path,
unquote(file_data['file_name'].lstrip('/'))
file_path.lstrip('/')
)
file_content = file_data['file_content']
if hasattr(str, 'decode'):
file_content = file_data['file_content']
else:
file_content = file_data['file_content'].encode()
# write to file
try:
with open(file_path, 'w') as output_file:
output_file.write(file_content)
with open(file_path, 'wb') as output_file:
if hasattr(str, 'decode'):
output_file.write(file_content.encode('utf-8'))
else:
output_file.write(file_content)
except IOError as e:
if e.strerror == 'Permission denied':
err_msg = "Error: {0}".format(e.strerror)

6
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
View File

@@ -2361,7 +2361,7 @@ define(
setTitle: function(title) {
_.each(window.top.pgAdmin.Browser.docker.findPanels('frm_datagrid'), function(p) {
if(p.isVisible()) {
p.title(title);
p.title(decodeURIComponent(title));
}
});
},
@@ -2401,7 +2401,7 @@ define(
_select_file_handler: function(e) {
var self = this,
data = {
'file_name': e
'file_name': decodeURI(e)
};
self.trigger(
@@ -2442,7 +2442,7 @@ define(
_save_file_handler: function(e) {
var self = this;
data = {
'file_name': e,
'file_name': decodeURI(e),
'file_content': self.gridView.query_tool_obj.getValue()
}
self.trigger(