Skip to content

Commit 167ac68

Browse files
committed
add default folder option
1 parent 996ced9 commit 167ac68

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ The jupyter-openvscodeserver-proxy can be configures via the following environme
3131
- Use unix sockets for highest security standards.
3232
- `JUPYTER_OPENVSCODE_PROXY_DEBUG` = `'FALSE' | 'TRUE'` , default = `FALSE`
3333
- Enable to print some log messages to stderr.
34+
- `JUPYTER_OPENVSCODE_PROXY_DEFAULT_FOLDER` = `<path>`, default = None
35+
- Specifies the directory that OpenVSCode will use as default folder.
3436

3537
- `JUPYTER_OPENVSCODE_PROXY_SERVER_DATA_DIR` = `<path>`
3638
- Specifies the directory that server data is kept in. If not set the default is used.

jupyter_openvscodeserver_proxy/__init__.py

+12-11
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
if log_debug.casefold() not in ('no', 'false'):
2020
handler = logging.StreamHandler(sys.stderr)
2121
handler.setLevel(logging.DEBUG)
22-
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
22+
formatter = logging.Formatter("[D %(asctime)s %(name)s] %(message)s")
2323
handler.setFormatter(formatter)
2424
logger.addHandler(handler)
2525

@@ -92,14 +92,6 @@ def _get_urlprefix():
9292
url_prefix = os.environ.get('JUPYTERHUB_SERVICE_PREFIX')
9393
return url_prefix
9494

95-
# return url parameters
96-
def _get_urlparams():
97-
global _openvscodeserver_token
98-
url_params = '?' + '&'.join([
99-
'tkn=' + _openvscodeserver_token,
100-
])
101-
return url_params
102-
10395
# return command
10496
def _get_cmd(port, unix_socket):
10597

@@ -129,7 +121,7 @@ def _get_cmd(port, unix_socket):
129121
if supported_args['version']:
130122
if not _is_version_supported(1, 97):
131123
raise NotImplementedError(
132-
'OpenVSCode-Server is not installed in the required version of >= 1.98'
124+
'OpenVSCode-Server is not installed in the required version of >= 1.97'
133125
)
134126
else:
135127
raise NotImplementedError(
@@ -197,7 +189,16 @@ def _get_iconpath():
197189

198190
# return path info = launchers url file including url parameters
199191
def _get_pathinfo():
200-
path_info = 'openvscodeserver' + _get_urlparams()
192+
global _openvscodeserver_token
193+
params = ['tkn=' + _openvscodeserver_token]
194+
195+
default_folder = os.getenv('JUPYTER_OPENVSCODE_PROXY_DEFAULT_FOLDER', None)
196+
if default_folder is not None:
197+
params.append(f'folder={default_folder}')
198+
199+
url_params = '?' + '&'.join(params)
200+
201+
path_info = 'openvscodeserver' + url_params
201202
return path_info
202203

203204
# create random token

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
with open(path.join(HERE, 'README.md'), 'r', encoding='utf-8') as fh:
66
long_description = fh.read()
77

8-
version = '0.9.2'
8+
version = '0.9.3'
99
setup(
1010
name='jupyter-openvscodeserver-proxy',
1111
version=version,

0 commit comments

Comments
 (0)