Skip to content

Commit 714a48d

Browse files
committed
Moved ReadDir and ReadDirRecursive in their own file
1 parent 43bf0b4 commit 714a48d

File tree

2 files changed

+73
-41
lines changed

2 files changed

+73
-41
lines changed

paths.go

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -306,47 +306,6 @@ func (p *Path) IsDirCheck() (bool, error) {
306306
return false, err
307307
}
308308

309-
// ReadDir returns a PathList containing the content of the directory
310-
// pointed by the current Path
311-
func (p *Path) ReadDir() (PathList, error) {
312-
infos, err := ioutil.ReadDir(p.path)
313-
if err != nil {
314-
return nil, err
315-
}
316-
paths := PathList{}
317-
for _, info := range infos {
318-
path := p.Clone().Join(info.Name())
319-
paths.Add(path)
320-
}
321-
return paths, nil
322-
}
323-
324-
// ReadDirRecursive returns a PathList containing the content of the directory
325-
// and its subdirectories pointed by the current Path
326-
func (p *Path) ReadDirRecursive() (PathList, error) {
327-
infos, err := ioutil.ReadDir(p.path)
328-
if err != nil {
329-
return nil, err
330-
}
331-
paths := PathList{}
332-
for _, info := range infos {
333-
path := p.Clone().Join(info.Name())
334-
paths.Add(path)
335-
336-
if isDir, err := path.IsDirCheck(); err != nil {
337-
return nil, err
338-
} else if isDir {
339-
subPaths, err := path.ReadDirRecursive()
340-
if err != nil {
341-
return nil, err
342-
}
343-
paths.AddAll(subPaths)
344-
}
345-
346-
}
347-
return paths, nil
348-
}
349-
350309
// CopyTo copies the contents of the file named src to the file named
351310
// by dst. The file will be created if it does not already exist. If the
352311
// destination file exists, all it's contents will be replaced by the contents

readdir.go

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* This file is part of PathsHelper library.
3+
*
4+
* Copyright 2018-2022 Arduino AG (http://www.arduino.cc/)
5+
*
6+
* PathsHelper library is free software; you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation; either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19+
*
20+
* As a special exception, you may use this file as part of a free software
21+
* library without restriction. Specifically, if other files instantiate
22+
* templates or use macros or inline functions from this file, or you compile
23+
* this file and link it with other files to produce an executable, this
24+
* file does not by itself cause the resulting executable to be covered by
25+
* the GNU General Public License. This exception does not however
26+
* invalidate any other reasons why the executable file might be covered by
27+
* the GNU General Public License.
28+
*/
29+
30+
package paths
31+
32+
import "io/ioutil"
33+
34+
// ReadDir returns a PathList containing the content of the directory
35+
// pointed by the current Path
36+
func (p *Path) ReadDir() (PathList, error) {
37+
infos, err := ioutil.ReadDir(p.path)
38+
if err != nil {
39+
return nil, err
40+
}
41+
paths := PathList{}
42+
for _, info := range infos {
43+
path := p.Clone().Join(info.Name())
44+
paths.Add(path)
45+
}
46+
return paths, nil
47+
}
48+
49+
// ReadDirRecursive returns a PathList containing the content of the directory
50+
// and its subdirectories pointed by the current Path
51+
func (p *Path) ReadDirRecursive() (PathList, error) {
52+
infos, err := ioutil.ReadDir(p.path)
53+
if err != nil {
54+
return nil, err
55+
}
56+
paths := PathList{}
57+
for _, info := range infos {
58+
path := p.Clone().Join(info.Name())
59+
paths.Add(path)
60+
61+
if isDir, err := path.IsDirCheck(); err != nil {
62+
return nil, err
63+
} else if isDir {
64+
subPaths, err := path.ReadDirRecursive()
65+
if err != nil {
66+
return nil, err
67+
}
68+
paths.AddAll(subPaths)
69+
}
70+
71+
}
72+
return paths, nil
73+
}

0 commit comments

Comments
 (0)