Update references to GenerateBinaryNameFromPath

safing · Dec 15, 2023 · 5efed14 · 5efed14
1 parent 2a04bf3
commit 5efed14
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/process/tags/appimage_unix.go b/process/tags/appimage_unix.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/safing/portbase/log"
-	"github.com/safing/portbase/utils/osdetail"
 	"github.com/safing/portmaster/process"
 	"github.com/safing/portmaster/profile"
+	"github.com/safing/portmaster/profile/icons"
 )
 
 func init() {
@@ -124,7 +124,7 @@ func (h *AppImageHandler) CreateProfile(p *process.Process) *profile.Profile {
 	if tag, ok := p.GetTag(appImagePathTagKey); ok {
 		return profile.New(&profile.Profile{
 			Source:              profile.SourceLocal,
-			Name:                osdetail.GenerateBinaryNameFromPath(p.Path),
+			Name:                icons.GenerateBinaryNameFromPath(p.Path),
 			PresentationPath:    p.Path,
 			UsePresentationPath: true,
 			Fingerprints: []profile.Fingerprint{
@@ -141,7 +141,7 @@ func (h *AppImageHandler) CreateProfile(p *process.Process) *profile.Profile {
 	if tag, ok := p.GetTag(appImageMountIDTagKey); ok {
 		return profile.New(&profile.Profile{
 			Source:              profile.SourceLocal,
-			Name:                osdetail.GenerateBinaryNameFromPath(p.Path),
+			Name:                icons.GenerateBinaryNameFromPath(p.Path),
 			PresentationPath:    p.Path,
 			UsePresentationPath: true,
 			Fingerprints: []profile.Fingerprint{

diff --git a/process/tags/flatpak_unix.go b/process/tags/flatpak_unix.go
@@ -3,9 +3,9 @@ package tags
 import (
 	"strings"
 
-	"github.com/safing/portbase/utils/osdetail"
 	"github.com/safing/portmaster/process"
 	"github.com/safing/portmaster/profile"
+	"github.com/safing/portmaster/profile/icons"
 )
 
 func init() {
@@ -69,7 +69,7 @@ func (h *flatpakHandler) CreateProfile(p *process.Process) *profile.Profile {
 	if tag, ok := p.GetTag(flatpakIDTagKey); ok {
 		return profile.New(&profile.Profile{
 			Source:              profile.SourceLocal,
-			Name:                osdetail.GenerateBinaryNameFromPath(p.Path),
+			Name:                icons.GenerateBinaryNameFromPath(p.Path),
 			PresentationPath:    p.Path,
 			UsePresentationPath: true,
 			Fingerprints: []profile.Fingerprint{

diff --git a/process/tags/interpreter_unix.go b/process/tags/interpreter_unix.go
@@ -12,9 +12,9 @@ import (
 
 	"github.com/google/shlex"
 
-	"github.com/safing/portbase/utils/osdetail"
 	"github.com/safing/portmaster/process"
 	"github.com/safing/portmaster/profile"
+	"github.com/safing/portmaster/profile/icons"
 )
 
 func init() {
@@ -161,7 +161,7 @@ func (h *InterpHandler) CreateProfile(p *process.Process) *profile.Profile {
 			for _, ext := range it.Extensions {
 				scriptName, _ = strings.CutSuffix(scriptName, ext)
 			}
-			scriptName = osdetail.GenerateBinaryNameFromPath(scriptName)
+			scriptName = icons.GenerateBinaryNameFromPath(scriptName)
 
 			return profile.New(&profile.Profile{
 				Source:              profile.SourceLocal,

diff --git a/process/tags/snap_unix.go b/process/tags/snap_unix.go
@@ -3,9 +3,9 @@ package tags
 import (
 	"strings"
 
-	"github.com/safing/portbase/utils/osdetail"
 	"github.com/safing/portmaster/process"
 	"github.com/safing/portmaster/profile"
+	"github.com/safing/portmaster/profile/icons"
 )
 
 func init() {
@@ -117,7 +117,7 @@ func (h *SnapHandler) CreateProfile(p *process.Process) *profile.Profile {
 
 		return profile.New(&profile.Profile{
 			Source:              profile.SourceLocal,
-			Name:                osdetail.GenerateBinaryNameFromPath(tag.Value),
+			Name:                icons.GenerateBinaryNameFromPath(tag.Value),
 			PresentationPath:    p.Path,
 			UsePresentationPath: hasVersion,
 			Fingerprints: []profile.Fingerprint{

diff --git a/process/tags/svchost_windows.go b/process/tags/svchost_windows.go
@@ -36,7 +36,7 @@ func (h *SVCHostTagHandler) Name() string {
 // of this handler.
 func (h *SVCHostTagHandler) TagDescriptions() []process.TagDescription {
 	return []process.TagDescription{
-		process.TagDescription{
+		{
 			ID:          svchostTagKey,
 			Name:        "SvcHost Service Name",
 			Description: "Name of a service running in svchost.exe as reported by Windows.",
@@ -86,10 +86,10 @@ func (h *SVCHostTagHandler) CreateProfile(p *process.Process) *profile.Profile {
 		// Create new profile based on tag.
 		newProfile := profile.New(&profile.Profile{
 			Source:              profile.SourceLocal,
-			Name:                "Windows Service: " + osdetail.GenerateBinaryNameFromPath(tag.Value),
+			Name:                "Windows Service: " + icons.GenerateBinaryNameFromPath(tag.Value),
 			UsePresentationPath: false,
 			Fingerprints: []profile.Fingerprint{
-				profile.Fingerprint{
+				{
 					Type:      profile.FingerprintTypeTagID,
 					Key:       tag.Key,
 					Operation: profile.FingerprintOperationEqualsID,

diff --git a/process/tags/winstore_windows.go b/process/tags/winstore_windows.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/safing/portbase/log"
 	"github.com/safing/portbase/utils"
-	"github.com/safing/portbase/utils/osdetail"
 	"github.com/safing/portmaster/process"
 	"github.com/safing/portmaster/profile"
+	"github.com/safing/portmaster/profile/icons"
 )
 
 func init() {
@@ -101,7 +101,7 @@ func (h *WinStoreHandler) CreateProfile(p *process.Process) *profile.Profile {
 	if tag, ok := p.GetTag(winStoreAppNameTagKey); ok {
 		return profile.New(&profile.Profile{
 			Source:              profile.SourceLocal,
-			Name:                osdetail.GenerateBinaryNameFromPath(tag.Value),
+			Name:                icons.GenerateBinaryNameFromPath(tag.Value),
 			PresentationPath:    p.Path,
 			UsePresentationPath: true,
 			Fingerprints: []profile.Fingerprint{