Changeset 9e6230


Ignore:
Timestamp:
01/17/2014 06:29:53 PM (12 years ago)
Author:
Calum Lind <calumlind+deluge@gmail.com>
Branches:
2.0.x, develop, master
Children:
bcbeca4
Parents:
da6d0b
git-author:
Calum Lind <calumlind+deluge@gmail.com> (01/17/2014 06:29:48 PM)
git-committer:
Calum Lind <calumlind+deluge@gmail.com> (01/17/2014 06:29:53 PM)
Message:

More removal of lt deprecated params and funcs

Due to a deprecation mistake get_settings() should be used for python
bindings and it will return a dict.

Location:
deluge
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • deluge/core/core.py

    rda6d0b r9e6230  
    9090
    9191        # Set the user agent
    92         self.settings = lt.session_settings()
    93         self.settings.user_agent = "Deluge/%(deluge_version)s libtorrent/%(lt_version)s" % {
     92        settings = self.session.get_settings()
     93        settings["user_agent"] = "Deluge/%(deluge_version)s libtorrent/%(lt_version)s" % {
    9494            'deluge_version': deluge.common.get_version(),
    9595            'lt_version': self.get_libtorrent_version().rpartition(".")[0]
    9696        }
    9797        # Increase the alert queue size so that alerts don't get lost
    98         self.settings.alert_queue_size = 10000
     98        settings["alert_queue_size"] = 10000
    9999
    100100        # Set session settings
    101         self.settings.send_redundant_have = True
     101        settings["send_redundant_have"] = True
    102102        if deluge.common.windows_check():
    103             self.settings.disk_io_write_mode = \
    104                 lt.io_buffer_mode_t.disable_os_cache
    105             self.settings.disk_io_read_mode = \
    106                 lt.io_buffer_mode_t.disable_os_cache
    107         self.session.set_settings(self.settings)
     103            settings["disk_io_write_mode"] = lt.io_buffer_mode_t.disable_os_cache
     104            settings["disk_io_read_mode"] = lt.io_buffer_mode_t.disable_os_cache
     105        self.session.set_settings(settings)
    108106
    109107        self.session.add_extension("metadata_transfer")

  • deluge/core/preferencesmanager.py

    rda6d0b r9e6230  
    7979    "max_upload_slots_global": 4,
    8080    "max_half_open_connections": (lambda: deluge.common.windows_check() and
    81         (lambda: deluge.common.vista_check() and 4 or 8)() or 50)(),
     81                                  (lambda: deluge.common.vista_check() and 4 or 8)() or 50)(),
    8282    "max_connections_per_second": 20,
    8383    "ignore_limits_on_local_network": True,
    … …  
    152152}
    153153
     154
    154155class PreferencesManager(component.Component):
    155156    def __init__(self):
    … …  
    185186
    186187    def session_set_setting(self, key, value):
    187         settings = self.session.settings()
    188         setattr(settings, key, value)
     188        settings = self.session.get_settings()
     189        settings[key] = value
    189190        self.session.set_settings(settings)
    190191
    … …  
    226227
    227228        # Set the listen ports
    228         log.debug("listen port range set to %s-%s", listen_ports[0],
    229             listen_ports[1])
     229        log.debug("listen port range set to %s-%s", listen_ports[0], listen_ports[1])
    230230        self.session.listen_on(
    231231            listen_ports[0], listen_ports[1],
    … …  
    314314        log.debug("encryption settings:\n\t\t\tout_policy: %s\n\t\t\
    315315        in_policy: %s\n\t\t\tlevel: %s\n\t\t\tprefer_rc4: %s",
    316             set.out_enc_policy,
    317             set.in_enc_policy,
    318             set.allowed_enc_level,
    319             set.prefer_rc4)
     316                  set.out_enc_policy,
     317                  set.in_enc_policy,
     318                  set.allowed_enc_level,
     319                  set.prefer_rc4)
    320320
    321321    def _on_set_max_connections_global(self, key, value):
    … …  
    393393                self.config = config
    394394                threading.Thread.__init__(self)
     395
    395396            def run(self):
    396397                import time

  • deluge/core/torrent.py

    rda6d0b r9e6230  
    152152            self.torrent_info = None
    153153
    154         self.has_metadata = self.handle.has_metadata()
     154        self.has_metadata = self.status.has_metadata
    155155        self.status_funcs = None
    156156
    … …  
    330330    def set_auto_managed(self, auto_managed):
    331331        self.options["auto_managed"] = auto_managed
    332         if not (self.handle.is_paused() and not self.handle.is_auto_managed()):
     332        if not (self.status.paused and not self.status.auto_managed):
    333333            self.handle.auto_managed(auto_managed)
    334334            self.update_state()
    … …  
    445445
    446446        session_is_paused = component.get("Core").session.is_paused()
    447         is_auto_managed = self.handle.is_auto_managed()
    448         handle_is_paused = self.handle.is_paused()
    449447
    450448        if log.isEnabledFor(logging.DEBUG):
    … …  
    458456            self.state = "Error"
    459457            self.set_status_message(status.error)
    460             if handle_is_paused:
     458            if status.paused:
    461459                self.handle.auto_managed(False)
    462460            return
    463461
    464462        if ltstate == LTSTATE["Queued"] or ltstate == LTSTATE["Checking"]:
    465             if handle_is_paused:
     463            if status.paused:
    466464                self.state = "Paused"
    467465            else:
    … …  
    475473            self.state = "Allocating"
    476474
    477         if not session_is_paused and handle_is_paused and is_auto_managed:
     475        if not session_is_paused and status.paused and status.auto_managed:
    478476            self.state = "Queued"
    479         elif session_is_paused or (handle_is_paused and not is_auto_managed):
     477        elif session_is_paused or (status.paused and not status.auto_managed):
    480478            self.state = "Paused"
    481479
    … …  
    744742            "file_progress":          self.get_file_progress, # Adjust progress to be 0-100 value
    745743            "files":                  self.get_files,
    746             "is_seed":                self.handle.is_seed,
     744            "is_seed":                lambda: self.status.is_seeding,
    747745            "peers":                  self.get_peers,
    748746            "queue":                  self.handle.queue_position,
    … …  
    777775        # Turn off auto-management so the torrent will not be unpaused by lt queueing
    778776        self.handle.auto_managed(False)
    779         if self.handle.is_paused():
     777        if self.status.paused:
    780778            # This torrent was probably paused due to being auto managed by lt
    781779            # Since we turned auto_managed off, we should update the state which should
    … …  
    796794        """Resumes this torrent"""
    797795
    798         if self.handle.is_paused() and self.handle.is_auto_managed():
     796        if self.status.paused and self.status.auto_managed:
    799797            log.debug("Torrent is being auto-managed, cannot resume!")
    800798            return
    … …  
    803801            self.set_status_message("OK")
    804802
    805             if self.handle.is_finished():
     803            if self.status.is_finished:
    806804                # If the torrent has already reached it's 'stop_seed_ratio' then do not do anything
    807805                if self.options["stop_at_ratio"]:
    … …  
    917915    def force_recheck(self):
    918916        """Forces a recheck of the torrents pieces"""
    919         paused = self.handle.is_paused()
     917        paused = self.status.paused
    920918        try:
    921919            self.handle.force_recheck()

  • deluge/core/torrentmanager.py

    rda6d0b r9e6230  
    282282                        self.remove(torrent_id)
    283283                        break
    284                     if not torrent.handle.is_paused():
     284                    if not torrent.handle.status().paused:
    285285                        torrent.pause()
    286286

  • deluge/plugins/Scheduler/deluge/plugins/scheduler/core.py

    rda6d0b r9e6230  
    149149            session.set_download_rate_limit(int(self.config["low_down"] * 1024))
    150150            session.set_upload_rate_limit(int(self.config["low_up"] * 1024))
    151             settings = session.settings()
    152             settings.active_limit = self.config["low_active"]
    153             settings.active_downloads = self.config["low_active_down"]
    154             settings.active_seeds = self.config["low_active_up"]
     151            settings = session.get_settings()
     152            settings["active_limit"] = self.config["low_active"]
     153            settings["active_downloads"] = self.config["low_active_down"]
     154            settings["active_seeds"] = self.config["low_active_up"]
    155155            session.set_settings(settings)
    156156            # Resume the session if necessary
Note: See TracChangeset for help on using the changeset viewer.