Nulo/kawipiko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[archiver] Add support for extensions stripping

Browse source
This commit is contained in:
Ciprian Dorin Craciun 2018-11-17 15:49:17 +02:00
parent 0cd82ecb44
commit 62b2c891fa
2 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
sources/cmd/archiver.go
View file

@ -15,6 +15,7 @@ import "net/http"
import "path/filepath" import "path/filepath"
import "os" import "os"
import "sort" import "sort"
import "strings"
import "syscall" import "syscall"
// import "github.com/colinmarc/cdb" // import "github.com/colinmarc/cdb"
@ -61,29 +62,47 @@ func archiveFile (_context *context, _pathResolved string, _pathInArchive string
} }
_fingerprint, _wasStored := _context.storedFiles[_fileId] _fingerprint, _wasStored := _context.storedFiles[_fileId]
var _data []byte
var _dataMeta map[string]string
if _wasStored { if ! _wasStored {
if _error := archiveReference (_context, NamespaceFilesContent, _pathInArchive, _fingerprint); _error != nil {
if _data_0, _error := ioutil.ReadAll (_file); _error == nil {
_data = _data_0
} else {
return _error return _error
} }
return nil
if _fingerprint_0, _data_0, _dataMeta_0, _error := prepareData (_context, _pathResolved, _pathInArchive, _name, _data, ""); _error != nil {
return _error
} else {
_fingerprint = _fingerprint_0
_data = _data_0
_dataMeta = _dataMeta_0
}
} }
var _data []byte for _, _extension := range StripExtensions {
if _data_0, _error := ioutil.ReadAll (_file); _error == nil { if strings.HasSuffix (_pathInArchive, _extension) {
_data = _data_0 _pathInArchive := _pathInArchive [: len (_pathInArchive) - len (_extension)]
} else { if _error := archiveReference (_context, NamespaceFilesContent, _pathInArchive, _fingerprint); _error != nil {
return _error
}
break
}
}
if _error := archiveReference (_context, NamespaceFilesContent, _pathInArchive, _fingerprint); _error != nil {
return _error return _error
} }
if _fingerprint_0, _error := archiveReferenceAndData (_context, NamespaceFilesContent, _pathResolved, _pathInArchive, _name, _data, ""); _error != nil { if ! _wasStored {
return _error if _error := archiveData (_context, _fingerprint, _data, _dataMeta); _error != nil {
} else { return _error
_fingerprint = _fingerprint_0 }
_context.storedFiles[_fileId] = _fingerprint
} }
_context.storedFiles[_fileId] = _fingerprint
return nil return nil
} }

6
sources/lib/archiver/index.go
View file

@ -11,3 +11,9 @@ var IndexNames = []string {
"index.xml", "index.xml",
} }
var StripExtensions = []string {
".html", ".htm",
".xhtml", ".xht",
".txt",
}