Add option to ignore files when adding. #4013

crackcomm · 2017-06-27T03:56:26Z

Current usage:

  -i,          --ignore              array  - List of ignore rules. (comma separated).
  -g,          --git-ignore          bool   - Respect .gitignore rules. (experimental).

Fixes #3643
Includes #4012

Breaking changes: files.NewSerialFile

License: MIT Signed-off-by: Łukasz Kurowski <crackcomm@gmail.com>

whyrusleeping · 2017-06-27T05:42:00Z

commands/cli/parse.go

+		}
+		rulesFile = filepath.Join(cwd, ".gitignore")
+	} else if err != nil {
+		return nil, nil, u.ErrCast()


i would just return the err here

again, thanks

whyrusleeping · 2017-06-27T05:42:17Z

commands/cli/parse.go

+
+	ignore, _, err := req.Option("ignore").Strings()
+	if err != nil {
+		return nil, nil, u.ErrCast()


just return nil, nil, err

whyrusleeping · 2017-06-27T05:45:29Z

commands/files/filter.go

+
+// Filter - Returns true if file should be filtered.
+func (filter *Filter) Filter(fpath string) bool {
+	if filter.Hidden && strings.HasPrefix(fpath, ".") {


I don't know if this would catch hidden files in recursive directories. We might want to use filepath.Base here to get just the filename, then check if it has the dot prefix.

Input to Filter is always a filename actually.

Oh? okay, then thats fine

I discovered it should be the opposite - Hidden true means include hidden files.

whyrusleeping

changes mostly look good to me (noted a few small things). I would love to see these options tested out in a sharness test, you can probably either add more to test/sharness/t0042-something.sh or create a new test file just for testing these changes.

crackcomm · 2017-06-27T06:33:33Z

commands/cli/parse.go

-	return parseArgs(inputs, stdin, argDefs, recursive, hidden, root)
+
+	var rulesFile string
+	if gitignore, _, err := req.Option("git-ignore").Bool(); gitignore {


Here we need to check for nil's anyway.

crackcomm · 2017-06-27T06:44:17Z

commands/request.go

@@ -334,7 +334,7 @@ func (r *request) ConvertOptions() error {
 		}

 		kind := reflect.TypeOf(v).Kind()
-		if kind != opt.Type() {
+		if kind != opt.Type() && opt.Type() != Strings && kind != String {


Here it should be just kind != opt.Type() && opt.Type() != Strings otherwise it doesn't convert numbers.

License: MIT Signed-off-by: Łukasz Kurowski <crackcomm@gmail.com>

ghost · 2017-06-28T15:50:02Z

Haven't reviewed the code itself, but I'm wondering why not stick with the convention of a .fooignore file?

crackcomm · 2017-06-30T13:34:28Z

@lgierth I have no idea what is that.

crackcomm · 2017-07-04T19:03:17Z

@lgierth did you mean to include rules from all .*ignore files?

ghost · 2017-07-06T23:38:42Z

Yeah let me clarify this a bit more, @whyrusleeping asked me to, too. Although the solution proposed looks okay on first sight, we haven't looked at any other options. What I'm missing here a bit is the evaluation and weighing of different ways of solving our need for having ipfs add ignore files.

Here's another one, off the top of my head, one with an implicit .ipfsignore file.

> touch README.md foo
> echo foo > .ipfsignore
> ipfs add -r .
info: skipping files as defined in ./.ipfsignore
added QmA README.md
added QmB .ipfsignore
added QmDir
> ipfs add -f -r .
info: adding otherwise ignored files as defined in ./.ipfsignore
added QmA README.md
added QmB .ipfsignore
added QmC foo
added QmDir2

This could be extended to also process an ipfsignore in $HOME/.ipfsignore, or generally ipfsignore files in parent directories.

Other options include an explicit ignore file (--ignorefile=path/to/ipfsignore), and there's likely good ideas to pick from rsync, git, and other tools that operate on files.

I'm not saying the solution proposed here is bad, only that it's just the first and that we should look at more.

crackcomm · 2017-07-17T06:17:08Z

I personally do not like the idea of additional .ipfsignore. Maybe the idea of .gitignore is even worst than .ipfsignore. Specifying it in the flag seems most viable option for this kind of application.

crackcomm · 2017-10-04T12:28:48Z

Let me know if I can do anything to move this forward also #4013.

Kubuxu

This depends on #4012 and #3856

(cleaning out my Review queue).

jacobheun · 2020-06-19T17:29:42Z

Support has been added #3643 (comment)

crackcomm added 2 commits June 27, 2017 04:07

cmd options: strings array

6d8a516

License: MIT Signed-off-by: Łukasz Kurowski <crackcomm@gmail.com>

Add option to ignore files when adding.

b3dcf35

License: MIT Signed-off-by: Łukasz Kurowski <crackcomm@gmail.com>

kevina self-requested a review June 27, 2017 04:19

whyrusleeping reviewed Jun 27, 2017

View reviewed changes

whyrusleeping requested changes Jun 27, 2017

View reviewed changes

whyrusleeping requested a review from Kubuxu June 27, 2017 05:52

crackcomm commented Jun 27, 2017

View reviewed changes

parsing fixes and tests

b60add7

License: MIT Signed-off-by: Łukasz Kurowski <crackcomm@gmail.com>

crackcomm mentioned this pull request Jul 8, 2017

Compile file and lines sabhiram/go-gitignore#7

Merged

crackcomm mentioned this pull request Jul 17, 2017

Add strings option #4012

Closed

Kubuxu reviewed Oct 16, 2017

View reviewed changes

Stebalien mentioned this pull request Jan 28, 2018

ipfs add ignore, .ipfsignore #3643

Closed

dholms mentioned this pull request Nov 11, 2019

Add .fissionignore fission-codes/cli#31

Closed

bmann mentioned this pull request Feb 17, 2020

Test build with ipfs add ignore support fission-codes/kubo#2

Closed

jacobheun closed this Jun 19, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add option to ignore files when adding. #4013

Add option to ignore files when adding. #4013

crackcomm commented Jun 27, 2017 •

edited

Loading

whyrusleeping Jun 27, 2017

crackcomm Jun 27, 2017

whyrusleeping Jun 27, 2017

crackcomm Jun 27, 2017

whyrusleeping Jun 27, 2017

crackcomm Jun 27, 2017

whyrusleeping Jun 27, 2017

crackcomm Jun 27, 2017

whyrusleeping left a comment

crackcomm Jun 27, 2017

crackcomm Jun 27, 2017 •

edited

Loading

ghost commented Jun 28, 2017

crackcomm commented Jun 30, 2017

crackcomm commented Jul 4, 2017

ghost commented Jul 6, 2017

crackcomm commented Jul 17, 2017 •

edited

Loading

crackcomm commented Oct 4, 2017

Kubuxu left a comment

jacobheun commented Jun 19, 2020

Add option to ignore files when adding. #4013

Add option to ignore files when adding. #4013

Conversation

crackcomm commented Jun 27, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

whyrusleeping left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

crackcomm Jun 27, 2017 • edited Loading

Choose a reason for hiding this comment

ghost commented Jun 28, 2017

crackcomm commented Jun 30, 2017

crackcomm commented Jul 4, 2017

ghost commented Jul 6, 2017

crackcomm commented Jul 17, 2017 • edited Loading

crackcomm commented Oct 4, 2017

Kubuxu left a comment

Choose a reason for hiding this comment

jacobheun commented Jun 19, 2020

crackcomm commented Jun 27, 2017 •

edited

Loading

crackcomm Jun 27, 2017 •

edited

Loading

crackcomm commented Jul 17, 2017 •

edited

Loading