Skip to content

Add download_links file and strengthen filename uniqueness #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
heavyscientist merged 4 commits into from
Feb 18, 2025
Merged

Add download_links file and strengthen filename uniqueness #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e69c71c
added download_links file + strengthened filename uniqueness
Feb 18, 2025
ddf8a62
added test when reading dir for config
Feb 18, 2025
e9e452d
added more tests for config.go
Feb 18, 2025
68a1647
cleanup path prefix
Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion pkg/rustmaps/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ func TestGenerator_LoadConfig(t *testing.T) {
}),
wantErr: false,
},
{
name: "Test LoadConfig with file",
generator: NewMockedGenerator(t, &Generator{
configPath: "/etc/hosts",
config: types.Config{},
maps: []*types.Map{},
rmcli: &api.RustMapsClient{},
}),
wantErr: true,
},
{
name: "Test LoadConfig fail",
generator: NewMockedGenerator(t, &Generator{
Expand All @@ -32,6 +42,16 @@ func TestGenerator_LoadConfig(t *testing.T) {
}),
wantErr: true,
},
{
name: "Test LoadConfig fail tmp",
generator: NewMockedGenerator(t, &Generator{
configPath: "/tmp/",
config: types.Config{},
maps: []*types.Map{},
rmcli: &api.RustMapsClient{},
}),
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand All @@ -48,7 +68,25 @@ func TestGenerator_SaveConfig(t *testing.T) {
generator *Generator
wantErr bool
}{
// TODO: Add test cases.
{
name: "Test SaveConfig",
generator: NewMockedGenerator(t, &Generator{
config: types.Config{},
maps: []*types.Map{},
rmcli: &api.RustMapsClient{},
}),
wantErr: false,
},
{
name: "Test SaveConfig fail",
generator: NewMockedGenerator(t, &Generator{
configPath: "/tmp/asdfjasdlf/sadf432323/./.23",
config: types.Config{},
maps: []*types.Map{},
rmcli: &api.RustMapsClient{},
}),
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
42 changes: 37 additions & 5 deletions pkg/rustmaps/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package rustmaps

import (
"encoding/json"
"fmt"
"io"
"net/http"
Expand All @@ -12,6 +13,13 @@ import (
"go.uber.org/zap"
)

type DownloadLinks struct {
MapURL string `json:"map_url"`
ImageURL string `json:"image_url"`
ImageIconURL string `json:"image_icon_url"`
ThumbnailURL string `json:"thumbnail_url"`
}

func (g *Generator) OverrideDownloadsDir(log *zap.Logger, dir string) {
g.downloadsDir = dir
if err := os.MkdirAll(dir, 0755); err != nil {
Expand Down Expand Up @@ -89,11 +97,35 @@ func (g *Generator) Download(log *zap.Logger, version string) error {
log.Error("Error creating downloads directory", zap.Error(err))
return err
}
mapTarget := filepath.Join(downloadsDir, fmt.Sprintf("%s_%d_%s.map", m.Seed, m.Size, m.MapID))
imageTarget := filepath.Join(downloadsDir, fmt.Sprintf("%s_%d_%s.png", m.Seed, m.Size, m.MapID))
imageWithIconsTarget := filepath.Join(downloadsDir, fmt.Sprintf("%s_%d_%s_icons.png", m.Seed, m.Size, m.MapID))
thumbnailTarget := filepath.Join(downloadsDir, fmt.Sprintf("%s_%d_%s_thumbnail.png", m.Seed, m.Size, m.MapID))
fmt.Printf("Download URL: %s\n", status.Data.DownloadURL)
savedConfig := m.SavedConfig
if savedConfig == "" {
savedConfig = "procedural"
}
prefix := fmt.Sprintf("%s_%d_%s_%t_%s", m.Seed, m.Size, savedConfig, m.Staging, m.MapID)
mapTarget := filepath.Join(downloadsDir, fmt.Sprintf("%s.map", prefix))
imageTarget := filepath.Join(downloadsDir, fmt.Sprintf("%s.png", prefix))
imageWithIconsTarget := filepath.Join(downloadsDir, fmt.Sprintf("%s_icons.png", prefix))
thumbnailTarget := filepath.Join(downloadsDir, fmt.Sprintf("%s_thumbnail.png", prefix))
downloadLinksTarget := filepath.Join(downloadsDir, fmt.Sprintf("%s_download_links.json", prefix))
// create a json file next to the rest that contains the download urls
log.Info("Downloading assets", zap.String("seed", m.Seed), zap.String("map_id", m.MapID))
links := DownloadLinks{
MapURL: status.Data.DownloadURL,
ImageURL: status.Data.ImageURL,
ImageIconURL: status.Data.ImageIconURL,
ThumbnailURL: status.Data.ThumbnailURL,
}
downloadLinksData, err := json.MarshalIndent(links, "", " ")
if err != nil {
log.Error("Error marshalling JSON", zap.Error(err))
return err
}
log.Info("Writing download links", zap.String("target", downloadLinksTarget))
if err := os.WriteFile(downloadLinksTarget, downloadLinksData, 0644); err != nil {
log.Error("Error writing JSON file", zap.Error(err))
return err
}

if err := g.DownloadFile(log, status.Data.DownloadURL, mapTarget); err != nil {
log.Error("Error downloading map", zap.String("seed", m.Seed), zap.Error(err))
return err
Expand Down