mirror of
https://github.com/codex-storage/deluge.git
synced 2025-01-27 11:45:44 +00:00
Include uploaded_memory in pickle_state().
This commit is contained in:
parent
cc20a34906
commit
b7c3fddf0e
26
src/core.py
26
src/core.py
@ -271,9 +271,6 @@ class Manager:
|
|||||||
self.state = persistent_state()
|
self.state = persistent_state()
|
||||||
|
|
||||||
def quit(self):
|
def quit(self):
|
||||||
# Analyze data needed for pickling, etc.
|
|
||||||
self.pre_quitting()
|
|
||||||
|
|
||||||
# Pickle the prefs
|
# Pickle the prefs
|
||||||
print "Saving prefs..."
|
print "Saving prefs..."
|
||||||
self.config.save()
|
self.config.save()
|
||||||
@ -293,24 +290,26 @@ class Manager:
|
|||||||
deluge_core.quit()
|
deluge_core.quit()
|
||||||
|
|
||||||
def pickle_state(self):
|
def pickle_state(self):
|
||||||
|
# Save the uploaded data from this session to the existing upload
|
||||||
|
# memory
|
||||||
|
for unique_ID in self.unique_IDs:
|
||||||
|
# self.get_core_torrent_state purposefully not cached.
|
||||||
|
#
|
||||||
|
# self.unique_IDs[unique_ID] is a reference to torrent_info
|
||||||
|
# instance in a self.state.torrents array, so changing something
|
||||||
|
# in self.unique_IDs[unique_ID] we also changing it in
|
||||||
|
# self.state.torrents array.
|
||||||
|
self.unique_IDs[unique_ID].uploaded_memory += \
|
||||||
|
self.get_core_torrent_state(unique_ID, False)['total_upload']
|
||||||
|
|
||||||
# Pickle the state so if we experience a crash, the latest state is
|
# Pickle the state so if we experience a crash, the latest state is
|
||||||
# available
|
# available
|
||||||
print "Pickling state..."
|
print "Pickling state..."
|
||||||
|
|
||||||
#print self.state.torrents
|
|
||||||
#print self.state.queue
|
|
||||||
|
|
||||||
output = open(os.path.join(self.base_dir, STATE_FILENAME), 'wb')
|
output = open(os.path.join(self.base_dir, STATE_FILENAME), 'wb')
|
||||||
pickle.dump(self.state, output)
|
pickle.dump(self.state, output)
|
||||||
output.close()
|
output.close()
|
||||||
|
|
||||||
def pre_quitting(self):
|
|
||||||
# Save the uploaded data from this session to the existing upload memory
|
|
||||||
for unique_ID in self.unique_IDs.keys():
|
|
||||||
# self.get_core_torrent_state purposefully not cached.
|
|
||||||
self.unique_IDs[unique_ID].uploaded_memory += \
|
|
||||||
self.get_core_torrent_state(unique_ID, False)['total_upload']
|
|
||||||
|
|
||||||
# Preference management functions
|
# Preference management functions
|
||||||
|
|
||||||
def get_config(self):
|
def get_config(self):
|
||||||
@ -893,7 +892,6 @@ class Manager:
|
|||||||
def get_queue_index(self, unique_ID):
|
def get_queue_index(self, unique_ID):
|
||||||
return self.state.queue.index(unique_ID)
|
return self.state.queue.index(unique_ID)
|
||||||
|
|
||||||
|
|
||||||
def apply_prefs(self):
|
def apply_prefs(self):
|
||||||
print "Applying preferences"
|
print "Applying preferences"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user