refactor: add comment for cmd parse

This commit is contained in:
Sahilb315
2025-06-10 22:59:10 +05:30
parent a5ae1e50c0
commit af27701b8d
3 changed files with 11 additions and 9 deletions
+2 -1
View File
@@ -8,6 +8,7 @@ import (
packagev1 "buf.build/gen/go/safedep/api/protocolbuffers/go/safedep/messages/package/v1"
"github.com/google/osv-scanner/pkg/lockfile"
"github.com/safedep/dry/log"
)
type ExtractorConfig struct {
@@ -52,7 +53,7 @@ func (e *extractor) ExtractManifest() ([]*packagev1.PackageVersion, error) {
// Extract packages from this lockfile
packages, err := e.extractFromLockfile(filePath)
if err != nil {
fmt.Printf("Warning: failed to extract from %s: %v\n", filePath, err)
log.Warnf("failed to extract from %s: %v\n", filePath, err)
continue
}
+2 -2
View File
@@ -50,7 +50,7 @@ func (npm *npmPackageManager) ParseCommand(args []string) (*ParsedCommand, error
command := Command{Exe: npm.Config.CommandName, Args: args}
// No command specified
// Since manifest-based installs like 'npm i' are now valid commands
if len(args) < 1 {
return &ParsedCommand{
Command: command,
@@ -61,7 +61,7 @@ func (npm *npmPackageManager) ParseCommand(args []string) (*ParsedCommand, error
var packages []string
var isManifestInstall bool
var foundInstallCmd bool
for idx, arg := range args {
if slices.Contains(npm.Config.InstallCommands, arg) {
foundInstallCmd = true
+7 -6
View File
@@ -43,6 +43,7 @@ func (pip *pipPackageManager) ParseCommand(args []string) (*ParsedCommand, error
}
command := Command{Exe: pip.Config.CommandName, Args: args}
// Since manifest-based installs like 'npm i' are now valid commands
if len(args) < 1 {
return &ParsedCommand{
Command: command,
@@ -60,7 +61,7 @@ func (pip *pipPackageManager) ParseCommand(args []string) (*ParsedCommand, error
// Check for manifest-based installation flags
for i := idx + 1; i < len(args); i++ {
currentArg := args[i]
// Handle -r/--requirement flags
if currentArg == "-r" || currentArg == "--requirement" {
isManifestInstall = true
@@ -70,28 +71,28 @@ func (pip *pipPackageManager) ParseCommand(args []string) (*ParsedCommand, error
}
continue
}
// Handle combined -r flag (e.g., -rrequirements.txt)
if strings.HasPrefix(currentArg, "-r") && len(currentArg) > 2 {
isManifestInstall = true
manifestFiles = append(manifestFiles, currentArg[2:])
continue
}
// Handle other flags that indicate manifest installation
if currentArg == "-e" || currentArg == "--editable" ||
currentArg == "-c" || currentArg == "--constraint" {
currentArg == "-c" || currentArg == "--constraint" {
if i+1 < len(args) {
i++ // skip the next argument
}
continue
}
// If it's a flag, skip it
if strings.HasPrefix(currentArg, "-") {
continue
}
// Otherwise, it's a package name
packages = append(packages, currentArg)
}