-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixed compiler version not caching properly
- Loading branch information
1 parent
8bc3529
commit 1d26aa3
Showing
1 changed file
with
133 additions
and
134 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,134 +1,133 @@ | ||
| package compiler | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "os" | ||
| "regexp" | ||
|
|
||
| "github.com/google/go-github/github" | ||
| "github.com/pkg/errors" | ||
|
|
||
| "github.com/Southclaws/sampctl/download" | ||
| "github.com/Southclaws/sampctl/print" | ||
| "github.com/Southclaws/sampctl/types" | ||
| "github.com/Southclaws/sampctl/util" | ||
| "github.com/Southclaws/sampctl/versioning" | ||
| ) | ||
|
|
||
| // FromCache attempts to get a compiler package from the cache, `hit` represents success | ||
| func FromCache(meta versioning.DependencyMeta, dir, platform, cacheDir string) (compiler types.Compiler, hit bool, err error) { | ||
| compiler, err = GetCompilerPackageInfo(cacheDir, platform) | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| filename := GetCompilerFilename(platform, compiler.Method) | ||
|
|
||
| print.Verb("Checking for cached package", filename, "in", cacheDir) | ||
|
|
||
| hit, err = download.FromCache( | ||
| cacheDir, | ||
| filename, | ||
| dir, | ||
| download.ExtractFuncFromName(compiler.Method), | ||
| compiler.Paths) | ||
| if !hit { | ||
| return | ||
| } | ||
|
|
||
| print.Verb("Using cached package", filename) | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // FromNet downloads a compiler package to the cache | ||
| func FromNet(ctx context.Context, gh *github.Client, meta versioning.DependencyMeta, dir, platform, cacheDir string) (compiler types.Compiler, err error) { | ||
| print.Info("Downloading compiler package", meta.Tag) | ||
|
|
||
| compiler, err = GetCompilerPackageInfo(cacheDir, platform) | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| if !util.Exists(dir) { | ||
| err = os.MkdirAll(dir, 0700) | ||
| if err != nil { | ||
| err = errors.Wrapf(err, "failed to create dir %s", dir) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| path, _, err := download.ReleaseAssetByPattern(ctx, gh, meta, regexp.MustCompile(compiler.Match), "", GetCompilerFilename(platform, compiler.Method), cacheDir) | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| method := download.ExtractFuncFromName(compiler.Method) | ||
| if method == nil { | ||
| err = errors.Errorf("invalid extract type: %s", compiler.Method) | ||
| return | ||
| } | ||
|
|
||
| _, err = method(path, dir, compiler.Paths) | ||
| if err != nil { | ||
| err = errors.Wrapf(err, "failed to unzip package %s", path) | ||
| return | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // GetCompilerPackage downloads and installs a Pawn compiler to a user directory | ||
| func GetCompilerPackage(ctx context.Context, gh *github.Client, version types.CompilerVersion, dir, platform, cacheDir string) (compiler types.Compiler, err error) { | ||
| meta := versioning.DependencyMeta{ | ||
| Site: "github.com", | ||
| User: "pawn-lang", | ||
| Repo: "compiler", | ||
| Tag: string(version), | ||
| } | ||
|
|
||
| if meta.Tag == "" { | ||
| meta.Tag = "3.10.4" | ||
| } | ||
| if meta.Tag[0] != 'v' { | ||
| meta.Tag = "v" + meta.Tag | ||
| } | ||
|
|
||
| compiler, hit, err := FromCache(meta, dir, platform, cacheDir) | ||
| if err != nil { | ||
| err = errors.Wrapf(err, "failed to get package %s from cache", version) | ||
| return | ||
| } | ||
| if hit { | ||
| return | ||
| } | ||
|
|
||
| compiler, err = FromNet(ctx, gh, meta, dir, platform, cacheDir) | ||
| if err != nil { | ||
| err = errors.Wrapf(err, "failed to get package %s from net", version) | ||
| return | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // GetCompilerPackageInfo returns the URL for a specific compiler version | ||
| func GetCompilerPackageInfo(cacheDir, platform string) (compiler types.Compiler, err error) { | ||
| compilers, err := download.GetCompilerList(cacheDir) | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| compiler, ok := compilers[platform] | ||
| if !ok { | ||
| err = errors.Errorf("no compiler for platform '%s'", platform) | ||
| } | ||
| return | ||
| } | ||
|
|
||
| // GetCompilerFilename returns the path to a compiler given its platform and | ||
| // version number. | ||
| func GetCompilerFilename(platform, method string) string { | ||
| return fmt.Sprintf("pawn-%s.%s", platform, method) | ||
| } | ||
| package compiler | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "os" | ||
| "regexp" | ||
|
|
||
| "github.com/google/go-github/github" | ||
| "github.com/pkg/errors" | ||
|
|
||
| "github.com/Southclaws/sampctl/download" | ||
| "github.com/Southclaws/sampctl/print" | ||
| "github.com/Southclaws/sampctl/types" | ||
| "github.com/Southclaws/sampctl/util" | ||
| "github.com/Southclaws/sampctl/versioning" | ||
| ) | ||
|
|
||
| // FromCache attempts to get a compiler package from the cache, `hit` represents success | ||
| func FromCache(meta versioning.DependencyMeta, dir, platform, cacheDir string) (compiler types.Compiler, hit bool, err error) { | ||
| compiler, err = GetCompilerPackageInfo(cacheDir, platform) | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| filename := GetCompilerFilename(meta.Tag, platform, compiler.Method) | ||
|
|
||
| print.Verb("Checking for cached package", filename, "in", cacheDir) | ||
|
|
||
| hit, err = download.FromCache( | ||
| cacheDir, | ||
| filename, | ||
| dir, | ||
| download.ExtractFuncFromName(compiler.Method), | ||
| compiler.Paths) | ||
| if !hit { | ||
| return | ||
| } | ||
|
|
||
| print.Verb("Using cached package", filename) | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // FromNet downloads a compiler package to the cache | ||
| func FromNet(ctx context.Context, gh *github.Client, meta versioning.DependencyMeta, dir, platform, cacheDir string) (compiler types.Compiler, err error) { | ||
| print.Info("Downloading compiler package", meta.Tag) | ||
|
|
||
| compiler, err = GetCompilerPackageInfo(cacheDir, platform) | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| if !util.Exists(dir) { | ||
| err = os.MkdirAll(dir, 0700) | ||
| if err != nil { | ||
| err = errors.Wrapf(err, "failed to create dir %s", dir) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| path, _, err := download.ReleaseAssetByPattern(ctx, gh, meta, regexp.MustCompile(compiler.Match), "", GetCompilerFilename(meta.Tag, platform, compiler.Method), cacheDir) | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| method := download.ExtractFuncFromName(compiler.Method) | ||
| if method == nil { | ||
| err = errors.Errorf("invalid extract type: %s", compiler.Method) | ||
| return | ||
| } | ||
|
|
||
| _, err = method(path, dir, compiler.Paths) | ||
| if err != nil { | ||
| err = errors.Wrapf(err, "failed to unzip package %s", path) | ||
| return | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // GetCompilerPackage downloads and installs a Pawn compiler to a user directory | ||
| func GetCompilerPackage(ctx context.Context, gh *github.Client, version types.CompilerVersion, dir, platform, cacheDir string) (compiler types.Compiler, err error) { | ||
| meta := versioning.DependencyMeta{ | ||
| Site: "github.com", | ||
| User: "pawn-lang", | ||
| Repo: "compiler", | ||
| Tag: string(version), | ||
| } | ||
|
|
||
| if meta.Tag == "" { | ||
| meta.Tag = "v3.10.4" | ||
| } else if meta.Tag[0] != 'v' { | ||
| meta.Tag = "v" + meta.Tag | ||
| } | ||
|
|
||
| compiler, hit, err := FromCache(meta, dir, platform, cacheDir) | ||
| if err != nil { | ||
| err = errors.Wrapf(err, "failed to get package %s from cache", version) | ||
| return | ||
| } | ||
| if hit { | ||
| return | ||
| } | ||
|
|
||
| compiler, err = FromNet(ctx, gh, meta, dir, platform, cacheDir) | ||
| if err != nil { | ||
| err = errors.Wrapf(err, "failed to get package %s from net", version) | ||
| return | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // GetCompilerPackageInfo returns the URL for a specific compiler version | ||
| func GetCompilerPackageInfo(cacheDir, platform string) (compiler types.Compiler, err error) { | ||
| compilers, err := download.GetCompilerList(cacheDir) | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| compiler, ok := compilers[platform] | ||
| if !ok { | ||
| err = errors.Errorf("no compiler for platform '%s'", platform) | ||
| } | ||
| return | ||
| } | ||
|
|
||
| // GetCompilerFilename returns the path to a compiler given its platform and | ||
| // version number. | ||
| func GetCompilerFilename(version, platform, method string) string { | ||
| return fmt.Sprintf("pawn-%s-%s.%s", version, platform, method) | ||
| } |