github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Adapt updates package to new updater module in portbase, clean up

Browse Source
This commit is contained in:
Daniel
2019-10-25 13:28:15 +02:00
parent 92ccb36952
commit bfde6cb044
21 changed files with 455 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
updates/get.go
View File

@@ -1,107 +1,38 @@
package updates
import (
"errors"
"fmt"
"os"
"path"
"path/filepath"
"runtime"
"github.com/safing/portbase/log"
)
// Errors
var (
ErrNotFound = errors.New("the requested file could not be found")
ErrNotAvailableLocally = errors.New("the requested file is not available locally")
"github.com/safing/portbase/updater"
)
// GetPlatformFile returns the latest platform specific file identified by the given identifier.
func GetPlatformFile(identifier string) (*File, error) {
func GetPlatformFile(identifier string) (*updater.File, error) {
identifier = path.Join(fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH), identifier)
// From https://golang.org/pkg/runtime/#GOARCH
// GOOS is the running program's operating system target: one of darwin, freebsd, linux, and so on.
// GOARCH is the running program's architecture target: one of 386, amd64, arm, s390x, and so on.
return loadOrFetchFile(identifier, true)
}
// GetLocalPlatformFile returns the latest platform specific file identified by the given identifier, that is available locally.
func GetLocalPlatformFile(identifier string) (*File, error) {
identifier = path.Join(fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH), identifier)
// From https://golang.org/pkg/runtime/#GOARCH
// GOOS is the running program's operating system target: one of darwin, freebsd, linux, and so on.
// GOARCH is the running program's architecture target: one of 386, amd64, arm, s390x, and so on.
return loadOrFetchFile(identifier, false)
file, err := registry.GetFile(identifier)
if err != nil {
return nil, err
}
module.TriggerEvent(eventVersionUpdate, nil)
return file, nil
}
// GetFile returns the latest generic file identified by the given identifier.
func GetFile(identifier string) (*File, error) {
func GetFile(identifier string) (*updater.File, error) {
identifier = path.Join("all", identifier)
return loadOrFetchFile(identifier, true)
}
// GetLocalFile returns the latest generic file identified by the given identifier, that is available locally.
func GetLocalFile(identifier string) (*File, error) {
identifier = path.Join("all", identifier)
return loadOrFetchFile(identifier, false)
}
func getLatestFilePath(identifier string) (versionedFilePath, version string, stable bool, ok bool) {
updatesLock.RLock()
defer updatesLock.RUnlock()
version, ok = stableUpdates[identifier]
if !ok {
version, ok = localUpdates[identifier]
if !ok {
log.Tracef("updates: file %s does not exist", identifier)
return "", "", false, false
// TODO: if in development mode, reload latest index to check for newly sideloaded updates
// err := reloadLatest()
}
}
// TODO: Fix for stable release
return GetVersionedPath(identifier, version), version, false, true
}
func loadOrFetchFile(identifier string, fetch bool) (*File, error) {
versionedFilePath, version, stable, ok := getLatestFilePath(identifier)
if !ok {
// TODO: if in development mode, search updates dir for sideloaded apps
return nil, ErrNotFound
}
// build final filepath
realFilePath := filepath.Join(updateStorage.Path, filepath.FromSlash(versionedFilePath))
if _, err := os.Stat(realFilePath); err == nil {
// file exists
updateUsedStatus(identifier, version)
return NewFile(realFilePath, version, stable), nil
}
// check download dir
err := tmpStorage.Ensure()
file, err := registry.GetFile(identifier)
if err != nil {
return nil, fmt.Errorf("could not prepare tmp directory for download: %s", err)
return nil, err
}
if !fetch {
return nil, ErrNotAvailableLocally
}
// download file
log.Tracef("updates: starting download of %s", versionedFilePath)
for tries := 0; tries < 5; tries++ {
err = fetchFile(realFilePath, versionedFilePath, tries)
if err != nil {
log.Tracef("updates: failed to download %s: %s, retrying (%d)", versionedFilePath, err, tries+1)
} else {
updateUsedStatus(identifier, version)
return NewFile(realFilePath, version, stable), nil
}
}
log.Warningf("updates: failed to download %s: %s", versionedFilePath, err)
return nil, err
module.TriggerEvent(eventVersionUpdate, nil)
return file, nil
}