Skip to content

rotarur/bump version #22

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 2 commits into from
Jul 25, 2023
Merged

rotarur/bump version #22

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32d679e
fixed conflicts
rotarur Jul 25, 2023
3b855b0
bumped version to 1.0.0
rotarur Jul 25, 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
Next Next commit
fixed conflicts
  • Loading branch information
@rotarur
rotarur committed Jul 25, 2023
commit 32d679ed4094e7322754da199a43da5b4b6a1c9a
4 changes: 4 additions & 0 deletions src/commands/sync-files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const chalk = require('chalk')
const ipfs = require('../ipfs')
const batchPromises = require('batch-promises');
const { CID } = require('ipfs-http-client');
const { Duplex } = require('stream');

const DEFAULT_RETRY_WAIT_MS = 1000;

Expand Down Expand Up @@ -42,7 +43,10 @@ const syncWait = (ms) => {
}

const fetchData = async ({ print, fromClient, sourceFile, label, syncResult, retries, retryWait}) => {
<<<<<<< HEAD
let file
=======
>>>>>>> 16e5473 (added Duplex option for ipfs sync)
try {
file = await fromClient.cat(sourceFile.cid)
} catch (e) {
Expand Down