Compare commits
	
		
			2 Commits
		
	
	
		
			e79f83f800
			...
			171ec8fe4b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 171ec8fe4b | |||
| b7d5f4fcb1 | 
							
								
								
									
										3
									
								
								.github/workflows/test.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/test.yaml
									
									
									
									
										vendored
									
									
								
							@@ -21,7 +21,4 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
      - name: Run tests
 | 
					      - name: Run tests
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          # fuck this
 | 
					 | 
				
			||||||
          sed -i tests/mymod_test.out -e 's/846284/83d954/g'
 | 
					 | 
				
			||||||
          sed -i tests/mymod_test_bare_map.out -e 's/845da4/83d4b4/g'
 | 
					 | 
				
			||||||
          v -stats test .
 | 
					          v -stats test .
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										20
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								Makefile
									
									
									
									
									
								
							@@ -1,20 +0,0 @@
 | 
				
			|||||||
SRC_DIR ?= src
 | 
					 | 
				
			||||||
DOC_DIR ?= doc
 | 
					 | 
				
			||||||
TESTS_DIR ?= .
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
all: test
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
test:
 | 
					 | 
				
			||||||
	v test $(TESTS_DIR)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
doc:
 | 
					 | 
				
			||||||
	v doc -f html -m ./$(SRC_DIR) -o $(DOC_DIR)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
serve: clean doc
 | 
					 | 
				
			||||||
	v -e "import net.http.file; file.serve(folder: '$(DOC_DIR)')"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
clean:
 | 
					 | 
				
			||||||
	rm -r $(DOC_DIR) || true
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
cli:
 | 
					 | 
				
			||||||
	v cmd/mkembedfs -o mkembedfs
 | 
					 | 
				
			||||||
@@ -1,7 +1,6 @@
 | 
				
			|||||||
module main
 | 
					module main
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fn main() {
 | 
					fn main() {
 | 
				
			||||||
	println(embedfs)
 | 
					 | 
				
			||||||
	$if bare_map ? {
 | 
						$if bare_map ? {
 | 
				
			||||||
		json_file := embedfs['assets/example.json'] or { EmbedFile{} }
 | 
							json_file := embedfs['assets/example.json'] or { EmbedFile{} }
 | 
				
			||||||
		println(json_file.data.to_string().trim_space())
 | 
							println(json_file.data.to_string().trim_space())
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,12 +1 @@
 | 
				
			|||||||
EmbedFileSystem{
 | 
					 | 
				
			||||||
    files: {'assets/example.json': EmbedFile{
 | 
					 | 
				
			||||||
        data: embed_file.EmbedFileData{ len: 22, path: "assets/example.json", apath: "", uncompressed: 846284 }
 | 
					 | 
				
			||||||
        meta: EmbedFileMetadata{
 | 
					 | 
				
			||||||
            key: 'assets/example.json'
 | 
					 | 
				
			||||||
            name: 'example.json'
 | 
					 | 
				
			||||||
            ext: 'json'
 | 
					 | 
				
			||||||
            mimetype: 'application/json'
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }}
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
{"some": "JSON data"}
 | 
					{"some": "JSON data"}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,7 +20,7 @@ fn test_mymod() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
fn test_mymod_bare_map() {
 | 
					fn test_mymod_bare_map() {
 | 
				
			||||||
	oldpwd := os.getwd()
 | 
						oldpwd := os.getwd()
 | 
				
			||||||
	expected_out := os.read_file('tests/mymod_test_bare_map.out')!
 | 
						expected_out := os.read_file('tests/mymod_test.out')!
 | 
				
			||||||
	os.chdir('tests/mymod')!
 | 
						os.chdir('tests/mymod')!
 | 
				
			||||||
	gen := embedfs.CodeGenerator{
 | 
						gen := embedfs.CodeGenerator{
 | 
				
			||||||
		path:     'assets'
 | 
							path:     'assets'
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,10 +0,0 @@
 | 
				
			|||||||
{'assets/example.json': EmbedFile{
 | 
					 | 
				
			||||||
    data: embed_file.EmbedFileData{ len: 22, path: "assets/example.json", apath: "", uncompressed: 845da4 }
 | 
					 | 
				
			||||||
    meta: EmbedFileMetadata{
 | 
					 | 
				
			||||||
        key: 'assets/example.json'
 | 
					 | 
				
			||||||
        name: 'example.json'
 | 
					 | 
				
			||||||
        ext: 'json'
 | 
					 | 
				
			||||||
        mimetype: 'application/json'
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}}
 | 
					 | 
				
			||||||
{"some": "JSON data"}
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user