Use iteritems to save memory

This commit is contained in:
HelloZeroNet 2016-04-25 02:26:29 +02:00
parent 038bf4f2c8
commit bf384922a6

View file

@ -93,7 +93,7 @@ class SiteStorage:
cur.logging = False cur.logging = False
found = 0 found = 0
s = time.time() s = time.time()
for content_inner_path, content in self.site.content_manager.contents.items(): for content_inner_path, content in self.site.content_manager.contents.iteritems():
content_path = self.getPath(content_inner_path) content_path = self.getPath(content_inner_path)
if os.path.isfile(content_path): # Missing content.json file if os.path.isfile(content_path): # Missing content.json file
if self.db.loadJson(content_path, cur=cur): if self.db.loadJson(content_path, cur=cur):
@ -283,7 +283,7 @@ class SiteStorage:
if not self.site.content_manager.contents.get("content.json"): # No content.json, download it first if not self.site.content_manager.contents.get("content.json"): # No content.json, download it first
self.site.needFile("content.json", update=True) # Force update to fix corrupt file self.site.needFile("content.json", update=True) # Force update to fix corrupt file
self.site.content_manager.loadContent() # Reload content.json self.site.content_manager.loadContent() # Reload content.json
for content_inner_path, content in self.site.content_manager.contents.items(): for content_inner_path, content in self.site.content_manager.contents.iteritems():
i += 1 i += 1
if i % 50 == 0: if i % 50 == 0:
time.sleep(0.0001) # Context switch to avoid gevent hangs time.sleep(0.0001) # Context switch to avoid gevent hangs
@ -376,7 +376,7 @@ class SiteStorage:
self.log.debug("Deleting files from content.json...") self.log.debug("Deleting files from content.json...")
files = [] # Get filenames files = [] # Get filenames
for content_inner_path, content in self.site.content_manager.contents.items(): for content_inner_path, content in self.site.content_manager.contents.iteritems():
files.append(content_inner_path) files.append(content_inner_path)
# Add normal files # Add normal files
for file_relative_path in content.get("files", {}).keys(): for file_relative_path in content.get("files", {}).keys():