@@ -36,15 +36,20 @@ import { Logger } from "../logger/logger";
3636
3737export async function installIdfGit (
3838 idfToolsDir : string ,
39+ mirror : ESP . IdfMirror ,
3940 progress ?: Progress < { message : string ; increment ?: number } > ,
4041 cancelToken ?: CancellationToken
4142) {
4243 const downloadManager = new DownloadManager ( idfToolsDir ) ;
4344 const installManager = new InstallManager ( idfToolsDir ) ;
45+ let gitURLToUse =
46+ mirror === ESP . IdfMirror . Github
47+ ? ESP . URL . IDF_EMBED_GIT . GITHUB_EMBED_GIT_URL
48+ : ESP . URL . IDF_EMBED_GIT . IDF_EMBED_GIT_URL ;
4449 const idfGitZipPath = join (
4550 idfToolsDir ,
4651 "dist" ,
47- basename ( ESP . URL . IDF_EMBED_GIT . IDF_EMBED_GIT_URL )
52+ basename ( gitURLToUse )
4853 ) ;
4954 const idfGitDestPath = join (
5055 idfToolsDir ,
@@ -54,7 +59,7 @@ export async function installIdfGit(
5459 ) ;
5560 const resultGitPath = join ( idfGitDestPath , "cmd" , "git.exe" ) ;
5661 const pkgProgress = new PackageProgress (
57- basename ( ESP . URL . IDF_EMBED_GIT . IDF_EMBED_GIT_URL ) ,
62+ basename ( gitURLToUse ) ,
5863 sendIdfGitDownloadProgress ,
5964 null ,
6065 sendIdfGitDownloadDetail ,
@@ -84,7 +89,7 @@ export async function installIdfGit(
8489 OutputChannel . appendLine ( msgDownload ) ;
8590 Logger . info ( msgDownload ) ;
8691 await downloadManager . downloadWithRetries (
87- ESP . URL . IDF_EMBED_GIT . IDF_EMBED_GIT_URL ,
92+ gitURLToUse ,
8893 join ( idfToolsDir , "dist" ) ,
8994 pkgProgress ,
9095 cancelToken
@@ -113,15 +118,24 @@ export async function installIdfGit(
113118export async function installIdfPython (
114119 idfToolsDir : string ,
115120 idfVersion : string ,
121+ mirror : ESP . IdfMirror ,
116122 progress ?: Progress < { message : string ; increment ?: number } > ,
117123 cancelToken ?: CancellationToken
118124) {
119125 const downloadManager = new DownloadManager ( idfToolsDir ) ;
120126 const installManager = new InstallManager ( idfToolsDir ) ;
121- const pythonURLToUse =
122- idfVersion >= "5.0"
123- ? ESP . URL . IDF_EMBED_PYTHON . IDF_EMBED_PYTHON_URL
124- : ESP . URL . OLD_IDF_EMBED_PYTHON . IDF_EMBED_PYTHON_URL ;
127+ let pythonURLToUse : string ;
128+ if ( idfVersion >= "5.0" ) {
129+ pythonURLToUse =
130+ mirror === ESP . IdfMirror . Github
131+ ? ESP . URL . IDF_EMBED_PYTHON . GITHUB_EMBED_PYTHON_URL
132+ : ESP . URL . IDF_EMBED_PYTHON . IDF_EMBED_PYTHON_URL ;
133+ } else {
134+ pythonURLToUse =
135+ mirror === ESP . IdfMirror . Github
136+ ? ESP . URL . OLD_IDF_EMBED_PYTHON . GITHUB_EMBED_PYTHON_URL
137+ : ESP . URL . OLD_IDF_EMBED_PYTHON . IDF_EMBED_PYTHON_URL ;
138+ }
125139 const idfPyZipPath = join ( idfToolsDir , "dist" , basename ( pythonURLToUse ) ) ;
126140 const pkgProgress = new PackageProgress (
127141 basename ( pythonURLToUse ) ,
0 commit comments