Skip to content

fix: restore not check file suffix #9

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
simlecode merged 1 commit into from
Jun 10, 2025
Merged

fix: restore not check file suffix #9

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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
.vscode
cars2
config.toml
datas
datas2
33 changes: 13 additions & 20 deletions restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"
"io"
"os"
pa "path"
"path/filepath"
"strings"
"sync"
Expand Down Expand Up @@ -108,10 +107,10 @@ func CarTo(carPath, outputDir string, parallel int) {
if fi.IsDir() {
return nil
}
if strings.ToLower(pa.Ext(fi.Name())) != ".car" {
log.Warn(path, ", it's not a CAR file, skip it")
return nil
}
// if strings.ToLower(pa.Ext(fi.Name())) != ".car" {
// log.Warn(path, ", it's not a CAR file, skip it")
// return nil
// }
workerCh <- func() {
bs2 := bstore.NewBlockstore(dss.MutexWrap(datastore.NewMapDatastore()))
rdag := merkledag.NewDAGService(blockservice.New(bs2, offline.Exchange(bs2)))
Expand Down Expand Up @@ -147,22 +146,16 @@ func CarTo(carPath, outputDir string, parallel int) {
limitCh := make(chan struct{}, parallel)
wg := sync.WaitGroup{}
func() {
for {
select {
case taskFunc, ok := <-workerCh:
if !ok {
return
}
limitCh <- struct{}{}
wg.Add(1)
go func() {
defer func() {
<-limitCh
wg.Done()
}()
taskFunc()
for taskFunc := range workerCh {
limitCh <- struct{}{}
wg.Add(1)
go func(taskFunc func()) {
defer func() {
<-limitCh
wg.Done()
}()
}
taskFunc()
}(taskFunc)
}
}()
wg.Wait()
Expand Down