mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-31 11:20:09 +00:00 
			
		
		
		
	fixed a bug with incremental packing an index, now subsequent packs are combined and not overwritten...
added basic testing of IndexWithCache... Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									a2a07876e4
								
							
						
					
					
						commit
						e89aa0e9b9
					
				
							
								
								
									
										23
									
								
								index.py
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								index.py
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | |||||||
| #======================================================================= | #======================================================================= | ||||||
| 
 | 
 | ||||||
| __version__ = '''0.0.01''' | __version__ = '''0.0.01''' | ||||||
| __sub_version__ = '''20111208162058''' | __sub_version__ = '''20111208163546''' | ||||||
| __copyright__ = '''(c) Alex A. Naanou 2011''' | __copyright__ = '''(c) Alex A. Naanou 2011''' | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @ -291,7 +291,7 @@ def pack_file_index(path, ext='.json', pack_ext='.pack', keep_files=False, keep_ | |||||||
| 
 | 
 | ||||||
| 	NOTE: if keep_files is True, keep_dirs option will be ignored. | 	NOTE: if keep_files is True, keep_dirs option will be ignored. | ||||||
| 	''' | 	''' | ||||||
| 	z = zipfile.ZipFile(os.path.join(path, 'index' + pack_ext), 'w', compression=zipfile.ZIP_DEFLATED) | 	z = zipfile.ZipFile(os.path.join(path, 'index' + pack_ext), 'a', compression=zipfile.ZIP_DEFLATED) | ||||||
| 	for p, _, files in os.walk(path): | 	for p, _, files in os.walk(path): | ||||||
| 		for f in files:  | 		for f in files:  | ||||||
| 			if f.endswith(ext): | 			if f.endswith(ext): | ||||||
| @ -421,13 +421,14 @@ class IndexWithCache(Index): | |||||||
| 	def cache_flush(self): | 	def cache_flush(self): | ||||||
| 		''' | 		''' | ||||||
| 		''' | 		''' | ||||||
| 		save_file_index(self._cahe, self._path) | 		save_file_index(self._cache, self._path) | ||||||
| 	def cache_drop(self): | 	def cache_drop(self): | ||||||
| 		''' | 		''' | ||||||
| 		''' | 		''' | ||||||
| 		del self._cache | 		del self._cache | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | 
 | ||||||
| #----------------------------------------------------------------------- | #----------------------------------------------------------------------- | ||||||
| if __name__ == '__main__': | if __name__ == '__main__': | ||||||
| 	lst = list(list_files(config['ARCHIVE_ROOT'])) | 	lst = list(list_files(config['ARCHIVE_ROOT'])) | ||||||
| @ -452,8 +453,8 @@ if __name__ == '__main__': | |||||||
| 
 | 
 | ||||||
| 	root_index = save_file_index(index, os.path.join('test', 'index'), flat_index=False) | 	root_index = save_file_index(index, os.path.join('test', 'index'), flat_index=False) | ||||||
| 
 | 
 | ||||||
| 	##!!! this is not used in anything yet... | ##	##!!! this is not used in anything yet... | ||||||
| 	json.dump(root_index, file(os.path.join('test', 'index', 'file_index.json'), 'w')) | ##	json.dump(root_index, file(os.path.join('test', 'index', 'file_index.json'), 'w')) | ||||||
| 
 | 
 | ||||||
| 	pack_file_index(os.path.join('test', 'index'), keep_files=False) | 	pack_file_index(os.path.join('test', 'index'), keep_files=False) | ||||||
| 
 | 
 | ||||||
| @ -468,7 +469,17 @@ if __name__ == '__main__': | |||||||
| 
 | 
 | ||||||
| 	print len(i) | 	print len(i) | ||||||
| 
 | 
 | ||||||
| 	print i[k] | ##	print i[k] | ||||||
|  | 
 | ||||||
|  | 	ic = IndexWithCache(os.path.join('test', 'index')) | ||||||
|  | 
 | ||||||
|  | 	print ic[k] | ||||||
|  | 
 | ||||||
|  | 	ic['000000000000000000000000000000000'] = {} | ||||||
|  | 
 | ||||||
|  | 	ic.cache_flush() | ||||||
|  | 
 | ||||||
|  | 	pack_file_index(ic._path, keep_files=False) | ||||||
| 
 | 
 | ||||||
| 	os.remove(os.path.join('test', 'index', 'index.pack')) | 	os.remove(os.path.join('test', 'index', 'index.pack')) | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user