Use 'd.save_resume' to flush session

Author: pyroscope

debian/changelog

@@ -1,6 +1,6 @@
-pyrocore (0.6.1) precise; urgency=low
+pyrocore (0.5.2) precise; urgency=high
 
-  * Next
+  * Fix: Use `d.save_resume` to flush session
 
  -- pyroscope <[email protected]>  Sat, 27 May 2017 19:23:30 +0200
 

src/pyrocore/data/config/rtorrent.d/auto-scrape.rc

@@ -39,7 +39,7 @@ method.insert = pyro._last_scrape.print, simple|private,\
 
 # HELPER: Set current time in a custom field (tm_last_scrape) and save session
 method.insert = pyro._last_scrape.bump, simple|private,\
-    "d.custom.set=tm_last_scrape, $cat=$system.time= ; d.save_full_session="
+    "d.custom.set=tm_last_scrape, $cat=$system.time= ; d.save_resume="
 
 # COMMAND: Send the scrape request, set 'tm_last_scrape' timestamp, and save session
 method.insert = d.tracker.bump_scrape, simple,\

src/pyrocore/data/config/rtorrent.d/timestamps.rc

@@ -4,14 +4,14 @@
 #   tm_completed = time of completion
 
 method.insert = pyro.tm_started.now, simple|private,\
-    "d.custom.set=tm_started,$cat=$system.time= ; d.save_session="
+    "d.custom.set=tm_started,$cat=$system.time= ; d.save_resume="
 method.insert = pyro.tm_completed.now, simple|private,\
-    "d.custom.set=tm_completed,$cat=$system.time= ; d.save_session="
+    "d.custom.set=tm_completed,$cat=$system.time= ; d.save_resume="
 
 method.set_key = event.download.resumed, time_stamp,\
     "branch=d.custom=tm_started,false=,pyro.tm_started.now="
 method.set_key = event.download.inserted_new, time_stamp,\
-    "d.custom.set=tm_loaded,$cat=$system.time= ; d.save_session="
+    "d.custom.set=tm_loaded,$cat=$system.time= ; d.save_resume="
 method.set_key = event.download.finished, time_stamp,\
     "pyro.tm_completed.now="
 method.set_key = event.download.hash_done,time_stamp,\
@@ -20,7 +20,7 @@ method.set_key = event.download.hash_done,time_stamp,\
 
 # EVENTS: Activation intervals
 method.insert = pyro.activations.append, simple|private,\
-    "d.custom.set=activations,\"$cat=$d.custom=activations,$argument.0=,$system.time=\" ;d.save_full_session="
+    "d.custom.set=activations,\"$cat=$d.custom=activations,$argument.0=,$system.time=\" ; d.save_resume="
 method.set_key = event.download.paused, activations, "pyro.activations.append=P"
 method.set_key = event.download.resumed, activations, "pyro.activations.append=R"
 
@@ -29,15 +29,15 @@ method.set_key = event.download.resumed, activations, "pyro.activations.append=R
 method.insert = pyro._tm_downloaded_stat, simple|private,\
     "execute.capture=sh,-c,\"echo -n \$(stat -c %Y \\\"$1\\\")\",getDownloadedDate,(d.tied_to_file)"
 method.insert = pyro._tm_downloaded_init, simple|private,\
-    "d.custom.set=tm_downloaded,(cat,(pyro._tm_downloaded_stat)); d.save_full_session="
+    "d.custom.set=tm_downloaded,(cat,(pyro._tm_downloaded_stat)); d.save_resume="
 method.insert = d.timestamp.downloaded, simple, "d.custom=tm_downloaded"
 method.set_key = event.download.inserted_new, set_downloaded_date, ((pyro._tm_downloaded_init))
 
 
 # SCHEDULE: Set "last_active" custom field for items that have peers
 method.insert = d.last_active, simple, "if=$d.peers_connected=,$cat=$system.time=,$d.custom=last_active"
 method.insert = d.last_active.update, simple|private,\
-    "d.custom.set=last_active,$cat=$system.time= ; branch=argument.0=,d.save_session="
+    "d.custom.set=last_active,$cat=$system.time= ; branch=argument.0=,d.save_resume="
 
 schedule2 = pyro_update_last_active, 24, 42,\
     "d.multicall2=started,\"branch=$d.peers_connected=,d.last_active.update=\""

src/pyrocore/torrent/rtorrent.py

@@ -501,7 +501,7 @@ def remove_with_links(path):
     def flush(self):
         """ Write volatile data to disk.
         """
-        self._make_it_so("saving session data of", ["save_full_session"])
+        self._make_it_so("saving session data of", ["save_resume"])
 
 
 class RtorrentEngine(engine.TorrentEngine):