[Bf-blender-cvs] [6d25192] asset-engine: Add some (mostly commented) debug prints...

Bastien Montagne noreply at git.blender.org
Thu Sep 10 14:35:28 CEST 2015


Commit: 6d2519250afc224317b4eea0da84651da2cbd5f4
Author: Bastien Montagne
Date:   Thu Sep 10 14:13:01 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB6d2519250afc224317b4eea0da84651da2cbd5f4

Add some (mostly commented) debug prints...

===================================================================

M	release/scripts/startup/bl_operators/amber.py
M	source/blender/editors/space_file/filelist.c

===================================================================

diff --git a/release/scripts/startup/bl_operators/amber.py b/release/scripts/startup/bl_operators/amber.py
index 62c3780..41d5287 100644
--- a/release/scripts/startup/bl_operators/amber.py
+++ b/release/scripts/startup/bl_operators/amber.py
@@ -339,6 +339,7 @@ class AssetEngineAmber(AssetEngine):
                 act_rev = r
         if act_rev:
             entry.relpath = act_rev["path"]
+#        print("added entry for", entry.relpath)
 
     ########## PY-API only ##########
     # UI header
@@ -443,6 +444,7 @@ class AssetEngineAmber(AssetEngine):
     def load_pre(self, uuids, entries):
         # Not quite sure this engine will need it in the end, but for sake of testing...
         if self.repo:
+#            print(entries.entries[:])
             for uuid in uuids.uuids:
                 euuid = tuple(uuid.uuid_asset)
                 vuuid = tuple(uuid.uuid_variant)
@@ -456,6 +458,7 @@ class AssetEngineAmber(AssetEngine):
                 entry.blender_type = e["blen_type"]
                 # archive part not yet implemented!
                 entry.relpath = r["path"]
+#                print("added entry for", entry.relpath)
                 entry.uuid = euuid
                 var = entry.variants.add()
                 var.uuid = vuuid
@@ -468,6 +471,7 @@ class AssetEngineAmber(AssetEngine):
         return False
 
     def sort_filter(self, use_sort, use_filter, params, entries):
+#        print(use_sort, use_filter)
         if use_filter:
             filter_search = params.filter_search
             self.sortedfiltered.clear()
@@ -544,6 +548,7 @@ class AssetEngineAmber(AssetEngine):
         return False
 
     def entries_block_get(self, start_index, end_index, entries):
+#        print(entries.entries[:])
         if self.repo:
             print("self repo", len(self.sortedfiltered), start_index, end_index)
             for euuid, e in self.sortedfiltered[start_index:end_index]:
@@ -554,6 +559,7 @@ class AssetEngineAmber(AssetEngine):
                 entry = entries.entries.add()
                 entry.type = {'DIR'}
                 entry.relpath = path
+#                print("added entry for", entry.relpath)
                 entry.uuid = uuid
                 variant = entry.variants.add()
                 entry.variants.active = variant
@@ -564,6 +570,7 @@ class AssetEngineAmber(AssetEngine):
         return True
 
     def entries_uuid_get(self, uuids, entries):
+#        print(entries.entries[:])
         if self.repo:
             for uuid in uuids.uuids:
                 self.entry_from_uuid(entries, tuple(uuid.uuid_asset), tuple(uuid.uuid_variant), tuple(uuid.uuid_revision))
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index ce5d1e2..786e3a3 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -730,7 +730,7 @@ void filelist_sort_filter(struct FileList *filelist, FileSelectParams *params)
 			const bool need_filtering = filelist_need_filtering(filelist);
 			const bool changed = filelist->ae->type->sort_filter(
 			                         filelist->ae, need_sorting, need_filtering, params, &filelist->filelist);
-			printf("%s: changed: %d\n", __func__, changed);
+			printf("%s: changed: %d (%d - %d)\n", __func__, changed, need_sorting, need_filtering);
 			if (changed) {
 				filelist_cache_clear(&filelist->filelist_cache, filelist->filelist_cache.size);
 			}
@@ -1269,7 +1269,9 @@ static void filelist_cache_free(FileListEntryCache *cache)
 
 	BLI_ghash_free(cache->uuids, NULL, NULL);
 
+//	printf("\n\n%s:\n", __func__);
 	for (entry = cache->cached_entries.first; entry; entry = entry_next) {
+//		printf("\t%s (%p, %p)\n", entry->relpath, entry, entry->next);
 		entry_next = entry->next;
 		BKE_filedir_entry_free(entry);
 	}
@@ -1302,7 +1304,9 @@ static void filelist_cache_clear(FileListEntryCache *cache, size_t new_size)
 
 	cache->size = new_size;
 
+//	printf("\n\n%s:\n", __func__);
 	for (entry = cache->cached_entries.first; entry; entry = entry_next) {
+//		printf("\t%s (%p, %p)\n", entry->relpath, entry, entry->next);
 		entry_next = entry->next;
 		BKE_filedir_entry_free(entry);
 	}




More information about the Bf-blender-cvs mailing list