-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build local storage on windows, make grace os independent (#99)
* build local storage on windows, make grace os independent Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * Fixed Windows build also for the owncloud storage package The code for the Windows implementation is taken from fs/local/local_windows.go * Compile on all non-Windows following @tboerger's suggestion * build as unix on !windows Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
- Loading branch information
Showing
7 changed files
with
239 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // Copyright 2018-2019 CERN | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // In applying this license, CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| // +build !windows | ||
|
|
||
| package local | ||
|
|
||
| import ( | ||
| "context" | ||
| "crypto/md5" | ||
| "encoding/binary" | ||
| "fmt" | ||
| "os" | ||
| "syscall" | ||
|
|
||
| "github.com/cs3org/reva/pkg/appctx" | ||
| ) | ||
|
|
||
| // calcEtag will create an etag based on the md5 of | ||
| // - mtime, | ||
| // - inode (if available), | ||
| // - device (if available) and | ||
| // - size. | ||
| // errors are logged, but an etag will still be returned | ||
| func calcEtag(ctx context.Context, fi os.FileInfo) string { | ||
| log := appctx.GetLogger(ctx) | ||
| h := md5.New() | ||
| err := binary.Write(h, binary.BigEndian, fi.ModTime().Unix()) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing mtime") | ||
| } | ||
| stat, ok := fi.Sys().(*syscall.Stat_t) | ||
| if ok { | ||
| // take device and inode into account | ||
| err = binary.Write(h, binary.BigEndian, stat.Ino) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing inode") | ||
| } | ||
| err = binary.Write(h, binary.BigEndian, stat.Dev) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing device") | ||
| } | ||
| } | ||
| err = binary.Write(h, binary.BigEndian, fi.Size()) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing size") | ||
| } | ||
| return fmt.Sprintf(`"%x"`, h.Sum(nil)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // Copyright 2018-2019 CERN | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // In applying this license, CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| // +build windows | ||
|
|
||
| package local | ||
|
|
||
| import ( | ||
| "context" | ||
| "crypto/md5" | ||
| "encoding/binary" | ||
| "fmt" | ||
| "os" | ||
|
|
||
| "github.com/cs3org/reva/pkg/appctx" | ||
| ) | ||
|
|
||
| // calcEtag will create an etag based on the md5 of | ||
| // - mtime, | ||
| // - inode (if available), | ||
| // - device (if available) and | ||
| // - size. | ||
| // errors are logged, but an etag will still be returned | ||
| func calcEtag(ctx context.Context, fi os.FileInfo) string { | ||
| log := appctx.GetLogger(ctx) | ||
| h := md5.New() | ||
| err := binary.Write(h, binary.BigEndian, fi.ModTime().Unix()) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing mtime") | ||
| } | ||
| // device and inode hale no meaning on windows | ||
| err = binary.Write(h, binary.BigEndian, fi.Size()) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing size") | ||
| } | ||
| return fmt.Sprintf(`"%x"`, h.Sum(nil)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // Copyright 2018-2019 CERN | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // In applying this license, CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| // +build !windows | ||
|
|
||
| package owncloud | ||
|
|
||
| import ( | ||
| "context" | ||
| "crypto/md5" | ||
| "encoding/binary" | ||
| "fmt" | ||
| "os" | ||
| "syscall" | ||
|
|
||
| "github.com/cs3org/reva/pkg/appctx" | ||
| ) | ||
|
|
||
| // calcEtag will create an etag based on the md5 of | ||
| // - mtime, | ||
| // - inode (if available), | ||
| // - device (if available) and | ||
| // - size. | ||
| // errors are logged, but an etag will still be returned | ||
| func calcEtag(ctx context.Context, fi os.FileInfo) string { | ||
| log := appctx.GetLogger(ctx) | ||
| h := md5.New() | ||
| err := binary.Write(h, binary.BigEndian, fi.ModTime().Unix()) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing mtime") | ||
| } | ||
| stat, ok := fi.Sys().(*syscall.Stat_t) | ||
| if ok { | ||
| // take device and inode into account | ||
| err = binary.Write(h, binary.BigEndian, stat.Ino) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing inode") | ||
| } | ||
| err = binary.Write(h, binary.BigEndian, stat.Dev) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing device") | ||
| } | ||
| } | ||
| err = binary.Write(h, binary.BigEndian, fi.Size()) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing size") | ||
| } | ||
| return fmt.Sprintf(`"%x"`, h.Sum(nil)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // Copyright 2018-2019 CERN | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // In applying this license, CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| // +build windows | ||
|
|
||
| package owncloud | ||
|
|
||
| import ( | ||
| "context" | ||
| "crypto/md5" | ||
| "encoding/binary" | ||
| "fmt" | ||
| "os" | ||
|
|
||
| "github.com/cs3org/reva/pkg/appctx" | ||
| ) | ||
|
|
||
| // calcEtag will create an etag based on the md5 of | ||
| // - mtime, | ||
| // - inode (if available), | ||
| // - device (if available) and | ||
| // - size. | ||
| // errors are logged, but an etag will still be returned | ||
| func calcEtag(ctx context.Context, fi os.FileInfo) string { | ||
| log := appctx.GetLogger(ctx) | ||
| h := md5.New() | ||
| err := binary.Write(h, binary.BigEndian, fi.ModTime().Unix()) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing mtime") | ||
| } | ||
| // device and inode have no meaning on windows | ||
| err = binary.Write(h, binary.BigEndian, fi.Size()) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("error writing size") | ||
| } | ||
| return fmt.Sprintf(`"%x"`, h.Sum(nil)) | ||
| } |