Skip to content

Fix lib install --zip-path not preserving folders structure #1158

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 1 commit into from
Jan 29, 2021
Merged

Fix lib install --zip-path not preserving folders structure #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 2 additions & 10 deletions arduino/libraries/librariesmanager/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,8 @@ func (lm *LibrariesManager) InstallZipLib(ctx context.Context, archivePath strin
WithField("zip file", archivePath).
Trace("Installing library")

files, err := tmpDir.Join(libraryName).ReadDirRecursive()
files.FilterOutDirs()
for _, f := range files {
finalPath := installPath.Join(f.Base())
if err := finalPath.Parent().MkdirAll(); err != nil {
return fmt.Errorf("creating directory: %w", err)
}
if err := f.CopyTo(finalPath); err != nil {
return fmt.Errorf("copying library: %w", err)
}
if err := tmpDir.Join(libraryName).CopyDirTo(installPath); err != nil {
return fmt.Errorf("copying library: %w", err)
}

return nil
Expand Down
14 changes: 14 additions & 0 deletions test/test_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,26 @@ def test_install_with_zip_path(run_command, data_dir, downloads_dir):

# Verifies library is installed in expected path
assert lib_install_dir.exists()
files = list(lib_install_dir.glob("**/*"))
assert lib_install_dir / "examples" / "SimpleAudioPlayerZero" / "SimpleAudioPlayerZero.ino" in files
assert lib_install_dir / "src" / "AudioZero.h" in files
assert lib_install_dir / "src" / "AudioZero.cpp" in files
assert lib_install_dir / "keywords.txt" in files
assert lib_install_dir / "library.properties" in files
assert lib_install_dir / "README.adoc" in files

# Reinstall library
assert run_command(f"lib install --zip-path {zip_path}")

# Verifies library remains installed
assert lib_install_dir.exists()
files = list(lib_install_dir.glob("**/*"))
assert lib_install_dir / "examples" / "SimpleAudioPlayerZero" / "SimpleAudioPlayerZero.ino" in files
assert lib_install_dir / "src" / "AudioZero.h" in files
assert lib_install_dir / "src" / "AudioZero.cpp" in files
assert lib_install_dir / "keywords.txt" in files
assert lib_install_dir / "library.properties" in files
assert lib_install_dir / "README.adoc" in files


def test_update_index(run_command):
Expand Down