vscode-offline 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

vscode_offline/app.py

@@ -19,7 +19,7 @@ from vscode_offline.utils import (
     get_host_platform,
     get_vscode_cli_bin,
     get_vscode_commit_from_code_version,
-    get_vscode_commit_from_installer,
+    get_vscode_commit_from_server_installer,
     get_vscode_extensions_config,
     get_vscode_server_home,
 )
@@ -36,7 +36,7 @@ def cmd_download_server(args: Namespace) -> None:
 
     download_vscode_server(
         args.commit,
-        output=args.installer / f"cli-{args.commit}",
+        output=args.installer / f"server-{args.commit}",
         target_platform=args.target_platform,
     )
     extensions_config = Path(args.extensions_config).expanduser()
@@ -49,7 +49,7 @@ def cmd_install_server(args: Namespace) -> None:
     host_platform = get_host_platform()
     if args.commit is None:
         try:
-            args.commit = get_vscode_commit_from_installer(
+            args.commit = get_vscode_commit_from_server_installer(
                 args.installer, host_platform
             )
         except Exception as e:
@@ -59,7 +59,7 @@ def cmd_install_server(args: Namespace) -> None:
 
     install_vscode_server(
         args.commit,
-        cli_installer=args.installer / f"cli-{args.commit}",
+        cli_installer=args.installer / f"server-{args.commit}",
         vscode_cli_bin=get_vscode_cli_bin(args.commit),
         platform=host_platform,
     )

vscode_offline/download.py

@@ -9,6 +9,8 @@ from urllib.request import urlopen
 from vscode_offline.loggers import logger
 from vscode_offline.utils import get_cli_os_arch
 
+_CHUCK_SIZE = 4 * 1024 * 1024  # 4MiB
+
 
 def _download_file(url: str, filename: str) -> None:
     with urlopen(url) as resp:
@@ -23,7 +25,7 @@ def _download_file(url: str, filename: str) -> None:
 
         with reader, open(filename, "wb") as fp:
             while True:
-                chunk = reader.read(1024)
+                chunk = reader.read(_CHUCK_SIZE)
                 if not chunk:
                     break
                 fp.write(chunk)

vscode_offline/utils.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
 import os
+import shutil
 import subprocess
+import sys
 from pathlib import Path
 
 from vscode_offline.loggers import logger
@@ -28,8 +30,12 @@ def get_vscode_extensions_config() -> os.PathLike[str]:
     return p  # default to this path
 
 
-def get_vscode_commit_from_installer(installer: os.PathLike[str], platform: str) -> str:
-    directories = list(Path(installer).glob(f"cli-*/vscode-server-{platform}.tar.gz"))
+def get_vscode_commit_from_server_installer(
+    installer: os.PathLike[str], platform: str
+) -> str:
+    directories = list(
+        Path(installer).glob(f"server-*/vscode-server-{platform}.tar.gz")
+    )
     if len(directories) > 1:
         raise ValueError(
             f"Multiple matching installers found in {installer} for platform {platform}"
@@ -39,16 +45,26 @@ def get_vscode_commit_from_installer(installer: os.PathLike[str], platform: str)
             f"No matching installer found in {installer} for platform {platform}"
         )
 
-    commit = directories[0].parent.name[len("cli-") :]
+    commit = directories[0].parent.name[len("server-") :]
     logger.info(f"Getting commit from {platform} installer: {commit}")
     return commit
 
 
 def get_vscode_commit_from_code_version() -> str | None:
-    res = subprocess.run(["code", "--version"], stdout=subprocess.PIPE)
-    if res.returncode != 0:
+    """Get the current VS Code commit hash by running `code --version`.
+    Returns None if `code` is not found or the output is unexpected.
+    """
+    executable = shutil.which("code")
+    if executable is None:
         return None
-    lines = res.stdout.splitlines()
+    proc = subprocess.run(
+        ["code", "--version"],
+        executable=executable,
+        stdout=subprocess.PIPE,
+    )
+    if proc.returncode != 0:
+        return None
+    lines = proc.stdout.splitlines()
     if len(lines) < 2:
         return None  # Unexpected output
 
@@ -82,6 +98,11 @@ def get_cli_os_arch(platform: str) -> str:
 
 def get_host_platform() -> str:
     """Get the host platform in the format used by VS Code Server install."""
+    if os.name == "nt":
+        if "amd64" in sys.version.lower():
+            return "win32-x64"
+        raise ValueError(f"Unsupported host platform: {os.name}-{sys.version}")
+
     (osname, _, _, _, machine) = os.uname()
 
     if osname.lower() == "linux":

{vscode_offline-0.1.2.dist-info → vscode_offline-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vscode-offline
-Version: 0.1.2
+Version: 0.1.3
 Summary: Download and install VS Code Server for offline environments
 Author: Chuck Fan
 Author-email: Chuck Fan <fanck0605@qq.com>

vscode_offline-0.1.3.dist-info/RECORD

@@ -0,0 +1,11 @@
+vscode_offline/__init__.py,sha256=dr6Jtj0XT9eQEC4fzNigEYsAIEfCsaom3HDbUsS-2O4,57
+vscode_offline/app.py,sha256=MLYg_2q3pudTL0zBAWTRSjVM_8zDccLIZt0s00xvT7Q,5686
+vscode_offline/download.py,sha256=hImUW23npX0hgNMcJ2E3nRLbW8fvzeIFEovg0mWzm9U,3763
+vscode_offline/install.py,sha256=UNgLnMAAZEOtX4s8v6QlmuIHPf3aeuXrCWfC6_TEM-0,3488
+vscode_offline/loggers.py,sha256=vX91NMtNo1xfxq5y4BCtm_uhCTKtCODqBJHNvcT7JdQ,104
+vscode_offline/utils.py,sha256=XknMz1aBMyyTvWG-szE_0eMG3KOdpl9aAeX3E5BrDAI,3542
+vscode_offline-0.1.3.dist-info/licenses/LICENSE,sha256=pUIXFkLeTS986b7dopOVLyuw72fJsUxhl8H3rEMIycA,1053
+vscode_offline-0.1.3.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
+vscode_offline-0.1.3.dist-info/entry_points.txt,sha256=zIMeh_ENKKzlt9lDao8icofSI0TeCQxH8eCwxIRI2G8,56
+vscode_offline-0.1.3.dist-info/METADATA,sha256=hjeP62mRkggLHpIypE8RgSNXUceC9PYGYBWCrhvabak,2492
+vscode_offline-0.1.3.dist-info/RECORD,,

vscode_offline-0.1.2.dist-info/RECORD

@@ -1,11 +0,0 @@
-vscode_offline/__init__.py,sha256=dr6Jtj0XT9eQEC4fzNigEYsAIEfCsaom3HDbUsS-2O4,57
-vscode_offline/app.py,sha256=CQbc8dFATwXV2VqSZGJAquTIe7sjae3ZGlmoQSllB-I,5666
-vscode_offline/download.py,sha256=R7VjdqbMZ1NLOrDF6OEhMDWCHY1MaprqALX7M_UD3Uo,3717
-vscode_offline/install.py,sha256=UNgLnMAAZEOtX4s8v6QlmuIHPf3aeuXrCWfC6_TEM-0,3488
-vscode_offline/loggers.py,sha256=vX91NMtNo1xfxq5y4BCtm_uhCTKtCODqBJHNvcT7JdQ,104
-vscode_offline/utils.py,sha256=tI1gktyhkRiTfBaELsNNTa6Fk4y5hyAtoebERfsyxS4,3014
-vscode_offline-0.1.2.dist-info/licenses/LICENSE,sha256=pUIXFkLeTS986b7dopOVLyuw72fJsUxhl8H3rEMIycA,1053
-vscode_offline-0.1.2.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
-vscode_offline-0.1.2.dist-info/entry_points.txt,sha256=zIMeh_ENKKzlt9lDao8icofSI0TeCQxH8eCwxIRI2G8,56
-vscode_offline-0.1.2.dist-info/METADATA,sha256=PlAToQnUc7dJrK1iuHRUajFY5Gm__yBOb4Wj2J3Gv9E,2492
-vscode_offline-0.1.2.dist-info/RECORD,,