mirror of
https://github.com/safing/portmaster
synced 2025-04-21 11:29:09 +00:00
* Move portbase into monorepo * Add new simple module mgr * [WIP] Switch to new simple module mgr * Add StateMgr and more worker variants * [WIP] Switch more modules * [WIP] Switch more modules * [WIP] swtich more modules * [WIP] switch all SPN modules * [WIP] switch all service modules * [WIP] Convert all workers to the new module system * [WIP] add new task system to module manager * [WIP] Add second take for scheduling workers * [WIP] Add FIXME for bugs in new scheduler * [WIP] Add minor improvements to scheduler * [WIP] Add new worker scheduler * [WIP] Fix more bug related to new module system * [WIP] Fix start handing of the new module system * [WIP] Improve startup process * [WIP] Fix minor issues * [WIP] Fix missing subsystem in settings * [WIP] Initialize managers in constructor * [WIP] Move module event initialization to constrictors * [WIP] Fix setting for enabling and disabling the SPN module * [WIP] Move API registeration into module construction * [WIP] Update states mgr for all modules * [WIP] Add CmdLine operation support * Add state helper methods to module group and instance * Add notification and module status handling to status package * Fix starting issues * Remove pilot widget and update security lock to new status data * Remove debug logs * Improve http server shutdown * Add workaround for cleanly shutting down firewall+netquery * Improve logging * Add syncing states with notifications for new module system * Improve starting, stopping, shutdown; resolve FIXMEs/TODOs * [WIP] Fix most unit tests * Review new module system and fix minor issues * Push shutdown and restart events again via API * Set sleep mode via interface * Update example/template module * [WIP] Fix spn/cabin unit test * Remove deprecated UI elements * Make log output more similar for the logging transition phase * Switch spn hub and observer cmds to new module system * Fix log sources * Make worker mgr less error prone * Fix tests and minor issues * Fix observation hub * Improve shutdown and restart handling * Split up big connection.go source file * Move varint and dsd packages to structures repo * Improve expansion test * Fix linter warnings * Fix interception module on windows * Fix linter errors --------- Co-authored-by: Vladimir Stoilov <vladimir@safing.io>
57 lines
1.8 KiB
Go
57 lines
1.8 KiB
Go
package updater
|
|
|
|
import (
|
|
"path"
|
|
"regexp"
|
|
"strings"
|
|
)
|
|
|
|
var (
|
|
fileVersionRegex = regexp.MustCompile(`_v[0-9]+-[0-9]+-[0-9]+(-[a-z]+)?`)
|
|
rawVersionRegex = regexp.MustCompile(`^[0-9]+\.[0-9]+\.[0-9]+(-[a-z]+)?$`)
|
|
)
|
|
|
|
// GetIdentifierAndVersion splits the given file path into its identifier and version.
|
|
func GetIdentifierAndVersion(versionedPath string) (identifier, version string, ok bool) {
|
|
dirPath, filename := path.Split(versionedPath)
|
|
|
|
// Extract version from filename.
|
|
rawVersion := fileVersionRegex.FindString(filename)
|
|
if rawVersion == "" {
|
|
// No version present in file, making it invalid.
|
|
return "", "", false
|
|
}
|
|
|
|
// Trim the `_v` that gets caught by the regex and
|
|
// replace `-` with `.` to get the version string.
|
|
version = strings.Replace(strings.TrimLeft(rawVersion, "_v"), "-", ".", 2)
|
|
|
|
// Put the filename back together without version.
|
|
i := strings.Index(filename, rawVersion)
|
|
if i < 0 {
|
|
// extracted version not in string (impossible)
|
|
return "", "", false
|
|
}
|
|
filename = filename[:i] + filename[i+len(rawVersion):]
|
|
|
|
// Put the full path back together and return it.
|
|
// `dirPath + filename` is guaranteed by path.Split()
|
|
return dirPath + filename, version, true
|
|
}
|
|
|
|
// GetVersionedPath combines the identifier and version and returns it as a file path.
|
|
func GetVersionedPath(identifier, version string) (versionedPath string) {
|
|
identifierPath, filename := path.Split(identifier)
|
|
|
|
// Split the filename where the version should go.
|
|
splittedFilename := strings.SplitN(filename, ".", 2)
|
|
// Replace `.` with `-` for the filename format.
|
|
transformedVersion := strings.Replace(version, ".", "-", 2)
|
|
|
|
// Put everything back together and return it.
|
|
versionedPath = identifierPath + splittedFilename[0] + "_v" + transformedVersion
|
|
if len(splittedFilename) > 1 {
|
|
versionedPath += "." + splittedFilename[1]
|
|
}
|
|
return versionedPath
|
|
}
|