vscode-offline 0.1.7__tar.gz → 0.1.8__tar.gz

{vscode_offline-0.1.7 → vscode_offline-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vscode-offline
-Version: 0.1.7
+Version: 0.1.8
 Summary: Download and install VS Code for offline environments
 Project-URL: Homepage, https://github.com/fanck0605/vscode-offline
 Author-email: Chuck Fan <fanck0605@qq.com>
@@ -51,7 +51,7 @@ pip install -U vscode-offline
 vscode-offline download-all --client-platform win32-x64 --server-platform linux-x64
 ```
 
-（3）复制 `./vscode-offline-installer` 到内网 Windows 机器，安装 `client-<version>` 下的 VS Code，然后执行如下命令安装所有插件
+（3）复制 `./vscode-offline-installer` 到内网 Windows 机器，安装 `./vscode-offline-installer/<version>` 下的 VS Code，然后执行如下命令安装所有插件
 
 ```shell
 vscode-offline install-extensions --installer ./vscode-offline-installer

{vscode_offline-0.1.7 → vscode_offline-0.1.8}/README.md

@@ -28,7 +28,7 @@ pip install -U vscode-offline
 vscode-offline download-all --client-platform win32-x64 --server-platform linux-x64
 ```
 
-（3）复制 `./vscode-offline-installer` 到内网 Windows 机器，安装 `client-<version>` 下的 VS Code，然后执行如下命令安装所有插件
+（3）复制 `./vscode-offline-installer` 到内网 Windows 机器，安装 `./vscode-offline-installer/<version>` 下的 VS Code，然后执行如下命令安装所有插件
 
 ```shell
 vscode-offline install-extensions --installer ./vscode-offline-installer

{vscode_offline-0.1.7 → vscode_offline-0.1.8}/src/vscode_offline/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.7'
-__version_tuple__ = version_tuple = (0, 1, 7)
+__version__ = version = '0.1.8'
+__version_tuple__ = version_tuple = (0, 1, 8)
 
 __commit_id__ = commit_id = None

{vscode_offline-0.1.7 → vscode_offline-0.1.8}/src/vscode_offline/app.py

@@ -37,7 +37,7 @@ def cmd_download_server(args: Namespace) -> None:
 
     download_vscode_server(
         args.code_version,
-        output=args.installer / f"server-{args.code_version.replace(':', '-')}",
+        output=args.installer / args.code_version.replace(":", "-"),
         platform=get_server_platform(args.platform),
     )
     extensions_config = Path(args.extensions_config).expanduser()
@@ -63,7 +63,7 @@ def cmd_install_server(args: Namespace) -> None:
             ) from None
 
     vscode_server_home = install_vscode_server(
-        server_installer=args.installer / f"server-{args.code_version}",
+        server_installer=args.installer / args.code_version.replace(":", "-"),
         platform=get_server_platform(host_platform),
     )
     install_vscode_extensions(
@@ -104,7 +104,7 @@ def cmd_download_client(args: Namespace) -> None:
 
     download_vscode_client(
         args.code_version,
-        output=args.installer / f"client-{args.code_version.replace(':', '-')}",
+        output=args.installer / args.code_version.replace(":", "-"),
         platform=get_client_platform(args.platform),
     )
     extensions_config = Path(args.extensions_config).expanduser()
@@ -127,12 +127,12 @@ def cmd_download_all(args: Namespace) -> None:
 
     download_vscode_server(
         args.code_version,
-        output=args.installer / f"server-{args.code_version.replace(':', '-')}",
+        output=args.installer / args.code_version.replace(":", "-"),
         platform=get_server_platform(args.server_platform),
     )
     download_vscode_client(
         args.code_version,
-        output=args.installer / f"client-{args.code_version.replace(':', '-')}",
+        output=args.installer / args.code_version.replace(":", "-"),
         platform=get_client_platform(args.client_platform),
     )
     extensions_config = Path(args.extensions_config).expanduser()

{vscode_offline-0.1.7 → vscode_offline-0.1.8}/src/vscode_offline/download.py

@@ -4,7 +4,6 @@ import json
 import os
 from collections.abc import Set as AbstractSet
 from gzip import GzipFile
-from io import DEFAULT_BUFFER_SIZE
 from pathlib import Path
 from urllib.error import HTTPError
 from urllib.request import urlopen
@@ -12,6 +11,8 @@ from urllib.request import urlopen
 from vscode_offline.loggers import logger
 from vscode_offline.utils import extract_filename_from_headers, get_cli_platform
 
+_DOWNLOAD_CHUNK_SIZE = 4 * 1024 * 1024  # 4 MiB
+
 
 def _download_file_once(
     url: str,
@@ -45,7 +46,7 @@ def _download_file_once(
         tmp_file_path = Path(directory).joinpath(f"{filename}.tmp")
         with reader, tmp_file_path.open("wb") as fp:
             while True:
-                chunk = reader.read(DEFAULT_BUFFER_SIZE)
+                chunk = reader.read(_DOWNLOAD_CHUNK_SIZE)
                 if not chunk:
                     break
                 fp.write(chunk)

{vscode_offline-0.1.7 → vscode_offline-0.1.8}/src/vscode_offline/utils.py

@@ -38,9 +38,7 @@ def get_vscode_extensions_config() -> os.PathLike[str]:
 def get_vscode_version_from_server_installer(
     installer: os.PathLike[str], platform: str
 ) -> str:
-    directories = list(
-        Path(installer).glob(f"server-*/vscode-server-{platform}.tar.gz")
-    )
+    directories = list(Path(installer).glob(f"*/vscode-server-{platform}.tar.gz"))
     if len(directories) > 1:
         raise ValueError(
             f"Multiple matching installers found in {installer} for platform {platform}"
@@ -50,9 +48,9 @@ def get_vscode_version_from_server_installer(
             f"No matching installer found in {installer} for platform {platform}"
         )
 
-    version = directories[0].parent.name[len("server-") :]
+    version = directories[0].parent.name
     logger.info(f"Getting version from {platform} installer: {version}")
-    return version
+    return version.replace("commit-", "commit:")
 
 
 def get_default_code_version() -> str | None:

{vscode_offline-0.1.7 → vscode_offline-0.1.8}/tests/test_utils.py

@@ -1,4 +1,12 @@
-from vscode_offline.utils import extract_filename_from_headers
+import tempfile
+from pathlib import Path
+
+import pytest
+
+from vscode_offline.utils import (
+    extract_filename_from_headers,
+    get_vscode_version_from_server_installer,
+)
 
 
 def test_extract_filename_from_headers() -> None:
@@ -46,3 +54,36 @@ def test_get_filename_from_vsix_download_response() -> None:
         extract_filename_from_headers(headers)
         == "yzhang.markdown-all-in-one-3.6.3.vsix"
     )
+
+
+def test_get_vscode_version_from_server_installer_success() -> None:
+    with tempfile.TemporaryDirectory() as tmpdir:
+        base = Path(tmpdir)
+        version_dir = base / "commit-1234567890abcdef"
+        version_dir.mkdir()
+        (version_dir / "vscode-server-linux-x64.tar.gz").touch()
+        result = get_vscode_version_from_server_installer(base, "linux-x64")
+        assert result == "commit:1234567890abcdef"
+
+
+def test_get_vscode_version_from_server_installer_multiple_found() -> None:
+    with tempfile.TemporaryDirectory() as tmpdir:
+        base = Path(tmpdir)
+        v1 = base / "commit-1111111111111111"
+        v2 = base / "commit-2222222222222222"
+        v1.mkdir()
+        v2.mkdir()
+        (v1 / "vscode-server-linux-x64.tar.gz").touch()
+        (v2 / "vscode-server-linux-x64.tar.gz").touch()
+        with pytest.raises(ValueError, match="Multiple matching installers found"):
+            get_vscode_version_from_server_installer(base, "linux-x64")
+
+
+def test_get_vscode_version_from_server_installer_none_found() -> None:
+    with tempfile.TemporaryDirectory() as tmpdir:
+        base = Path(tmpdir)
+        version_dir = base / "commit-1234567890abcdef"
+        version_dir.mkdir()
+        (version_dir / "vscode-server-linux-arm64.tar.gz").touch()
+        with pytest.raises(ValueError, match="No matching installer found"):
+            get_vscode_version_from_server_installer(base, "linux-x64")