Skip to content

legacy: removing a lot of duplicated/dead code #2282

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
merged 15 commits into from
Aug 29, 2023
Merged

legacy: removing a lot of duplicated/dead code #2282

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
da69b47
Replaced copyRecursive with go-paths library calls
cmaglie Aug 25, 2023
30a0486
Simplified download functions
cmaglie Aug 25, 2023
54864ed
Removed no more needed functions
cmaglie Aug 25, 2023
a777628
Replaced some calls with go-paths library
cmaglie Aug 25, 2023
5b6fde2
Replaced some calls with go-paths library
cmaglie Aug 25, 2023
6bf0ec5
Isolated some function into the (soon-to-be-removed) CMake generator
cmaglie Aug 25, 2023
58c9139
Removed now dead code
cmaglie Aug 25, 2023
efe545c
Moved md5 function to proper place
cmaglie Aug 25, 2023
acae097
Refactor findAllFilesInFolder to use more go-paths function
cmaglie Aug 28, 2023
b193537
Refactor findAllFilesInFolder to use more go-paths function
cmaglie Aug 28, 2023
8b7738f
Made FilesAreOlderThan function to rationalize code
cmaglie Aug 28, 2023
e5b6e46
Yet another code-factorization of findAllFilesInFolder
cmaglie Aug 28, 2023
123e3e4
Further simplified version of FilesAreOlderThan
cmaglie Aug 28, 2023
5178bae
Inlined CoreOrReferencedCoreHasChanged function
cmaglie Aug 28, 2023
22dcc9e
Inlined TXTBuildRulesHaveChanged function
cmaglie Aug 28, 2023
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
88 changes: 21 additions & 67 deletions legacy/builder/test/helper_tools_downloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,30 +454,17 @@ func downloadAndUnpackCore(core Core, url string, targetPath *paths.Path) error
packagerPath := targetPath.Join(core.Maintainer)
corePath := targetPath.Join(core.Maintainer, core.Arch)

if err := packagerPath.MkdirAll(); err != nil {
return errors.WithStack(err)
}
if corePath.Exist() {
if err := corePath.RemoveAll(); err != nil {
return errors.WithStack(err)
}
}

if len(files) == 1 && files[0].IsDir() {
if err := packagerPath.MkdirAll(); err != nil {
return errors.WithStack(err)
}
if err := unpackFolder.Join(files[0].Name()).CopyDirTo(targetPath.Join(core.Maintainer, core.Arch)); err != nil {
return errors.WithStack(err)
}
} else {
if err := targetPath.Join(core.Maintainer, core.Arch).MkdirAll(); err != nil {
return errors.WithStack(err)
}
for _, file := range files {
if err := unpackFolder.Join(file.Name()).CopyDirTo(targetPath.Join(core.Maintainer, core.Arch, file.Name())); err != nil {
return errors.WithStack(err)
}
}
if err := unpackFolder.Join(files[0].Name()).CopyDirTo(corePath); err != nil {
return errors.WithStack(err)
}

return nil
}

Expand All @@ -502,25 +489,12 @@ func downloadAndUnpackBoardManagerCore(core Core, url string, targetPath *paths.
return errors.WithStack(err)
}
}

if len(files) == 1 && files[0].IsDir() {
if err := corePath.MkdirAll(); err != nil {
return errors.WithStack(err)
}
if err := unpackFolder.Join(files[0].Name()).CopyDirTo(corePath.Join(core.Version)); err != nil {
return errors.WithStack(err)
}
} else {
if err := corePath.Join(core.Version).MkdirAll(); err != nil {
return errors.WithStack(err)
}
for _, file := range files {
if err := unpackFolder.Join(file.Name()).CopyDirTo(corePath.Join(core.Version, file.Name())); err != nil {
return errors.WithStack(err)
}
}
if err := corePath.MkdirAll(); err != nil {
return errors.WithStack(err)
}
if err := unpackFolder.Join(files[0].Name()).CopyDirTo(corePath.Join(core.Version)); err != nil {
return errors.WithStack(err)
}

return nil
}

Expand All @@ -539,24 +513,12 @@ func downloadAndUnpackBoardsManagerTool(tool Tool, url string, targetPath *paths
}
defer unpackFolder.RemoveAll()

if len(files) == 1 && files[0].IsDir() {
if err := targetPath.Join(tool.Package, constants.FOLDER_TOOLS, tool.Name).MkdirAll(); err != nil {
return errors.WithStack(err)
}
if err := unpackFolder.Join(files[0].Name()).CopyDirTo(targetPath.Join(tool.Package, constants.FOLDER_TOOLS, tool.Name, tool.Version)); err != nil {
return errors.WithStack(err)
}
} else {
if err := targetPath.Join(tool.Package, constants.FOLDER_TOOLS, tool.Name, tool.Version).MkdirAll(); err != nil {
return errors.WithStack(err)
}
for _, file := range files {
if err := unpackFolder.Join(file.Name()).CopyDirTo(targetPath.Join(tool.Package, constants.FOLDER_TOOLS, tool.Name, tool.Version, file.Name())); err != nil {
return errors.WithStack(err)
}
}
if err := targetPath.Join(tool.Package, constants.FOLDER_TOOLS, tool.Name).MkdirAll(); err != nil {
return errors.WithStack(err)
}
if err := unpackFolder.Join(files[0].Name()).CopyDirTo(targetPath.Join(tool.Package, constants.FOLDER_TOOLS, tool.Name, tool.Version)); err != nil {
return errors.WithStack(err)
}

return nil
}

Expand All @@ -583,24 +545,16 @@ func downloadAndUnpackTool(tool Tool, url string, targetPath *paths.Path, delete
}
}
}

if err := toolPath.MkdirAll(); err != nil {
return errors.WithStack(err)
}
destDir := toolPath.Join(tool.Version)
if len(files) == 1 && files[0].IsDir() {
if err := toolPath.MkdirAll(); err != nil {
return errors.WithStack(err)
}
if err := unpackFolder.Join(files[0].Name()).CopyDirTo(toolPath.Join(tool.Version)); err != nil {
if err := unpackFolder.Join(files[0].Name()).CopyDirTo(destDir); err != nil {
return errors.WithStack(err)
}
} else {
unpackFolder.CopyDirTo(toolPath.Join(tool.Version))
if err := toolPath.Join(tool.Version).MkdirAll(); err != nil {
return errors.WithStack(err)
}
for _, file := range files {
if err := unpackFolder.Join(file.Name()).CopyTo(toolPath.Join(tool.Version, file.Name())); err != nil {
return errors.WithStack(err)
}
}
unpackFolder.CopyDirTo(destDir)
}

return nil
Expand Down