Changeset 0be6d8

Timestamp:

09/25/2009 12:57:22 AM (16 years ago)

Author:

Andrew Resch <andrewresch@gmail.com>

Branches:

2.0.x, develop, extjs4-port, master

Children:

66402b

Parents:

7749f9

Message:

Remove 'state_location' and 'config_location' preferences and all references from the code. We should use configmanager.get_config_dir() instead.

Location:

deluge/core

Files:

• core.py (modified) (2 diffs)
• oldstateupgrader.py (modified) (5 diffs)
• preferencesmanager.py (modified) (4 diffs)
• torrent.py (modified) (5 diffs)
• torrentmanager.py (modified) (6 diffs)

deluge/core/core.py

@@ -316 +316 @@
         from libtorrent's session status.
 
+        See: http://www.rasterbar.com/products/libtorrent/manual.html#status
+
         :param keys: the keys for which we want values
         :type keys: list
@@ -659 +661 @@
         ie, plugin_file.read()"""
 
-        f = open(os.path.join(self.config["config_location"], "plugins", filename), "wb")
+        f = open(os.path.join(deluge.configmanager.get_config_dir(), "plugins", filename), "wb")
         f.write(plugin_data.data)
         f.close()

deluge/core/oldstateupgrader.py

@@ -43 +43 @@
 from deluge._libtorrent import lt
 
-from deluge.configmanager import ConfigManager
+from deluge.configmanager import ConfigManager, get_config_dir
 import deluge.core.torrentmanager
 from deluge.log import LOG as log
@@ -70 +70 @@
     def __init__(self):
         self.config = ConfigManager("core.conf")
-        self.state05_location = os.path.join(self.config["config_location"], "persistent.state")
-        self.state10_location = os.path.join(self.config["state_location"], "torrents.state")
+        self.state05_location = os.path.join(get_config_dir(), "persistent.state")
+        self.state10_location = os.path.join(get_config_dir(), "state", "torrents.state")
         if os.path.exists(self.state05_location) and not os.path.exists(self.state10_location):
             # If the 0.5 state file exists and the 1.0 doesn't, then let's upgrade it
@@ -90 +90 @@
         new_state = deluge.core.torrentmanager.TorrentManagerState()
         for ti, uid in state.torrents.items():
-            torrent_path = os.path.join(self.config["config_location"], "torrentfiles", ti.filename)
+            torrent_path = os.path.join(get_config_dir(), "torrentfiles", ti.filename)
             try:
                 torrent_info = None
@@ -102 +102 @@
             # Copy the torrent file to the new location
             import shutil
-            shutil.copyfile(torrent_path, os.path.join(self.config["state_location"], str(torrent_info.info_hash()) + ".torrent"))
+            shutil.copyfile(torrent_path, os.path.join(get_config_dir(), "state", str(torrent_info.info_hash()) + ".torrent"))
 
             # Set the file prioritiy property if not already there
@@ -128 +128 @@
             log.debug("Saving torrent state file.")
             state_file = open(
-                os.path.join(self.config["state_location"], "torrents.state"), "wb")
+                os.path.join(get_config_dir(), "state", "torrents.state"), "wb")
             cPickle.dump(new_state, state_file)
             state_file.close()

deluge/core/preferencesmanager.py

@@ -50 +50 @@
 
 DEFAULT_PREFS = {
-    "config_location": deluge.configmanager.get_config_dir(),
     "send_info": False,
     "info_sent": 0.0,
@@ -62 +61 @@
     "torrentfiles_location": deluge.common.get_default_download_dir(),
     "plugins_location": os.path.join(deluge.configmanager.get_config_dir(), "plugins"),
-    "state_location": os.path.join(deluge.configmanager.get_config_dir(), "state"),
     "prioritize_first_last_pieces": False,
     "random_port": True,
@@ -159 +157 @@
         self.config.register_set_function("torrentfiles_location",
             self._on_set_torrentfiles_location)
-        self.config.register_set_function("state_location",
-            self._on_set_state_location)
         self.config.register_set_function("listen_ports",
             self._on_set_listen_ports)
@@ -247 +243 @@
                 log.debug("Unable to make directory: %s", e)
 
-    def _on_set_state_location(self, key, value):
-        if not os.access(value, os.F_OK):
-            try:
-                os.makedirs(value)
-            except Exception, e:
-                log.debug("Unable to make directory: %s", e)
-
     def _on_set_listen_ports(self, key, value):
         # Only set the listen ports if random_port is not true

deluge/core/torrent.py

@@ -43 +43 @@
 import deluge.common
 import deluge.component as component
-from deluge.configmanager import ConfigManager
+from deluge.configmanager import ConfigManager, get_config_dir
 from deluge.log import LOG as log
 from deluge.event import *
@@ -760 +760 @@
         resume_data = lt.bencode(resume_data)
         path = "%s/%s.fastresume" % (
-            self.config["state_location"],
+            os.path.join(get_config_dir(), "state"),
             self.torrent_id)
         try:
@@ -778 +778 @@
         """Deletes the .fastresume file"""
         path = "%s/%s.fastresume" % (
-            self.config["state_location"],
+            os.path.join(get_config_dir(), "state"),
             self.torrent_id)
         log.debug("Deleting fastresume file: %s", path)
@@ -789 +789 @@
         """Writes the torrent file"""
         path = "%s/%s.torrent" % (
-            self.config["state_location"],
+            os.path.join(get_config_dir(), "state"),
             self.torrent_id)
         log.debug("Writing torrent file: %s", path)
@@ -805 +805 @@
         """Deletes the .torrent file in the state"""
         path = "%s/%s.torrent" % (
-            self.config["state_location"],
+            os.path.join(get_config_dir(), "state"),
             self.torrent_id)
         log.debug("Deleting torrent file: %s", path)

deluge/core/torrentmanager.py

@@ -53 +53 @@
 import deluge.common
 import deluge.component as component
-from deluge.configmanager import ConfigManager
+from deluge.configmanager import ConfigManager, get_config_dir
 from deluge.core.torrent import Torrent
 from deluge.core.torrent import TorrentOptions
@@ -270 +270 @@
             _file = open(
                 os.path.join(
-                    self.config["state_location"],
+                    get_config_dir(), "state",
                     torrent_id + ".fastresume"),
                     "rb")
@@ -324 +324 @@
                 add_torrent_params["ti"] =\
                     self.get_torrent_info_from_file(
-                        os.path.join(self.config["state_location"], state.torrent_id + ".torrent"))
+                        os.path.join(get_config_dir(), "state", state.torrent_id + ".torrent"))
 
                 if not add_torrent_params["ti"]:
@@ -413 +413 @@
         if filedump:
             try:
-                save_file = open(os.path.join(self.config["state_location"],
+                save_file = open(os.path.join(get_config_dir(), "state",
                         torrent.torrent_id + ".torrent"),
                         "wb")
@@ -450 +450 @@
             _file = open(
                 os.path.join(
-                    self.config["state_location"], torrent_id + ".torrent"),
+                    get_config_dir(), "state", torrent_id + ".torrent"),
                         "rb")
             filedump = lt.bdecode(_file.read())
@@ -463 +463 @@
         """
         Remove a torrent from the session.
-        
+
         :param torrent_id: the torrent to remove
         :type torrent_id: string
         :param remove_data: if True, remove the downloaded data
         :type remove_data: bool
-        
+
         :returns: True if removed successfully, False if not
         :rtype: bool
-        
+
         :raises InvalidTorrentError: if the torrent_id is not in the session
-        
+
         """
-        
+
         if torrent_id not in self.torrents:
             raise InvalidTorrentError("torrent_id not in session")
-            
+
         # Emit the signal to the clients
         component.get("EventManager").emit(PreTorrentRemovedEvent(torrent_id))