Changeset 0da6739

Timestamp:

01/17/2014 07:15:38 PM (12 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

2.0.x, develop, master

Children:

169b9b

Parents:

bcbeca4

git-author:

Calum Lind <calumlind+deluge@gmail.com> (01/17/2014 07:12:54 PM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (01/17/2014 07:15:38 PM)

Message:

Fixes for #367 : Don't store last_seen_complete and total_uploaded in state file

Location:

deluge/core

Files:

• torrent.py (modified) (2 diffs)
• torrentmanager.py (modified) (4 diffs)

deluge/core/torrent.py

@@ -155 +155 @@
         self.status_funcs = None
 
-        # Default total_uploaded to 0, this may be changed by the state
-        self.total_uploaded = 0
-
         # Set the default options
         self.options = TorrentOptions()
@@ -168 +165 @@
         # Load values from state if we have it
         if state:
-            # This is for saving the total uploaded between sessions
-            self.total_uploaded = state.total_uploaded
             # Set the trackers
             self.set_trackers(state.trackers)

deluge/core/torrentmanager.py

@@ -67 +67 @@
                  torrent_id=None,
                  filename=None,
-                 total_uploaded=0,
                  trackers=None,
                  compact=False,
@@ -89 +88 @@
                  magnet=None,
                  time_added=-1,
-                 last_seen_complete=0,
                  owner=None,
                  shared=False):
@@ -662 +660 @@
                 paused = True
 
-            torrent_status = torrent.get_status([
-                "total_uploaded",
-                "last_seen_complete"
-            ], update=True)
-
             torrent_state = TorrentState(
                 torrent.torrent_id,
                 torrent.filename,
-                torrent_status["total_uploaded"],
                 torrent.trackers,
                 torrent.options["compact_allocation"],
@@ -692 +684 @@
                 torrent.magnet,
                 torrent.time_added,
-                torrent_status["last_seen_complete"],
                 torrent.owner,
                 torrent.options["shared"]