-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use my fork of magicmime and add a buildtag EMBED_MAGIC_DB that makes the compilation embed the database using golang's "embed" package. Copy the embedded magic database to ~/.local/share/pistol if needed.
- Loading branch information
1 parent
918c204
commit 7228e51
Showing
15 changed files
with
199 additions
and
68 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,3 +25,4 @@ | |
/pistol | ||
result | ||
pistol.1 | ||
cmd/pistol/magic.mgc |
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,8 @@ | ||
//+build !EMBED_MAGIC_DB | ||
|
||
package main | ||
|
||
func GetDbPath(magicmime_version int) (string, error) { | ||
// And by that use the default location for the magic.mgc database | ||
return "", 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,50 @@ | ||
//+build EMBED_MAGIC_DB | ||
|
||
package main | ||
|
||
import ( | ||
_ "embed" | ||
"os" | ||
"fmt" | ||
"errors" | ||
"path/filepath" | ||
|
||
"github.com/adrg/xdg" | ||
) | ||
|
||
//go:embed magic.mgc | ||
var magic_db_data []byte | ||
|
||
func GetDbPath(magicmime_version int) (string, error) { | ||
// Create a copy of the magic database file with magic_db_data | ||
magic_db_dir := fmt.Sprintf("%s/pistol", xdg.DataHome) | ||
err := os.MkdirAll(magic_db_dir, 0755) | ||
if err != nil { | ||
return "", errors.New(fmt.Sprintf( | ||
"We've had issues creating a directory for the libmagic database at %s, error is: %s", | ||
magic_db_dir, err, | ||
)) | ||
} | ||
magic_db_path := fmt.Sprintf("%s/%d.mgc", magic_db_dir, magicmime_version) | ||
// Don't write the database if there's already a file there. | ||
if _, err := os.Stat(magic_db_path); errors.Is(err, os.ErrNotExist) { | ||
old_dbs, err := filepath.Glob(filepath.Join(magic_db_dir, "*.mgc")) | ||
if err != nil { | ||
return "", err | ||
} | ||
for _, old_db := range old_dbs { | ||
err = os.Remove(old_db) | ||
if err != nil { | ||
return "", err | ||
} | ||
} | ||
err = os.WriteFile(magic_db_path, magic_db_data, 0644) | ||
if err != nil { | ||
return "", errors.New(fmt.Sprintf( | ||
"Could not create a copy of libmagic database at %s, error is: %s", | ||
magic_db_path, err, | ||
)) | ||
} | ||
} | ||
return magic_db_path, nil | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 |
---|---|---|
@@ -1,22 +1,22 @@ | ||
module github.com/doronbehar/pistol | ||
|
||
go 1.12 | ||
go 1.16 | ||
|
||
require ( | ||
github.com/adrg/xdg v0.4.0 | ||
github.com/alecthomas/chroma v0.9.4 | ||
github.com/alessio/shellescape v1.4.1 | ||
github.com/alexflint/go-arg v1.4.2 | ||
github.com/alexflint/go-scalar v1.1.0 // indirect | ||
github.com/andybalholm/brotli v1.0.3 // indirect | ||
github.com/andybalholm/brotli v1.0.4 // indirect | ||
github.com/doronbehar/magicmime v0.1.1-0.20211127135329-3de4ff29dc49 | ||
github.com/dustin/go-humanize v1.0.0 | ||
github.com/golang/snappy v0.0.4 // indirect | ||
github.com/klauspost/compress v1.13.6 // indirect | ||
github.com/mholt/archiver/v3 v3.5.1 | ||
github.com/nwaples/rardecode v1.1.2 | ||
github.com/pierrec/lz4/v4 v4.1.10 // indirect | ||
github.com/rakyll/magicmime v0.1.0 | ||
github.com/pierrec/lz4/v4 v4.1.11 // indirect | ||
github.com/sirupsen/logrus v1.8.1 | ||
github.com/ulikunitz/xz v0.5.10 // indirect | ||
golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c // indirect | ||
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect | ||
) |
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
Oops, something went wrong.