diff --git a/.gitmodules b/.gitmodules index 15ce8931..6842ddea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -215,6 +215,6 @@ [submodule "vendor/nim-leveldbstatic"] path = vendor/nim-leveldbstatic url = https://github.com/codex-storage/nim-leveldb.git -[submodule "vendor/zip"] - path = vendor/zip - url = https://github.com/nim-lang/zip.git \ No newline at end of file +[submodule "vendor/nim-zippy"] + path = vendor/nim-zippy + url = https://github.com/status-im/nim-zippy.git diff --git a/tools/cirdl/cirdl.nim b/tools/cirdl/cirdl.nim index 9f33f574..93485411 100644 --- a/tools/cirdl/cirdl.nim +++ b/tools/cirdl/cirdl.nim @@ -5,7 +5,7 @@ import pkg/chronos import pkg/ethers import pkg/questionable import pkg/questionable/results -import pkg/zip/zipfiles +# import pkg/zippy/ziparchives import pkg/chronos/apps/http/httpclient import ../../codex/contracts/marketplace @@ -60,11 +60,10 @@ proc downloadZipfile(url: string, filepath: string): Future[?!void] {.async.} = success() proc unzip(zipfile:string, targetPath: string): ?!void = - var z: ZipArchive - if not z.open(zipfile): - return failure("Unable to open zip file: " & zipfile) - z.extractAll(targetPath) - z.close() + # try: + # extractAll(zipfile, targetPath) + # except Exception as exc: + # return failure(exc.msg) success() proc main() {.async.} = diff --git a/vendor/nim-zippy b/vendor/nim-zippy new file mode 160000 index 00000000..8d6828f0 --- /dev/null +++ b/vendor/nim-zippy @@ -0,0 +1 @@ +Subproject commit 8d6828f090325c5c015f66a438d31aa592a7045d diff --git a/vendor/zip b/vendor/zip deleted file mode 160000 index 06f5b0a0..00000000 --- a/vendor/zip +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 06f5b0a0767b14c7595ed168611782be69e61543