From 665c344ae48b570a6465f4fbe02d6d08857501dd Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Thu, 20 Jul 2023 22:54:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BE=9D=E8=B5=96=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=B7=B2=E7=BB=8F=E5=AE=89=E8=A3=85=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/data/dependence.ts     |  2 +-
 back/services/dependence.ts | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/back/data/dependence.ts b/back/data/dependence.ts
index 5db9c297..296452fb 100644
--- a/back/data/dependence.ts
+++ b/back/data/dependence.ts
@@ -48,7 +48,7 @@ export enum InstallDependenceCommandTypes {
 
 export enum GetDependenceCommandTypes {
   'pnpm ls -g ',
-  'pip3 list --disable-pip-version-check',
+  'pip3 show --disable-pip-version-check',
   'apk info',
 }
 
diff --git a/back/services/dependence.ts b/back/services/dependence.ts
index 2e440ec3..af70bb0b 100644
--- a/back/services/dependence.ts
+++ b/back/services/dependence.ts
@@ -23,7 +23,7 @@ export default class DependenceService {
   constructor(
     @Inject('logger') private logger: winston.Logger,
     private sockService: SockService,
-  ) {}
+  ) { }
 
   public async create(payloads: Dependence[]): Promise<Dependence[]> {
     const tabs = payloads.map((x) => {
@@ -191,16 +191,27 @@ export default class DependenceService {
         if (isInstall) {
           const getCommandPrefix = GetDependenceCommandTypes[dependency.type];
           const depVersionStr = versionDependenceCommandTypes[dependency.type];
-          const [_depName] = dependency.name.trim().split(depVersionStr);
+          const [_depName, _depVersion] = dependency.name
+            .trim()
+            .split(depVersionStr);
+          const isNodeDependence = dependency.type === DependenceTypes.nodejs;
+          const isLinuxDependence = dependency.type === DependenceTypes.linux;
+          const isPythonDependence = dependency.type === DependenceTypes.python3;
           const depInfo = (
             await promiseExecSuccess(
-              dependency.type === DependenceTypes.linux
-                ? `${getCommandPrefix} ${_depName}`
-                : `${getCommandPrefix} | grep "${_depName}"`,
+              isNodeDependence
+                ? `${getCommandPrefix} | grep "${_depName}" | head -1`
+                : `${getCommandPrefix} ${_depName}`,
             )
           ).replace(/\s{2,}/, ' ');
 
-          if (depInfo) {
+          if (
+            depInfo &&
+            ((isNodeDependence && depInfo.split(' ')?.[0] === _depName) ||
+              (isLinuxDependence && depInfo.toLocaleLowerCase().includes('installed')) ||
+              isPythonDependence) &&
+            (!_depVersion || depInfo.includes(_depVersion))
+          ) {
             const endTime = dayjs();
             const _message = `检测到已经安装 ${_depName}\n\n${depInfo}\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format(
               'YYYY-MM-DD HH:mm:ss',