Improve code

Author: patrick91

package.json

@@ -2,7 +2,7 @@
     "name": "python-dependencies-vscode",
     "displayName": "Python Dependencies",
     "description": "Utilities for managing Python dependencies",
-    "version": "0.0.15",
+    "version": "0.0.16",
     "publisher": "patrick91",
     "engines": {
         "vscode": "^1.53.0"

src/core/get-installed-versions.ts

@@ -0,0 +1,29 @@
+import * as execa from "execa";
+import { workspace } from "vscode";
+import { normalize } from "./normalize";
+
+export const getInstalledVersions = async (path: string) => {
+    let command = "pip list";
+
+    const { pythonPath } = workspace.getConfiguration("python");
+
+    if (pythonPath) {
+        command = path + "/" + pythonPath.replace(/python$/, "") + command;
+    }
+
+    const { stdout } = await execa.command(command, {
+        cwd: path,
+    });
+
+    const lines = stdout.split("\n");
+
+    const installedVersions: { [key: string]: string } = {};
+
+    lines.forEach((line) => {
+        const [name, version] = line.split(/\s+/).map((x) => x.trim());
+
+        installedVersions[normalize(name)] = version;
+    });
+
+    return installedVersions;
+};

src/core/listener.ts

@@ -1,11 +1,11 @@
 import { TextEditor, window, TextEditorDecorationType } from "vscode";
 import { Dependency } from "../types";
 import { findDependencies } from "../utils/parsing/toml";
-import { getInstalledVersions } from "./poetry";
 import { getInfo } from "./api";
 import { getDecoration } from "./decorations";
 import { dirname } from "path";
 import { findDependenciesFromRequirementsTxt } from "../utils/parsing/requirements-txt";
+import { getInstalledVersions } from "./get-installed-versions";
 
 let decorationType: TextEditorDecorationType | null = null;
 
@@ -17,7 +17,7 @@ const updateVersions = (
         deps.map(async (dep) => {
             const info = await getInfo(dep.name);
 
-            // dep.version.installed = installedVersions[dep.name];
+            dep.version.installed = installedVersions[dep.name];
             dep.version.latest = info.version;
             dep.summary = info.summary;
         }),
@@ -29,10 +29,9 @@ const decorateEditor = async (deps: Dependency[], editor: TextEditor) => {
         decorationType.dispose();
     }
 
-    const installedVersions = {} 
-    // await getInstalledVersions(
-    //     dirname(editor.document.fileName),
-    // );
+    const installedVersions = await getInstalledVersions(
+        dirname(editor.document.fileName),
+    );
 
     await updateVersions(deps, installedVersions);
 

src/core/normalize.ts

@@ -0,0 +1,2 @@
+export const normalize = (dependencyName: string) =>
+    dependencyName.toLowerCase();

src/core/poetry.ts

@@ -1,3 +1,4 @@
+import { normalize } from "../../core/normalize";
 import { Dependency } from "../../types";
 import { splitFirst } from "../strings";
 
@@ -26,7 +27,7 @@ const parseDependency = (line: string, lineNumber: number) => {
         : JSON.parse(info);
 
     return {
-        name,
+        name: normalize(name),
         version: {
             toml: version,
         },