Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Bob
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSS
Bob
Commits
6abc66c6
Verified
Commit
6abc66c6
authored
8 months ago
by
Volker Schukai
Browse files
Options
Downloads
Patches
Plain Diff
fix: exluding now work properly
parent
260e43dd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/html/sync.go
+152
-79
152 additions, 79 deletions
source/html/sync.go
source/types/sync-specification.go
+8
-6
8 additions, 6 deletions
source/types/sync-specification.go
with
160 additions
and
85 deletions
source/html/sync.go
+
152
−
79
View file @
6abc66c6
...
@@ -26,63 +26,51 @@ func readHTML(p string) (*html.Node, error) {
...
@@ -26,63 +26,51 @@ func readHTML(p string) (*html.Node, error) {
return
html
.
Parse
(
htmlFile
)
return
html
.
Parse
(
htmlFile
)
}
}
func
SyncHtml
(
p
string
)
error
{
type
StringNodeMap
map
[
string
]
*
html
.
Node
type
StringListNodeMap
map
[
string
][]
*
html
.
Node
content
,
err
:=
os
.
ReadFile
(
p
)
if
err
!=
nil
{
return
err
}
currentDir
,
_
:=
os
.
Getwd
()
if
err
:=
os
.
Chdir
(
filepath
.
Dir
(
p
));
err
!=
nil
{
return
err
}
defer
func
()
{
func
getSourceFileMap
(
specification
types
.
SyncSpecification
)
(
StringNodeMap
,
error
)
{
_
=
os
.
Chdir
(
currentDir
)
sourceFiles
:=
make
(
StringNodeMap
)
}()
specification
:=
types
.
SyncSpecification
{}
if
err
:=
yaml
.
Unmarshal
(
content
,
&
specification
);
err
!=
nil
{
return
err
}
destinationWriteFiles
:=
make
(
map
[
string
]
*
html
.
Node
)
for
_
,
r
:=
range
specification
.
Sync
{
for
_
,
r
:=
range
specification
.
Sync
{
sourceFiles
:=
make
(
map
[
string
]
*
html
.
Node
)
destinationFiles
:=
make
(
map
[
string
]
*
html
.
Node
)
destinationFile
:=
make
(
map
[
string
][]
string
)
source
:=
r
.
Source
source
:=
r
.
Source
destination
:=
r
.
Destination
exclude
:=
r
.
Destination
.
Exclude
absSource
,
err
:=
filepath
.
Abs
(
source
.
Path
)
absSource
,
err
:=
filepath
.
Abs
(
source
.
Path
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
nil
,
err
}
}
if
err
!=
nil
{
// if already read, skip
return
err
if
_
,
ok
:=
sourceFiles
[
absSource
];
ok
{
continue
}
}
if
sourceFiles
[
absSource
],
err
=
readHTML
(
absSource
);
err
!=
nil
{
if
sourceFiles
[
absSource
],
err
=
readHTML
(
absSource
);
err
!=
nil
{
return
err
return
nil
,
err
}
}
for
_
,
d
:=
range
destination
.
Path
{
}
return
sourceFiles
,
nil
}
func
getDestinationFiles
(
specification
types
.
SyncSpecification
)
(
StringNodeMap
,
error
)
{
fileMap
:=
make
(
StringNodeMap
)
for
_
,
r
:=
range
specification
.
Sync
{
for
_
,
d
:=
range
r
.
Destination
.
Path
{
d
,
err
:=
filepath
.
Abs
(
d
)
d
,
err
:=
filepath
.
Abs
(
d
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
nil
,
err
}
}
fileInfo
,
err
:=
os
.
Stat
(
d
)
fileInfo
,
err
:=
os
.
Stat
(
d
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
nil
,
err
}
}
if
fileInfo
.
IsDir
()
{
if
fileInfo
.
IsDir
()
{
...
@@ -99,12 +87,7 @@ func SyncHtml(p string) error {
...
@@ -99,12 +87,7 @@ func SyncHtml(p string) error {
return
nil
return
nil
}
}
excludeFlag
,
err2
:=
checkExcludes
(
exclude
,
pp
)
if
_
,
ok
:=
fileMap
[
pp
];
ok
{
if
err2
!=
nil
{
return
err2
}
if
excludeFlag
{
return
nil
return
nil
}
}
...
@@ -113,65 +96,153 @@ func SyncHtml(p string) error {
...
@@ -113,65 +96,153 @@ func SyncHtml(p string) error {
return
err
return
err
}
}
destinationFiles
[
pp
]
=
dd
fileMap
[
pp
]
=
dd
destinationWriteFiles
[
pp
]
=
dd
destinationFile
[
absSource
]
=
append
(
destinationFile
[
absSource
],
pp
)
return
nil
return
nil
});
err
!=
nil
{
});
err
!=
nil
{
return
err
return
nil
,
err
}
}
}
else
if
filepath
.
Ext
(
d
)
==
".html"
{
if
exclude
!=
nil
{
}
else
if
filepath
.
Ext
(
d
)
==
".html"
{
excludeFlag
,
err2
:=
checkExcludes
(
exclude
,
d
)
if
err2
!=
nil
{
return
err2
}
if
excludeFlag
{
if
_
,
ok
:=
fileMap
[
d
];
ok
{
continue
continue
}
}
}
var
dd
*
html
.
Node
var
dd
*
html
.
Node
if
dd
,
err
=
readHTML
(
d
);
err
!=
nil
{
if
dd
,
err
=
readHTML
(
d
);
err
!=
nil
{
return
err
return
nil
,
err
}
}
destinationFiles
[
d
]
=
dd
fileMap
[
d
]
=
dd
destinationWriteFiles
[
d
]
=
dd
destinationFile
[
absSource
]
=
append
(
destinationFile
[
absSource
],
d
)
}
}
}
}
//source := r.Source
}
//absSource, err := filepath.Abs(source.Path)
//if err != nil {
// return err
//}
sourceSelector
:=
source
.
Selector
query
,
err
:=
cascadia
.
Compile
(
sourceSelector
)
return
fileMap
,
nil
}
func
getAllDestinationFilesWithoutExcludes
(
destination
types
.
Destination
)
([]
string
,
error
)
{
var
files
[]
string
for
_
,
p
:=
range
destination
.
Path
{
p
,
err
:=
filepath
.
Abs
(
p
)
if
err
!=
nil
{
return
nil
,
err
}
if
err
=
filepath
.
Walk
(
p
,
func
(
pp
string
,
info
os
.
FileInfo
,
err
error
)
error
{
if
err
!=
nil
{
return
err
}
if
info
.
IsDir
()
{
return
nil
}
ext
:=
filepath
.
Ext
(
pp
)
if
ext
!=
".html"
{
return
nil
}
exclude
,
err
:=
checkExcludes
(
destination
.
Exclude
,
pp
)
if
err
!=
nil
{
return
err
}
if
exclude
{
return
nil
}
files
=
append
(
files
,
pp
)
return
nil
});
err
!=
nil
{
return
nil
,
err
}
}
return
files
,
nil
}
func
SyncHtml
(
p
string
)
error
{
content
,
err
:=
os
.
ReadFile
(
p
)
if
err
!=
nil
{
return
err
}
currentDir
,
_
:=
os
.
Getwd
()
if
err
:=
os
.
Chdir
(
filepath
.
Dir
(
p
));
err
!=
nil
{
return
err
}
defer
func
()
{
_
=
os
.
Chdir
(
currentDir
)
}()
specification
:=
types
.
SyncSpecification
{}
if
err
:=
yaml
.
Unmarshal
(
content
,
&
specification
);
err
!=
nil
{
return
err
}
var
sourceFiles
StringNodeMap
sourceFiles
,
err
=
getSourceFileMap
(
specification
)
if
err
!=
nil
{
return
err
}
var
destinationFiles
StringNodeMap
destinationFiles
,
err
=
getDestinationFiles
(
specification
)
if
err
!=
nil
{
return
err
}
changedFiles
:=
make
(
map
[
string
]
struct
{})
for
_
,
r
:=
range
specification
.
Sync
{
source
:=
r
.
Source
absSource
,
err
:=
filepath
.
Abs
(
source
.
Path
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
s
,
ok
:=
sourceFiles
[
absSource
]
s
ourceNode
,
ok
:=
sourceFiles
[
absSource
]
if
!
ok
{
if
!
ok
{
return
fmt
.
Errorf
(
"source file isn't found: %s"
,
absSource
)
return
fmt
.
Errorf
(
"source file isn't found: %s"
,
absSource
)
}
}
sourceNode
:=
query
.
MatchFirst
(
s
)
sourceSelector
:=
source
.
Selector
query
,
err
:=
cascadia
.
Compile
(
sourceSelector
)
if
err
!=
nil
{
return
err
}
sourceNode
=
query
.
MatchFirst
(
sourceNode
)
if
sourceNode
==
nil
{
return
fmt
.
Errorf
(
"source selector not found: %s in %s"
,
sourceSelector
,
absSource
)
}
list
,
err
:=
getAllDestinationFilesWithoutExcludes
(
r
.
Destination
)
if
err
!=
nil
{
return
err
}
dp
:=
destinationFile
[
absSource
]
for
_
,
d
:=
range
list
{
for
_
,
d
:=
range
dp
{
destinationSelector
:=
r
.
Destination
.
Selector
destinationSelector
:=
r
.
Destination
.
Selector
if
destinationSelector
==
""
{
if
destinationSelector
==
""
{
destinationSelector
=
sourceSelector
destinationSelector
=
sourceSelector
}
}
keepMap
:=
make
(
map
[
string
][]
*
html
.
Node
)
query
,
err
:=
cascadia
.
Compile
(
destinationSelector
)
if
err
!=
nil
{
return
err
}
keepMap
:=
make
(
StringListNodeMap
)
for
_
,
n
:=
range
r
.
Destination
.
Keep
{
for
_
,
n
:=
range
r
.
Destination
.
Keep
{
q
,
err
:=
cascadia
.
Compile
(
n
)
q
,
err
:=
cascadia
.
Compile
(
n
)
...
@@ -190,13 +261,7 @@ func SyncHtml(p string) error {
...
@@ -190,13 +261,7 @@ func SyncHtml(p string) error {
}
}
query
,
err
:=
cascadia
.
Compile
(
destinationSelector
)
if
err
!=
nil
{
return
err
}
destinationData
:=
query
.
MatchFirst
(
destinationFiles
[
d
])
destinationData
:=
query
.
MatchFirst
(
destinationFiles
[
d
])
if
destinationData
==
nil
{
if
destinationData
==
nil
{
return
fmt
.
Errorf
(
"could not find destination selector %s in %s"
,
destinationSelector
,
d
)
return
fmt
.
Errorf
(
"could not find destination selector %s in %s"
,
destinationSelector
,
d
)
}
}
...
@@ -227,17 +292,24 @@ func SyncHtml(p string) error {
...
@@ -227,17 +292,24 @@ func SyncHtml(p string) error {
n1
.
Parent
.
InsertBefore
(
engine
.
CloneNode
(
kk
),
n1
)
n1
.
Parent
.
InsertBefore
(
engine
.
CloneNode
(
kk
),
n1
)
n1
.
Parent
.
RemoveChild
(
n1
)
n1
.
Parent
.
RemoveChild
(
n1
)
}
}
}
}
}
}
changedFiles
[
d
]
=
struct
{}{}
}
}
}
}
for
p
,
d
:=
range
destinationWriteFiles
{
for
d
,
_
:=
range
changedFiles
{
fp
,
err
:=
os
.
Create
(
p
)
fp
,
err
:=
os
.
Create
(
d
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
err
=
html
.
Render
(
fp
,
d
)
err
=
html
.
Render
(
fp
,
d
estinationFiles
[
d
]
)
err2
:=
fp
.
Close
()
err2
:=
fp
.
Close
()
if
err2
!=
nil
{
if
err2
!=
nil
{
return
err2
return
err2
...
@@ -246,6 +318,7 @@ func SyncHtml(p string) error {
...
@@ -246,6 +318,7 @@ func SyncHtml(p string) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
}
}
return
nil
return
nil
...
...
This diff is collapsed.
Click to expand it.
source/types/sync-specification.go
+
8
−
6
View file @
6abc66c6
...
@@ -21,17 +21,19 @@ func (p *PathOrList) UnmarshalYAML(value *yaml.Node) error {
...
@@ -21,17 +21,19 @@ func (p *PathOrList) UnmarshalYAML(value *yaml.Node) error {
return
nil
return
nil
}
}
type
Destination
struct
{
Selector
string
`yaml:"selector"`
Path
PathOrList
`yaml:"path"`
Exclude
[]
string
`yaml:"exclude"`
Keep
[]
string
`yaml:"keep"`
}
type
Sync
struct
{
type
Sync
struct
{
Source
struct
{
Source
struct
{
Selector
string
`yaml:"selector"`
Selector
string
`yaml:"selector"`
Path
string
`yaml:"path"`
Path
string
`yaml:"path"`
}
`yaml:"source"`
}
`yaml:"source"`
Destination
struct
{
Destination
Destination
`yaml:"destination"`
Selector
string
`yaml:"selector"`
Path
PathOrList
`yaml:"path"`
Exclude
[]
string
`yaml:"exclude"`
Keep
[]
string
`yaml:"keep"`
}
`yaml:"destination"`
}
}
type
SyncSpecification
struct
{
type
SyncSpecification
struct
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment