mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
f2fc1ceba8
In order to resolve the non-ascii characters in path (in user directory, storage path, etc) on windows, we have converted the path into the short-path, so that - we don't need to deal with the encoding issues (specially with Python 2). We've resolved majority of the issues with this patch. We still need couple issues to resolve after this in the same area. TODO * Add better support for non-ascii characters in the database name on windows with Python 3 * Improve the messages created after the background processes by different modules (such as Backup, Restore, Import/Export, etc.), which does not show short-paths, and xml representable characters for non-ascii characters, when found in the database objects, and the file PATH. Fixes #2174, #1797, #2166, #1940 Initial patch by: Surinder Kumar Reviewed by: Murtuza Zabuawala
76 lines
1.9 KiB
Python
76 lines
1.9 KiB
Python
##########################################################################
|
|
#
|
|
# pgAdmin 4 - PostgreSQL Tools
|
|
#
|
|
# Copyright (C) 2013 - 2017, The pgAdmin Development Team
|
|
# This software is released under the PostgreSQL Licence
|
|
#
|
|
#########################################################################
|
|
|
|
"""This file contains functions fetching different utility paths."""
|
|
|
|
import os
|
|
|
|
from flask_security import current_user, login_required
|
|
|
|
import config
|
|
|
|
|
|
@login_required
|
|
def get_storage_directory():
|
|
if config.SERVER_MODE is not True:
|
|
return None
|
|
|
|
storage_dir = getattr(
|
|
config, 'STORAGE_DIR',
|
|
os.path.join(
|
|
os.path.realpath(
|
|
os.path.expanduser('~/.pgadmin/')
|
|
), 'storage'
|
|
)
|
|
)
|
|
|
|
if storage_dir is None:
|
|
return None
|
|
|
|
username = current_user.email.split('@')[0]
|
|
if len(username) == 0 or username[0].isdigit():
|
|
username = 'pga_user_' + username
|
|
|
|
storage_dir = os.path.join(
|
|
storage_dir.decode('utf-8') if hasattr(storage_dir, 'decode') \
|
|
else storage_dir,
|
|
username
|
|
)
|
|
|
|
if not os.path.exists(storage_dir):
|
|
os.makedirs(storage_dir, int('700', 8))
|
|
|
|
return storage_dir
|
|
|
|
|
|
def init_app(app):
|
|
if config.SERVER_MODE is not True:
|
|
return None
|
|
|
|
storage_dir = getattr(
|
|
config, 'STORAGE_DIR',
|
|
os.path.join(
|
|
os.path.realpath(
|
|
os.path.expanduser('~/.pgadmin/')
|
|
), 'storage'
|
|
)
|
|
)
|
|
|
|
if storage_dir and not os.path.isdir(storage_dir):
|
|
if os.path.exists(storage_dir):
|
|
raise Exception(
|
|
'The path specified for the storage directory is not a directory.'
|
|
)
|
|
os.makedirs(storage_dir, int('700', 8))
|
|
|
|
if storage_dir and not os.access(storage_dir, os.W_OK | os.R_OK):
|
|
raise Exception(
|
|
'The user does not have permission to read and write to the specified storage directory.'
|
|
)
|