feat(server): no longer calculate md5 hashes for packages
	
		
			
	
		
	
	
		
			
				
	
				ci/woodpecker/pr/docs Pipeline was successful
				
					Details
				
			
		
			
				
	
				ci/woodpecker/pr/lint Pipeline was successful
				
					Details
				
			
		
			
				
	
				ci/woodpecker/pr/build Pipeline was successful
				
					Details
				
			
		
			
				
	
				ci/woodpecker/pr/docker Pipeline was successful
				
					Details
				
			
		
			
				
	
				ci/woodpecker/pr/man Pipeline was successful
				
					Details
				
			
		
			
				
	
				ci/woodpecker/pr/test Pipeline was successful
				
					Details
				
			
		
	
				
					
				
			
				
	
				ci/woodpecker/pr/docs Pipeline was successful
				
					Details
				
			
		
			
				
	
				ci/woodpecker/pr/lint Pipeline was successful
				
					Details
				
			
		
			
				
	
				ci/woodpecker/pr/build Pipeline was successful
				
					Details
				
			
		
			
				
	
				ci/woodpecker/pr/docker Pipeline was successful
				
					Details
				
			
		
			
				
	
				ci/woodpecker/pr/man Pipeline was successful
				
					Details
				
			
		
			
				
	
				ci/woodpecker/pr/test Pipeline was successful
				
					Details
				
			
		
	
							parent
							
								
									233dd20345
								
							
						
					
					
						commit
						97d000f18f
					
				|  | @ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 | ||||||
| 
 | 
 | ||||||
| ## [Unreleased](https://git.rustybever.be/vieter/vieter/src/branch/dev) | ## [Unreleased](https://git.rustybever.be/vieter/vieter/src/branch/dev) | ||||||
| 
 | 
 | ||||||
|  | ### Removed | ||||||
|  | 
 | ||||||
|  | * md5 hashes are no longer calculated for packages | ||||||
|  | 
 | ||||||
| ## [0.3.0](https://git.rustybever.be/vieter/vieter/src/tag/0.3.0) | ## [0.3.0](https://git.rustybever.be/vieter/vieter/src/tag/0.3.0) | ||||||
| 
 | 
 | ||||||
| Nothing besides bumping the versions. | Nothing besides bumping the versions. | ||||||
|  |  | ||||||
|  | @ -42,8 +42,8 @@ pub mut: | ||||||
| 	checkdepends []string | 	checkdepends []string | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // checksum calculates the md5 & sha256 hash of the package | // checksum calculates the sha256 hash of the package | ||||||
| pub fn (p &Pkg) checksum() ?(string, string) { | pub fn (p &Pkg) checksum() ?string { | ||||||
| 	return util.hash_file(p.path) | 	return util.hash_file(p.path) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -201,8 +201,7 @@ pub fn (pkg &Pkg) filename() string { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // to_desc returns a desc file valid string representation | // to_desc returns a desc file valid string representation | ||||||
| // TODO calculate md5 & sha256 instead of believing the file | pub fn (pkg &Pkg) to_desc() ?string { | ||||||
| pub fn (pkg &Pkg) to_desc() string { |  | ||||||
| 	p := pkg.info | 	p := pkg.info | ||||||
| 
 | 
 | ||||||
| 	// filename | 	// filename | ||||||
|  | @ -223,9 +222,8 @@ pub fn (pkg &Pkg) to_desc() string { | ||||||
| 	desc += format_entry('CSIZE', p.csize.str()) | 	desc += format_entry('CSIZE', p.csize.str()) | ||||||
| 	desc += format_entry('ISIZE', p.size.str()) | 	desc += format_entry('ISIZE', p.size.str()) | ||||||
| 
 | 
 | ||||||
| 	md5sum, sha256sum := pkg.checksum() or { '', '' } | 	sha256sum := pkg.checksum()? | ||||||
| 
 | 
 | ||||||
| 	desc += format_entry('MD5SUM', md5sum) |  | ||||||
| 	desc += format_entry('SHA256SUM', sha256sum) | 	desc += format_entry('SHA256SUM', sha256sum) | ||||||
| 
 | 
 | ||||||
| 	// TODO add pgpsig stuff | 	// TODO add pgpsig stuff | ||||||
|  |  | ||||||
|  | @ -139,7 +139,7 @@ fn (r &RepoGroupManager) add_pkg_in_arch_repo(repo string, arch string, pkg &pac | ||||||
| 
 | 
 | ||||||
| 	os.mkdir_all(pkg_dir) or { return error('Failed to create package directory.') } | 	os.mkdir_all(pkg_dir) or { return error('Failed to create package directory.') } | ||||||
| 
 | 
 | ||||||
| 	os.write_file(os.join_path_single(pkg_dir, 'desc'), pkg.to_desc()) or { | 	os.write_file(os.join_path_single(pkg_dir, 'desc'), pkg.to_desc()?) or { | ||||||
| 		os.rmdir_all(pkg_dir)? | 		os.rmdir_all(pkg_dir)? | ||||||
| 
 | 
 | ||||||
| 		return error('Failed to write desc file.') | 		return error('Failed to write desc file.') | ||||||
|  |  | ||||||
|  | @ -1,7 +1,6 @@ | ||||||
| module util | module util | ||||||
| 
 | 
 | ||||||
| import os | import os | ||||||
| import crypto.md5 |  | ||||||
| import crypto.sha256 | import crypto.sha256 | ||||||
| 
 | 
 | ||||||
| const ( | const ( | ||||||
|  | @ -23,12 +22,10 @@ pub fn exit_with_message(code int, msg string) { | ||||||
| 	exit(code) | 	exit(code) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // hash_file returns the md5 & sha256 hash of a given file | // hash_file returns the sha256 hash of a given file | ||||||
| // TODO actually implement sha256 | pub fn hash_file(path &string) ?string { | ||||||
| pub fn hash_file(path &string) ?(string, string) { |  | ||||||
| 	file := os.open(path) or { return error('Failed to open file.') } | 	file := os.open(path) or { return error('Failed to open file.') } | ||||||
| 
 | 
 | ||||||
| 	mut md5sum := md5.new() |  | ||||||
| 	mut sha256sum := sha256.new() | 	mut sha256sum := sha256.new() | ||||||
| 
 | 
 | ||||||
| 	buf_size := int(1_000_000) | 	buf_size := int(1_000_000) | ||||||
|  | @ -40,16 +37,12 @@ pub fn hash_file(path &string) ?(string, string) { | ||||||
| 		bytes_read := file.read(mut buf) or { return error('Failed to read from file.') } | 		bytes_read := file.read(mut buf) or { return error('Failed to read from file.') } | ||||||
| 		bytes_left -= u64(bytes_read) | 		bytes_left -= u64(bytes_read) | ||||||
| 
 | 
 | ||||||
| 		// For now we'll assume that this always works | 		// This function never actually fails, but returns an option to follow | ||||||
| 		md5sum.write(buf[..bytes_read]) or { | 		// the Writer interface. | ||||||
| 			return error('Failed to update md5 checksum. This should never happen.') | 		sha256sum.write(buf[..bytes_read])? | ||||||
| 		} |  | ||||||
| 		sha256sum.write(buf[..bytes_read]) or { |  | ||||||
| 			return error('Failed to update sha256 checksum. This should never happen.') |  | ||||||
| 		} |  | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	return md5sum.checksum().hex(), sha256sum.checksum().hex() | 	return sha256sum.checksum().hex() | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // pretty_bytes converts a byte count to human-readable version | // pretty_bytes converts a byte count to human-readable version | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue