Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@NiclasHaderer
NiclasHaderer committed Mar 17, 2024
1 parent e0fbb40 commit 2d02364
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 36 deletions.
42 changes: 21 additions & 21 deletions api/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ type Client interface {
Get() *http.Client
}

type ApiClient struct {
type clientImpl struct {
Host string
Client *http.Client
BasePath string
}

func (receiver ApiClient) GetAllReleases() (models.Releases, stacktrace.Error) {
releasesDict, err := receiver.ListAllReleasesDict()
func (c clientImpl) GetAllReleases() (models.Releases, stacktrace.Error) {
releaseDict, err := c.ListAllReleasesDict()
if err != nil {
return nil, stacktrace.Wrap(err)
}

finalReleases := make(models.Releases)
for version, versionPath := range releasesDict {
release, err := receiver.GetReleaseWithLocation(versionPath)
for version, versionPath := range releaseDict {
release, err := c.GetReleaseWithLocation(versionPath)
if err != nil {
return nil, stacktrace.Wrap(err)
}
Expand All @@ -41,9 +41,9 @@ func (receiver ApiClient) GetAllReleases() (models.Releases, stacktrace.Error) {
return finalReleases, nil
}

func (receiver ApiClient) ListAllReleasesDict() (models.VersionDict, stacktrace.Error) {
url := receiver.Host + receiver.BasePath + "/versions.json"
resp, err := receiver.Client.Get(url)
func (c clientImpl) ListAllReleasesDict() (models.VersionDict, stacktrace.Error) {
url := c.Host + c.BasePath + "/versions.json"
resp, err := c.Client.Get(url)
if err != nil {
return nil, stacktrace.Wrap(err)
}
Expand All @@ -58,17 +58,17 @@ func (receiver ApiClient) ListAllReleasesDict() (models.VersionDict, stacktrace.
return releases, nil
}

func (receiver ApiClient) ListAllReleases() (models.VersionList, stacktrace.Error) {
result, err := receiver.ListAllReleasesDict()
func (c clientImpl) ListAllReleases() (models.VersionList, stacktrace.Error) {
result, err := c.ListAllReleasesDict()
if err != nil {
return nil, err
}

return toVersionList(result), nil
}

func (receiver ApiClient) GetRelease(version string) (*models.Release, stacktrace.Error) {
versions, err := receiver.ListAllReleasesDict()
func (c clientImpl) GetRelease(version string) (*models.Release, stacktrace.Error) {
versions, err := c.ListAllReleasesDict()
if err != nil {
return nil, err
}
Expand All @@ -81,13 +81,13 @@ func (receiver ApiClient) GetRelease(version string) (*models.Release, stacktrac
}
}

return receiver.GetReleaseWithLocation(versionPath)
return c.GetReleaseWithLocation(versionPath)
}

func (receiver ApiClient) GetReleaseWithLocation(versionPath string) (*models.Release, stacktrace.Error) {
url := receiver.Host + receiver.BasePath + "/" + versionPath
func (c clientImpl) GetReleaseWithLocation(versionPath string) (*models.Release, stacktrace.Error) {
url := c.Host + c.BasePath + "/" + versionPath

resp, err := receiver.Client.Get(url)
resp, err := c.Client.Get(url)
if err != nil {
return nil, stacktrace.Wrap(err)
}
Expand All @@ -102,10 +102,10 @@ func (receiver ApiClient) GetReleaseWithLocation(versionPath string) (*models.Re
return &release, nil
}

func (receiver ApiClient) LatestDuckVmRelease() (*models.Release, stacktrace.Error) {
url := receiver.Host + receiver.BasePath + "/latest-vm.json"
func (c clientImpl) LatestDuckVmRelease() (*models.Release, stacktrace.Error) {
url := c.Host + c.BasePath + "/latest-vm.json"

resp, err := receiver.Client.Get(url)
resp, err := c.Client.Get(url)
if err != nil {
return nil, stacktrace.Wrap(err)
}
Expand All @@ -120,6 +120,6 @@ func (receiver ApiClient) LatestDuckVmRelease() (*models.Release, stacktrace.Err
return &release, nil
}

func (receiver ApiClient) Get() *http.Client {
return receiver.Client
func (c clientImpl) Get() *http.Client {
return c.Client
}
2 changes: 1 addition & 1 deletion api/new.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
)

func New() Client {
return &ApiClient{
return &clientImpl{
Host: "https://raw.githubusercontent.com/NiclasHaderer/duckdb-version-manager/main/",
Client: &http.Client{
Timeout: 5 * time.Minute,
Expand Down
22 changes: 11 additions & 11 deletions manager/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ type VersionManager interface {
saveLocalConfig() stacktrace.Error
}

type VersionManagerImpl struct {
type versionManagerImpl struct {
client api.Client
localConfig models.LocalConfig
}

func (v VersionManagerImpl) saveLocalConfig() stacktrace.Error {
func (v versionManagerImpl) saveLocalConfig() stacktrace.Error {
//TODO implement me
panic("implement me")
}

func (v VersionManagerImpl) InstallVersion(version string) stacktrace.Error {
func (v versionManagerImpl) InstallVersion(version string) stacktrace.Error {
release, err := v.client.GetRelease(version)
if err != nil {
return err
Expand Down Expand Up @@ -66,7 +66,7 @@ func (v VersionManagerImpl) InstallVersion(version string) stacktrace.Error {
return v.saveConfig()
}

func (v VersionManagerImpl) UninstallVersion(unreliableVersion string) stacktrace.Error {
func (v versionManagerImpl) UninstallVersion(unreliableVersion string) stacktrace.Error {
if !v.VersionIsInstalled(unreliableVersion) {
return stacktrace.NewF("Version '%s' not installed", unreliableVersion)
}
Expand All @@ -88,19 +88,19 @@ func (v VersionManagerImpl) UninstallVersion(unreliableVersion string) stacktrac
return v.saveConfig()
}

func (v VersionManagerImpl) ListInstalledVersions() []models.LocalInstallationInfo {
func (v versionManagerImpl) ListInstalledVersions() []models.LocalInstallationInfo {
return utils.Values(v.localConfig.LocalInstallations)
}

func (v VersionManagerImpl) GetDefaultVersion() *models.LocalInstallationInfo {
func (v versionManagerImpl) GetDefaultVersion() *models.LocalInstallationInfo {
if v.localConfig.DefaultVersion == nil {
return nil
}
tmp := v.localConfig.LocalInstallations[*v.localConfig.DefaultVersion]
return &tmp
}

func (v VersionManagerImpl) SetDefaultVersion(version *string) stacktrace.Error {
func (v versionManagerImpl) SetDefaultVersion(version *string) stacktrace.Error {
if _, err := os.Lstat(config.DefaultDuckdbFile); err == nil {
err := os.Remove(config.DefaultDuckdbFile)
if err != nil {
Expand Down Expand Up @@ -129,7 +129,7 @@ func (v VersionManagerImpl) SetDefaultVersion(version *string) stacktrace.Error
return v.saveConfig()
}

func (v VersionManagerImpl) saveConfig() stacktrace.Error {
func (v versionManagerImpl) saveConfig() stacktrace.Error {
configAsBytes, err := json.MarshalIndent(v.localConfig, "", " ")
if err != nil {
return stacktrace.Wrap(err)
Expand All @@ -142,7 +142,7 @@ func (v VersionManagerImpl) saveConfig() stacktrace.Error {
return nil
}

func (v VersionManagerImpl) Run(version string, args []string) stacktrace.Error {
func (v versionManagerImpl) Run(version string, args []string) stacktrace.Error {
if !v.VersionIsInstalled(version) {
err := v.InstallVersion(version)
if err != nil {
Expand All @@ -168,7 +168,7 @@ func (v VersionManagerImpl) Run(version string, args []string) stacktrace.Error
return nil
}

func (v VersionManagerImpl) VersionIsInstalled(version string) bool {
func (v versionManagerImpl) VersionIsInstalled(version string) bool {
_, ok := v.localConfig.LocalInstallations[version]

if !ok {
Expand All @@ -179,7 +179,7 @@ func (v VersionManagerImpl) VersionIsInstalled(version string) bool {
return ok
}

func (v VersionManagerImpl) GetLocalReleaseInfo(version string) (*models.LocalInstallationInfo, stacktrace.Error) {
func (v versionManagerImpl) GetLocalReleaseInfo(version string) (*models.LocalInstallationInfo, stacktrace.Error) {
li, ok := v.localConfig.LocalInstallations[version]
if !ok {
li, ok = v.localConfig.LocalInstallations["v"+version]
Expand Down
2 changes: 1 addition & 1 deletion manager/new.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func create() (VersionManager, stacktrace.Error) {
return nil, stacktrace.Wrap(err)
}

return &VersionManagerImpl{
return &versionManagerImpl{
localConfig: localConfig,
client: api.New(),
}, nil
Expand Down
4 changes: 2 additions & 2 deletions test/e2e.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@ def test_run_invalid_version(self):
self.assertIn("exit status 1", str(e))


if __name__ == '__main__':
unittest.main()
if __name__ == "__main__":
unittest.main()
2 changes: 2 additions & 0 deletions utils/device.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ func GetDeviceInfo() DeviceInfo {
}
}

//goland:noinspection GoBoolExpressions
func getPlatform() models.PlatformType {
os := runtime.GOOS
if os == "linux" {
Expand All @@ -32,6 +33,7 @@ func getPlatform() models.PlatformType {
return ""
}

//goland:noinspection GoBoolExpressions
func getArchitecture() models.ArchitectureType {
arch := runtime.GOARCH
if arch == "arm64" {
Expand Down

0 comments on commit 2d02364

Please sign in to comment.