Bump version to 1.3.13 and update dates

This reverts commit 852b51f224.

Changes applied for libtorrent 1.1.1 release should bring back
backward compatibility for Deluge 1.3.

.gitattributes

@@ -0,0 +1,25 @@
+/libtorrent/ export-ignore
+/win32/ export-ignore
+/osx/ export-ignore
+docs/build/ export-ignore
+docs/source/ export-ignore
+/tests/ export-ignore
+deluge/scripts/ export-ignore
+setup.cfg export-ignore
+check_glade.sh export-ignore
+createicons.sh export-ignore
+create_potfiles_in.py export-ignore
+gettextize.sh export-ignore
+deluge/i18n/deluge.pot export-ignore
+deluge/ui/web/css/*-debug.css export-ignore
+deluge/ui/web/js/*-debug.js export-ignore
+deluge/ui/web/js/deluge-all/ export-ignore
+deluge/ui/web/js/ext-extensions/ export-ignore
+deluge/ui/web/gen_gettext.py export-ignore
+deluge/ui/web/build export-ignore
+deluge/ui/web/docs/ export-ignore
+
+.gitattributes export-ignore
+.gitmodules export-ignore
+.gitignore export-ignore
+*.py diff=python

.gitignore

@@ -0,0 +1,13 @@
+*~
+build
+dist
+*egg-info
+*.egg
+*.log
+*.pyc
+*.tar.*
+_trial_temp
+deluge/i18n/*/
+*.desktop
+.build_data*
+osx/app

AUTHORS

@@ -0,0 +1,797 @@
+Authors:
+    * Andrew Resch ('andar') <andrewresch@gmail.com>
+    * Damien Churchill ('damoxc') <damoxc@gmail.com>
+
+Main Developers:
+    * Andrew Resch
+    * Damien Churchill
+    * John Garland ('johnnyg') <johnnybg+deluge@gmail.com>
+    * Calum Lind ('cas') <calumlind+deluge@gmail.com>
+
+libtorrent (http://www.libtorrent.org):
+    * Arvid Norberg
+
+Contributors (and Past Developers):
+    * Zach Tibbitts <zach@collegegeek.org>
+    * Alon Zakai ('Kripken') <kripkensteiner@gmail.com>
+    * Marcos Mobley ('markybob') <markybob@gmail.com>
+    * Alex Dedul
+    * Sadrul Habib Chowdhury
+    * Ido Abramovich <ido.deluge@gmail.com>
+    * Martijn Voncken <mvoncken@gmail.com>
+    * Mark Stahler ('kramed') <markstahler@gmail.com>
+    * Pedro Algarvio ('s0undt3ch') <ufs@ufsoft.org>
+    * Cristian Greco ('cgreco') <cristian@regolo.cc>
+    * Chase Sterling ('gazpachoKing') <chase.sterling@gmail.com>
+
+Plugin Developers:
+    * Autoadd       : Chase Sterling
+    * Blocklist     : John Garland
+    * Execute       : Damien Churchill
+    * Extractor     : Andrew Resch
+    * Label         : Martijn Voncken
+    * Notifications : Pedro Algarvio
+    * Scheduler     : Andrew Resch
+    * Webui         : Damien Churchill
+
+Images Authors:
+
+    * files: deluge/data/pixmaps/*.svg, *.png
+             deluge/ui/web/icons/active.png, alert.png, all.png, checking.png, dht.png,
+             downloading.png, inactive.png, queued.png, seeding.png, traffic.png
+      exceptions: deluge/data/pixmaps/deluge.svg and derivatives
+      copyright: Andrew Resch
+      license: GPLv3
+
+    * files: deluge/data/pixmaps/deluge.svg and derivatives
+             deluge/ui/web/icons/apple-pre-*.png, deluge*.png
+             deluge/ui/web/images/deluge*.png
+      copyright: Andrew Wedderburn
+      license: GPLv3
+
+    * files: deluge/plugins/blocklist/blocklist/data/*.png
+             deluge/data/pixmaps/tracker_warning16.png, tracker_all16.png, lock48.png
+      copyright: Gnome Icon Theme
+      license: GPLv2
+      url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
+
+    * files: deluge/data/pixmaps/magnet.png
+      copyright: Woothemes
+      license: Freeware
+      icon pack: WP Woothemes Ultimate
+      url: http://www.woothemes.com/
+
+    * files: deluge/data/pixmaps/flags/*.png
+      copyright: Mark James <mjames@gmail.com>
+      license: Public Domain
+      url: http://famfamfam.com/lab/icons/flags/
+
+    * files: deluge/ui/web/icons/*.png
+      exceptions: apple-pre-*.png, active.png, alert.png, all.png, deluge.png, dht.png,
+                  downloading.png, inactive.png, queued.png, seeding.png, traffic.png
+      copyright: Yusuke Kamiyamane <p@yusukekamiyamane.com>
+      license: Creative Commons Attribution 3.0 License
+      url: http://p.yusukekamiyamane.com/
+
+    * files: deluge/ui/web/images/spinner.gif, spinner-split.gif
+      copyright: Steven Chim
+      license: BSD license
+      url: http://members.upc.nl/j.chim/ext/spinner2/ext-spinner.html
+
+Translation Contributors:
+    * files: deluge/i18n/*.po
+
+    Aaron Wang Shi
+    abbigss
+    ABCdatos
+    Abcx
+    Actam
+    Adam
+    adaminikisi
+    adi_oporanu
+    Adrian Goll
+    afby
+    Ahmades
+    Ahmad Farghal
+    Ahmad Gharbeia أحمد غربية
+    akira
+    Aki Sivula
+    Alan Pepelko
+    Alberto
+    Alberto Ferrer
+    alcatr4z
+    AlckO
+    Aleksej Korgenkov
+    Alessio Treglia
+    Alexander Ilyashov
+    Alexander Matveev
+    Alexander Saltykov
+    Alexander Taubenkorb
+    Alexander Telenga
+    Alexander Yurtsev
+    Alexandre Martani
+    Alexandre Rosenfeld
+    Alexandre Sapata Carbonell
+    Alexey Osipov
+    Alin Claudiu Radut
+    allah
+    AlSim
+    Alvaro Carrillanca P.
+    A.Matveev
+    Andras Hipsag
+    András Kárász
+    Andrea Ratto
+    Andreas Johansson
+    Andreas Str
+    André F. Oliveira
+    AndreiF
+    andrewh
+    Angel Guzman Maeso
+    Aníbal Deboni Neto
+    animarval
+    Antonio Cono
+    antoniojreyes
+    Anton Shestakov
+    Anton Yakutovich
+    antou
+    Arkadiusz Kalinowski
+    Artin
+    artir
+    Astur
+    Athanasios Lefteris
+    Athmane MOKRAOUI (ButterflyOfFire)
+    Augusta Carla Klug
+    Avoledo Marco
+    axaard
+    AxelRafn
+    Axezium
+    Ayont
+    b3rx
+    Bae Taegil
+    Bajusz Tamás
+    Balaam's Miracle
+    Ballestein
+    Bent Ole Fosse
+    berto89
+    bigx
+    Bjorn Inge Berg
+    blackbird
+    Blackeyed
+    blackmx
+    BlueSky
+    Blutheo
+    bmhm
+    bob00work
+    boenki
+    Bogdan Bădic-Spătariu
+    bonpu
+    Boone
+    boss01
+    Branislav Jovanović
+    bronze
+    brownie
+    Brus46
+    bumper
+    butely
+    BXCracer
+    c0nfidencal
+    Can Kaya
+    Carlos Alexandro Becker
+    cassianoleal
+    Cédric.h
+    César Rubén
+    chaoswizard
+    Chen Tao
+    chicha
+    Chien Cheng Wei
+    Christian Kopac
+    Christian Widell
+    Christoffer Brodd-Reijer
+    christooss
+    CityAceE
+    Clopy
+    Clusty
+    cnu
+    Commandant
+    Constantinos Koniaris
+    Coolmax
+    cosmix
+    Costin Chirvasuta
+    CoVaLiDiTy
+    cow_2001
+    Crispin Kirchner
+    crom
+    Cruster
+    Cybolic
+    Dan Bishop
+    Danek
+    Dani
+    Daniel Demarco
+    Daniel Ferreira
+    Daniel Frank
+    Daniel Holm
+    Daniel Høyer Iversen
+    Daniel Marynicz
+    Daniel Nylander
+    Daniel Patriche
+    Daniel Schildt
+    Daniil Sorokin
+    Dante Díaz
+    Daria Michalska
+    DarkenCZ
+    Darren
+    Daspah
+    David Eurenius
+    davidhjelm
+    David Machakhelidze
+    Dawid Dziurdzia
+    Daya Adianto
+    dcruz
+    Deady
+    Dereck Wonnacott
+    Devgru
+    Devid Antonio FiloniDevilDogTG
+    di0rz`
+    Dialecti Valsamou
+    Diego Medeiros
+    Dkzoffy
+    Dmitrij D. Czarkoff
+    Dmitriy Geels
+    Dmitry Olyenyov
+    Dominik Kozaczko
+    Dominik Lübben
+    doomster
+    Dorota Król
+    Doyen Philippe
+    Dread Knight
+    DreamSonic
+    duan
+    Duong Thanh An
+    DvoglavaZver
+    dwori
+    dylansmrjones
+    Ebuntor
+    Edgar Alejandro Jarquin Flores
+    Eetu
+    ekerazha
+    Elias Julkunen
+    elparia
+    Emberke
+    Emiliano Goday Caneda
+    EndelWar
+    eng.essam
+    enubuntu
+    ercangun
+    Erdal Ronahi
+    ergin üresin
+    Eric
+    Éric Lassauge
+    Erlend Finvåg
+    Errdil
+    ethan shalev
+    Evgeni Spasov
+    ezekielnin
+    Fabian Ordelmans
+    Fabio Mazanatti
+    Fábio Nogueira
+    FaCuZ
+    Felipe Lerena
+    Fernando Pereira
+    fjetland
+    Florian Schäfer
+    FoBoS
+    Folke
+    Force
+    fosk
+    fragarray
+    freddeg
+    Frédéric Perrin
+    Fredrik Kilegran
+    FreeAtMind
+    Fulvio Ciucci
+    Gabor Kelemen
+    Galatsanos Panagiotis
+    Gaussian
+    gdevitis
+    Georg Brzyk
+    George Dumitrescu
+    Georgi Arabadjiev
+    Georg Sieber
+    Gerd Radecke
+    Germán Heusdens
+    Gianni Vialetto
+    Gigih Aji Ibrahim
+    Giorgio Wicklein
+    Giovanni Rapagnani
+    Giuseppe
+    gl
+    glen
+    granjerox
+    Green Fish
+    greentea
+    Greyhound
+    G. U.
+    Guillaume BENOIT
+    Guillaume Pelletier
+    Gustavo Henrique Klug
+    gutocarvalho
+    Guybrush88
+    Hans Rødtang
+    HardDisk
+    Hargas Gábor
+    Heitor Thury Barreiros Barbosa
+    helios91940
+    helix84
+    Helton Rodrigues
+    Hendrik Luup
+    Henrique Ferreiro
+    Henry Goury-Laffont
+    Hezy Amiel
+    hidro
+    hoball
+    hokten
+    Holmsss
+    hristo.num
+    Hubert Życiński
+    Hyo
+    Iarwain
+    ibe
+    ibear
+    Id2ndR
+    Igor Zubarev
+    IKON (Ion)
+    imen
+    Ionuț Jula
+    Isabelle STEVANT
+    István Nyitrai
+    Ivan Petrovic
+    Ivan Prignano
+    IvaSerge
+    jackmc
+    Jacks0nxD
+    Jack Shen
+    Jacky Yeung
+    Jacques Stadler
+    Janek Thomaschewski
+    Jan Kaláb
+    Jan Niklas Hasse
+    Jasper Groenewegen
+    Javi Rodríguez
+    Jayasimha (ಜಯಸಿಂಹ)
+    jeannich
+    Jeff Bailes
+    Jesse Zilstorff
+    Joan Duran
+    João Santos
+    Joar Bagge
+    Joe Anderson
+    Joel Calado
+    Johan Linde
+    John Garland
+    Jojan
+    jollyr0ger
+    Jonas Bo Grimsgaard
+    Jonas Granqvist
+    Jonas Slivka
+    Jonathan Zeppettini
+    Jørgen
+    Jørgen Tellnes
+    josé
+    José Geraldo Gouvêa
+    José Iván León Islas
+    José Lou C.
+    Jose Sun
+    Jr.
+    Jukka Kauppinen
+    Julián Alarcón
+    julietgolf
+    Jusic
+    Justzupi
+    Kaarel
+    Kai Thomsen
+    Kalman Tarnay
+    Kamil Páral
+    Kane_F
+    kaotiks@gmail.com
+    Kateikyoushii
+    kaxhinaz
+    Kazuhiro NISHIYAMA
+    Kerberos
+    Keresztes Ákos
+    kevintyk
+    kiersie
+    Kimbo^
+    Kim Lübbe
+    kitzOgen
+    Kjetil Rydland
+    kluon
+    kmikz
+    Knedlyk
+    koleoptero
+    Kőrösi Krisztián
+    Kouta
+    Krakatos
+    Krešo Kunjas
+    kripken
+    Kristaps
+    Kristian Øllegaard
+    Kristoffer Egil Bonarjee
+    Krzysztof Janowski
+    Krzysztof Zawada
+    Larry Wei Liu
+    laughterwym
+    Laur Mõtus
+    lazka
+    leandrud
+    lê bình
+    Le Coz Florent
+    Leo
+    liorda
+    LKRaider
+    LoLo_SaG
+    Long Tran
+    Lorenz
+    Low Kian Seong
+    Luca Andrea Rossi
+    Luca Ferretti
+    Lucky LIX
+    Luis Gomes
+    Luis Reis
+    Łukasz Wyszyński
+    luojie-dune
+    maaark
+    Maciej Chojnacki
+    Maciej Meller
+    Mads Peter Rommedahl
+    Major Kong
+    Malaki
+    malde
+    Malte Lenz
+    Mantas Kriaučiūnas
+    Mara Sorella
+    Marcin
+    Marcin Falkiewicz
+    marcobra
+    Marco da Silva
+    Marco de Moulin
+    Marco Rodrigues
+    Marcos
+    Marcos Escalier
+    Marcos Mobley
+    Marcus Ekstrom
+    Marek Dębowski
+    Mário Buči
+    Mario Munda
+    Marius Andersen
+    Marius Hudea
+    Marius Mihai
+    Mariusz Cielecki
+    Mark Krapivner
+    marko-markovic
+    Markus Brummer
+    Markus Sutter
+    Martin
+    Martin Dybdal
+    Martin Iglesias
+    Martin Lettner
+    Martin Pihl
+    Masoud Kalali
+    mat02
+    Matej Urbančič
+    Mathias-K
+    Mathieu Arès
+    Mathieu D. (MatToufoutu)
+    Mathijs
+    Matrik
+    Matteo Renzulli
+    Matteo Settenvini
+    Matthew Gadd
+    Matthias Benkard
+    Matthias Mailänder
+    Mattias Ohlsson
+    Mauro de Carvalho
+    Max Molchanov
+    Me
+    MercuryCC
+    Mert Bozkurt
+    Mert Dirik
+    MFX
+    mhietar
+    mibtha
+    Michael Budde
+    Michael Kaliszka
+    Michalis Makaronides
+    Michał Tokarczyk
+    Miguel Pires da Rosa
+    Mihai Capotă
+    Miika Metsälä
+    Mikael Fernblad
+    Mike Sierra
+    mikhalek
+    Milan Prvulović
+    Milo Casagrande
+    Mindaugas
+    Miroslav Matejaš
+    misel
+    mithras
+    Mitja Pagon
+    M.Kitchen
+    Mohamed Magdy
+    moonkey
+    MrBlonde
+    muczy
+    Münir Ekinci
+    Mustafa Temizel
+    mvoncken
+    Mytonn
+    NagyMarton
+    neaion
+    Neil Lin
+    Nemo
+    Nerijus Arlauskas
+    Nicklas Larsson
+    Nicolaj Wyke
+    Nicola Piovesan
+    Nicolas Sabatier
+    Nicolas Velin
+    Nightfall
+    NiKoB
+    Nikolai M. Riabov
+    Niko_Thien
+    niska
+    Nithir
+    noisemonkey
+    nomemohes
+    nosense
+    null
+    Nuno Estêvão
+    Nuno Santos
+    nxxs
+    nyo
+    obo
+    Ojan
+    Olav Andreas Lindekleiv
+    oldbeggar
+    Olivier FAURAX
+    orphe
+    osantana
+    Osman Tosun
+    OssiR
+    otypoks
+    ounn
+    Oz123
+    Özgür BASKIN
+    Pablo Carmona A.
+    Pablo Ledesma
+    Pablo Navarro Castillo
+    Paco Molinero
+    Pål-Eivind Johnsen
+    pano
+    Paolo Naldini
+    Paracelsus
+    Patryk13_03
+    Patryk Skorupa
+    PattogoTehen
+    Paul Lange
+    Pavcio
+    Paweł Wysocki
+    Pedro Brites Moita
+    Pedro Clemente Pereira Neto
+    Pekka "PEXI" Niemistö
+    Penegal
+    Penzo
+    perdido
+    Peter Kotrcka
+    Peter Skov
+    Peter Van den Bosch
+    Petter Eklund
+    Petter Viklund
+    phatsphere
+    Phenomen
+    Philipi
+    Philippides Homer
+    phoenix
+    pidi
+    Pierre Quillery
+    Pierre Rudloff
+    Pierre Slamich
+    Pietrao
+    Piotr Strębski
+    Piotr Wicijowski
+    Pittmann Tamás
+    Playmolas
+    Prescott
+    Prescott_SK
+    pronull
+    Przemysław Kulczycki
+    Pumy
+    pushpika
+    PY
+    qubicllj
+    r21vo
+    Rafał Barański
+    rainofchaos
+    Rajbir
+    ras0ir
+    Rat
+    rd1381
+    Renato
+    Rene Hennig
+    Rene Pärts
+    Ricardo Duarte
+    Richard
+    Robert Hrovat
+    Roberth Sjonøy
+    Robert Lundmark
+    Robin Jakobsson
+    Robin Kåveland
+    Rodrigo Donado
+    Roel Groeneveld
+    rohmaru
+    Rolf Christensen
+    Rolf Leggewie
+    Roni Kantis
+    Ronmi
+    Rostislav Raykov
+    royto
+    RuiAmaro
+    Rui Araújo
+    Rui Moura
+    Rune Svendsen
+    Rusna
+    Rytis
+    Sabirov Mikhail
+    salseeg
+    Sami Koskinen
+    Samir van de Sand
+    Samuel Arroyo Acuña
+    Samuel R. C. Vale
+    Sanel
+    Santi
+    Santi Martínez Cantelli
+    Sardan
+    Sargate Kanogan
+    Sarmad Jari
+    Saša Bodiroža
+    sat0shi
+    Saulius Pranckevičius
+    Savvas Radevic
+    Sebastian Krauß
+    Sebastián Porta
+    Sedir
+    Sefa Denizoğlu
+    sekolands
+    Selim Suerkan
+    semsomi
+    Sergii Golovatiuk
+    setarcos
+    Sheki
+    Shironeko
+    Shlomil
+    silfiriel
+    Simone Tolotti
+    Simone Vendemia
+    sirkubador
+    Sławomir Więch
+    slip
+    slyon
+    smoke
+    Sonja
+    spectral
+    spin_555
+    spitf1r3
+    Spiziuz
+    Spyros Theodoritsis
+    SqUe
+    Squigly
+    srtck
+    Stefan Horning
+    Stefano Maggiolo
+    Stefano Roberto Soleti
+    steinberger
+    Stéphane Travostino
+    Stephan Klein
+    Steven De Winter
+    Stevie
+    Stian24
+    stylius
+    Sukarn Maini
+    Sunjae Park
+    Susana Pereira
+    szymon siglowy
+    takercena
+    TAS
+    Taygeto
+    temy4
+    texxxxxx
+    thamood
+    Thanos Chatziathanassiou
+    Tharawut Paripaiboon
+    Theodoor
+    Théophane Anestis
+    Thor Marius K. Høgås
+    Tiago Silva
+    Tiago Sousa
+    Tikkel
+    tim__b
+    Tim Bordemann
+    Tim Fuchs
+    Tim Kornhammar
+    Timo
+    Timo Jyrinki
+    Timothy Babych
+    TitkosRejtozo
+    Tom
+    Tomas Gustavsson
+    Tomas Valentukevičius
+    Tomasz Dominikowski
+    Tomislav Plavčić
+    Tom Mannerhagen
+    Tommy Mikkelsen
+    Tom Verdaat
+    Tony Manco
+    Tor Erling H. Opsahl
+    Toudi
+    tqm_z
+    Trapanator
+    Tribaal
+    Triton
+    TuniX12
+    Tuomo Sipola
+    turbojugend_gr
+    Turtle.net
+    twilight
+    tymmej
+    Ulrik
+    Umarzuki Mochlis
+    unikob
+    Vadim Gusev
+    Vagi
+    Valentin Bora
+    Valmantas Palikša
+    VASKITTU
+    Vassilis Skoullis
+    vetal17
+    vicedo
+    viki
+    villads hamann
+    Vincent Garibal
+    Vincent Ortalda
+    vinchi007
+    Vinícius de Figueiredo Silva
+    Vinzenz Vietzke
+    virtoo
+    virtual_spirit
+    Vitor Caike
+    Vitor Lamas Gatti
+    Vladimir Lazic
+    Vladimir Sharshov
+    Wanderlust
+    Wander Nauta
+    Ward De Ridder
+    WebCrusader
+    webdr
+    Wentao Tang
+    wilana
+    Wilfredo Ernesto Guerrero Campos
+    Wim Champagne
+    World Sucks
+    Xabi Ezpeleta
+    Xavi de Moner
+    XavierToo
+    XChesser
+    Xiaodong Xu
+    xyb
+    Yaron
+    Yasen Pramatarov
+    YesPoX
+    Yuren Ju
+    Yves MATHIEU
+    zekopeko
+    zhuqin
+    Zissan
+    Γιάννης Κατσαμπίρης
+    Артём Попов
+    Миша
+    Шаймарданов Максим
+    蔡查理

ChangeLog

@@ -1,37 +1,668 @@
-Deluge 0.9.03 - "1.0.0_RC3" (In-Development)
- Core:
-  * File progress fixes from libtorrent
-  * Fix building on FreeBSD
-  * Fix #350 stop seeds when stop ratio is reached
-  * Fix #358 properly emit torrent_removed signal when remove_at_ratio happens
-  
- UI:
-  * Default to gtkui when running 'deluge' instead of defaulting to last used.
+=== Deluge 1.3.13 (20 July 2016) ===
+==== Core ====
+	* Increase RSA key size from 1024 to 2048 and use SHA256 digest.
+	* Fixed empty error message from certain trackers.
+	* Fixed torrent ending up displaying the wrong state.
+	* #1032: Force a torrent into Error state if the resume data is rejected.
+	* Workaround unwanted tracker announce when force rechecking paused torrent.
+	* #2703: Stop moving torrent files if target files exist to prevent unintended clobbering of data.
+	* #1330: Fixed the pausing and resuming of the Deluge session so torrents return to previous state.
+	* #2765: Add support for TLS SNI in httpdownloader.
+	* #2790: Ensure base32 magnet hash is uppercase to fix lowercase magnets uris.
 
- GtkUI:
-  * Fix open folder
-  * Fix #349 tab ordering when hiding/showing
+==== Daemon ====
+	* New command-line option to restict selected config key to read-only.
+	* Allow use of uppercase log level to match UIs.
 
- Windows:
-  * Fix torrent file association and adding files from command line
-  
- Plugins:
-  * Blocklist plugin has been rewritten
-  
- Misc:
-  * Some changes for python 2.6 compatibility
-  
-Deluge 0.9.02 - "1.0.0_RC2" (15 July 2008)
- Core:
-  * Fix displaying of file progress
-  * Fix files to have proper read/write permissions
+==== UI ====
+	* #2832: Fixed error with blank lines in auth file.
 
- WebUI:
-  * Include missing 'classic' template
-  * Update options tab to include queue settings
+==== GtkUI ====
+	* Fixed installing plugin from a non-ascii directory.
+	* Error'd torrents no longer display a progress percentage.
+	* #2753: Fixed the 'Added' column showing the wrong date.
+	* #2435: Prevent the user from changing tracker selection when editing trackers.
+	* Fixed showing the wrong connected status with hostname in the Connection Manager.
+	* #2754: Fixed the progress column to sort by progress and state correctly.
+	* #2696: Fixed incorrect Move Completed folder shown in Options tab.
+	* #2783: Sorting for name column is now case insensitive.
+	* #2795: Reduce height of Add Torrent Dialog to help with smaller screeen resoltuions.
+	* OSX: Fixed empty scrolling status (systray) menu.
+	* OSX: Fixed starting deluged from connection manager.
+	* #2093: Windows OS: Fixed opening non-ascii torrent files.
+	* #2855: Fixed adding UDP trackers to trackers dialog.
 
- Windows:
-  * Fix displaying of tray icon
-  * Fix scrolling of tray menu
-  * Fix hiding of tray icon when shutting down
-  * Fix tray icon tool tip length to show properly
+==== WebUI ====
+	* #2782: Fixed HTTPS negotiating incorrect cipher.
+	* #2485: Fixed the broken Options context menu.
+	* #2705: Fixed the hostlist config file not being created.
+	* #2293: Fixed plugin's js code not loading when using the WebUI plugin.
+
+==== Console ====
+	* Fixed adding non-ascii torrent in non-interactive mode.
+	* #2796: Add time_added to info sort keys.
+	* #2815: Fixed 'add' cmd path inconsistency on Windows.
+
+==== OSX Packaging ====
+	* Source .py files no longer included in Deluge.app.
+
+==== Windows OS Packaging ====
+	* #2777: Updated MSVC SP1 check to latest release CLID.
+
+==== Blocklist Plugin ====
+	* #2729: Fixed plugin lockup with empty url.
+
+==== Scheduler Plugin ====
+	* Fixed corrupt plugin prefences page on OSX.
+	* Fixed error accidentally introduced in 1.3.12.
+
+==== Notification Plugin ====
+	* #2402: Fixed the popup to show the actual count of files finished.
+	* #2857: Fixed issue with SMTP port entry not updating in GTKUI.
+
+==== AutoAdd Plugin ====
+	* Fixed watch dir not accepting uppercase file extension.
+
+==== Extractor Plugin ====
+	* Ignore the remaining rar part files to prevent spawning useless processes.
+	* #2785: Fixed only an empty folder when extracting rar files.
+
+==== Execute Plugin ====
+	* #2784: Windows OS: Escape ampersand in torrent args.
+
+=== Deluge 1.3.12 (13 September 2015) ===
+==== GtkUI ====
+	* #2731: Fix potential AttributeError in is_on_active_workspace
+
+==== Core ====
+	* Include fix for Twisted 15.0 URI class rename
+	* #2233: Fix AttributeError in set_trackers with lt 1.0
+	* Enable lt extension bindings again for versions >=0.16.7 (this disables Tracker Exchange by default)
+	* Backport atomic fastresume and state file saving fixes as another attempt to prevent data loss on unclean exits
+
+==== WebUI ====
+	* Fixed i18n issue in Connection Manager which left users unable to connect
+	* #2295: Increase cookie lifespan for display settings
+
+==== Console ====
+	* #2333: Fixed 'set and then get' in config command
+
+==== Scheduler Plugin ====
+	* Show current speed limit in statusbar
+
+==== Win32 Packaging ====
+	* #2736: Added version info to the properties of Deluge exes
+	* #2734: Added a 256x256 to deluge.ico
+	* #2325: Fixed the uninstaller deleting non-deluge files
+	* Include pillow module to enable resizing of tracker icons
+
+=== Deluge 1.3.11 (30 November 2014) ===
+==== GtkUI ====
+	* Fixed ImportError for users with Twisted < 10
+	* #2698: Fixed column issue when disabling a plugin
+
+==== Core ====
+	* Fixed cache issue with libtorrent 0.16 on Windows
+	* #2555: Disabled use of SSLv3 protocol for DelugeRPC
+
+==== WebUI ====
+	* Modify SSL Context to allow >= TLSv1 protocol
+	* #2588: Fixed Size column to show total_wanted instead of total_size
+
+=== Deluge 1.3.10 (15 October 2014) ===
+==== GtkUI ====
+	* #2256: Indexes are not updated correctly when removing column
+	* Fix bug in the torrentview when Plugins added a column
+
+==== WebUI ====
+	* Security update for POODLE vulnerability
+
+=== Deluge 1.3.9 (4 October 2014) ===
+==== GtkUI ====
+	* #2514: Fix every torrent is displayed twice in classic mode
+
+=== Deluge 1.3.8 (4 October 2014) ===
+==== Core ====
+	* #1126 & #2322: Emit FinishedEvent after moving storage complete
+	* Fixes to mitigate fastresume corruption
+
+==== GtkUI ====
+	* #2335: Fix application startup failing with 'cannot acquire lock' error
+	* #2497: Fix the Queued Torrents 'Clear' button not properly clearing the list of torrent
+	* #2496: Fix updating core_config before setting default options
+	* #2493: Fix TypeError if active workspace is None
+	* LP:#1168858: Nautilus window opens behind current window
+	* Fix showing the open_folder menuitem
+	* Suppress unimportant gnome warnings
+	* Optimized the updating of the torrent view
+	* Fixed Indicator icon label issue
+	* Fix listview error with new config
+
+==== WebUI ====
+	* Ensure values are updated from config upon showing a plugin page
+
+==== Extractor ====
+	* Add WebUI plugin page
+	* Find 7-zip application path on Windows via registry
+
+==== Execute ====
+	* #1290: Add a TorrentRemoved event option
+
+==== Scheduler ====
+	* #2238: Fix an 'undefined this.scheduleCells' error in javascript console
+
+==== Notifications ====
+	* #1310: Add WebUI plugin page
+
+==== Blocklist ====
+	* #2478: Add WebUI plugin page
+
+==== Console ====
+	* #2470: Fix console parsing args
+
+=== Deluge 1.3.7 (9 July 2014) ===
+==== Core ====
+	* #2324: Encryption level set by Deluge did not match libtorrent values
+	* #2303: Torrent state was not updated until after emitting TorrentFinishedEvent
+	* Fix twisted 13.1 compatability
+	* #2343: Fix error if listen interface is whitespace
+	* #2082: Validate ip address for listen_interface entry
+	* #1490: Increase the Alertmanager interval to 0.3s
+	* Prevent private flagged torrents auto-merging trackers
+
+==== GtkUI ====
+	* Fix issue with Plugins that add Tab to torrentdetails
+	* Fix the scalable icon install directory
+	* #2335: Fix IPC lockfile issue preventing start of deluge-gtk
+	* #2365: Fix hiding Progress column generating TypeError
+	* #2371: Add StartupWMClass to desktop file
+	* #2372: Fix the Ratio column not retaining position
+	* #2369: Fix bypassing the password dialog when showing/quitting
+
+==== WebUI ====
+	* #2374: Fix right-click selection issue
+	* #2310: Fix unicode password support
+	* #2418: Fix WebUI error when adding non-ascii torrent
+
+==== Windows OS ====
+	* Allow silent uninstall for Windows package
+	* #2367: Fix DelugeStart theme not showing Private Flag as ticked/checked
+	* #2315: Potential fix for lost window issue
+
+==== Extractor ====
+	* #2290: Fix dotted filenames being rejected
+
+=== Deluge 1.3.6 (25 Feburary 2013) ===
+==== Core ====
+	* Catch & log KeyError when removing a torrent from the queued torrents set
+	* Fix moving/renaming torrents issues when using libtorrent 0.16
+	* Make sure queue order is preserved when restarting
+	* #2160: Disable use of python bindings for libtorrent extensions and replace with session flag
+	* #2163: Fix unable add torrent file with empty (0:) encoding tag
+	* #2201: Fix error in authmanager if auth file has extra newlines
+	* #2109: Fix the Proxy settings not being cleared by setting None
+	* #2110: Fix accepting magnet uris with xt param anywhere within them
+	* #2204: Fix daemon shutdown hang with large numbers of torrents
+	* Fix prioritize first/last pieces option for magnet links
+
+==== Client ====
+	* Fix keyerrors after removing torrents from UIs
+
+==== GtkUI ====
+	* Add move completed option to add torrent dialog
+	* Prevent jitter in torrent view
+	* Fix torrent creation with non-ascii characters
+	* Fix #2100 : Add option not to bring main window to front when adding torrents through ipcinterface
+	* Add Quit Dialog when toggling classic mode in preferences and only show connection manager when not in classic mode.
+	* #2169: Fix 'Download Location' in the Add Torrent Dialog not set correctly when folder typed into Other->Location field
+	* #2171: Fix the Add Peer dialog not responding if empty or invalid values entered
+	* #2104: Fix no title set for the appindicator
+	* #2086: Fix submenus and icons for appindicator
+	* #2146: Fix missing translations in View|Tabs submenu
+	* Fix torrent names on libtorrent 0.16 on windows
+	* #2147: Fix missing translations for plugin preferences page
+	* #1474: Fix the on_show_prefs hook not being executed immediatly after enabling a plugin
+	* #1946: Fix ReactorNotRestartable error when set as startup application
+	* #2130: Fix same name can be given to different files in Add Torrent dialog
+	* #2129: Fix empty filename able to be set in AddTorrent dialog
+	* #2228: Fix Apply-To-All in AddTorrent Dialog copying file renames to other torrents
+	* #2260: Fix the Add Torrent dialog also bringing the main window to active workspace
+	* Fix showing exception error to user in Classic Mode with no libtorrent installed
+
+==== Console ====
+	* LP#1004793: Enable use of connect command in non-interactive mode
+	* Ensure console commands are executed in order
+	* #2065: Fix crash with missing closing quote
+	* #1397: Add support for -s STATE in info command
+
+==== WebUI ====
+	* Add move completed option to add torrent dialog
+	* #2112: Fix world readable tmp directory in json_api
+	* #2069: Fix login window layout problem when using larger than default font size
+	* #1890: Fix columns in files and peers view could use some spacing
+	* #2103: Fix sorting by name is case-sensitive [sedulous]
+	* #2120: Fix manually entered values not being saved in spinners
+	* #2212: Fix unable to scroll in proxy preferences page
+	* Fix autoconnecting to the default host
+	* #2046: Fix plugins not enabling properly until after refreshing page
+	* #2125: Fix plugin methods not being available when enabled until restart
+	* #2085: Fix not showing torrents in sidebar for categories other than 'All' in classic mode
+	* #2232: Fix flag icon path in Peers Tab missing deluge.config.base
+	* Fix submenus closing upon mouse click
+	* Add failed login log message, including IP address, to enable use with fail2ban
+	* #2261: Fix Proxy settings not being saved in preferences
+
+==== Windows OS ====
+	* Hide the cmd windows when running deluged.exe or deluge-web.exe
+	* Add deluged-debug.exe and deluge-web-debug.exe that still show the cmd window
+	* Add gtk locale files to fix untranslated text
+	* Fix the Open Folder option not working with non-ascii paths
+	* Fix the daemon starting with config dir containing spaces
+	* Fix Windows tray submenu items requiring right-click instead of left-click
+	* Fix issue with adding some torrents with illegal characters via url in gtk client
+	* #2240: Fix freespace issue with large capacity drives
+
+==== OS X ====
+	* Fix Open File/Folder option
+	* Add OS X Menu for GTK Quartz
+
+==== Execute ====
+	* Fix execute plugin not working with unicode torrent names
+
+==== Extractor ====
+	* Add Windows support, using 7-zip
+	* Added support for more extensions
+	* Disabled extracting 'Move Completed' torrents due to race condition
+
+=== Deluge 1.3.5 (09 April 2012) ===
+==== Core ====
+	* Fix not properly detecting when torrent is at end of queue
+	* #2049: Preserve order when moving multiple torrents in the queue
+
+==== GtkUI ====
+	* Modified fix for #1957, keyerror with non-acsii columns
+	* Fix translation of items in Sidebar and Torrent Menu
+	* #2052: Fix translation of Progress bar text
+	* #2071: Fix KeyError in gtkui when file priority set to value '3'
+	* #2064: Fix files treeview height in Create Dialog
+	* Fix missing semi-colon in deluge.desktop
+	* Disable setting file priorities for seeding torrents
+	* Bring MainWindow to front when opening another instance
+
+==== WebUI ====
+	* #2050: Fix 'Up Speed' column not sorting
+	* Hide unused Infohash button in WebUI
+
+==== Label ====
+	* Disable unusable items for 'All' in sidebar menu
+	* Fix items for translation
+
+==== Console ====
+	* Fix prefixed space for tab completing commands
+	* Fix missing trailing space for command options with tab complete
+
+==== Blocklist ====
+	* Use (documented) formatdate over format_date_time
+
+=== Deluge 1.3.4 (03 March 2012) ===
+==== Core ====
+	* #1921: Free disk space reporting incorrectly in FreeBSD
+	* #1964: Fix unhandled UnpicklingErrors
+	* #1967: Fix unhandled IndexError when trying to open a non-json conf file
+	* Fix setting daemon listen interface from command line
+	* #2021: Fix share ratio limit not obeyed for seeded torrents added to session
+	* Add optparse custom version to prevent unnecessary loading of libtorrent
+	* #1554: Fix seeding on share ratio failing for partially selected torrents
+	* Add proper process title naming in ps, top etc. (Depends: setproctitle)
+
+==== GtkUI ====
+	* #1918: Fix Drag'n'Drop not working in Windows
+	* #1941: Increase maximum Cache Size to 999999 (15GiB)
+	* #1940: File & folder renaming issue when using Add Torrent dialog in Windows
+	* LP#821577: Fix UnpicklingError when external selection dragged onto Files Tab
+	* #1934: Fix Unicode error in AddTorrent Dialog
+	* #1957: Fix keyerror when adding columns for non-latin languages
+	* #1969: Fix menu item 'Quit & Shutdown' still available when not connected to daemon
+	* #1895: Fix Files Tab showing wrong files due to torrent_info race condition
+	* #2010: Move speed text in titlebar to the beginning
+	* #2032: Wait for client to shutdown/disconnect before stopping reactor
+	* Fix compatibility with Python 2.5
+	* Fix collapsed treeview in Create Torrent dialog
+	* Ignore unmaximise event when window isn't visible
+	* #1976: Fixed text entry with trailing newline characters causing issues for Move Storage
+
+==== WebUI ====
+	* Fix Webui files-tab menu setting wrong priority
+	* Update to ExtJS 3.4.0
+	* #1960: Fix statustab showing total_payload_download for upload as well
+	* Remove uneeded Titlebar to save space
+	* Fix clipped Browse button in WebUI
+	* #1915: Fix being unable to stop the status bar from autohiding
+	* Fix password box focus issue in Firefox
+	* Fix plugin uploads from behind a reverse proxy
+	* #2010: Move speed text in titlebar to the beginning
+	* #1936: Fix Referenced before assignment error in json_api
+	* Changes are now applied when clicking OK in Preferences
+	* Added Download,Uploaded,Down Limit, Up Limit & Seeder/Peeds columns
+	* Add magnet uri support to Add Url
+	* Add keymaps for torrents - Ctrl-A (select all) and Delete
+	* #2037: Fix 'Add Torrents' torrents list not scrolling
+	* #2038: Fix Chrome 17 disconnecting from webui
+
+==== Console ====
+	* #1953: Fix flickering on every update
+	* #1954: Fix 'invalid literal for float' when setting listen interface
+	* #1945: Fix UnicodeDecodeError when using non-ascii chars in info
+
+==== Label ====
+	* #1961: Add missing 'All' filter option
+	* #2035: Fix label options dialog in webui
+	* #2036: Fix newly added labels not being sorted in torrent right click menu
+
+==== Notification ====
+	* #1905: Fix no email sent to second email address
+	* #1898: Fix email notifications not including date/time they were sent
+
+==== Scheduler ====
+	* Add plugin page for WebUi
+
+==== Execute ====
+	* Commands now run scripts asynchronous to prevent Deluge from hanging
+
+==== AutoAdd ====
+	* Added watch folder support for '.magnet' text file containing single or multiple magnet uris
+	* Fix glade object issue when re-enabling plugin in same session
+	* Fix plugin not showing as enabled in webui
+
+=== Deluge 1.3.3 (22 July 2011) ===
+==== Core ====
+	* Properly show the 'Checking Resume Data' state instead of just 7
+	* #1788: Added ability to use XDG_DOWNLOAD_DIR as default download folder
+	* Fix path error with torrent files prefixed with 'file://' from Firefox
+	* #1869: Fix setting the disk io read/write to bypass OS cache in Windows
+	* #1504: Fix win32 running deluged as not logged in user via runas or service
+	* #890: If added torrent already exists, append extra trackers to it
+	* #1338: Fix Seeds and Peers totals not updating
+	* #1239: Fix translated Tracker Error text not counted in sidebar Error status
+	* Fix httpdownloader error with existing filename
+	* #1505: Add libtorrent info to version output
+	* #1637 Fix UnicodeDecodeError from 'deluge-* --help' with non-english languages
+	* #1714 Fix handling of backslashes when renaming files/folders
+
+==== GtkUI ====
+	* Show the checking icon for torrents in the 'Checking Resume Data' state
+	* #1195: Fix right-click selecting issue when switching between folders and files
+	* Add F2 key shortcut for renaming filenames in the Files Tab
+	* Increase max piece size to 16 MiB in create torrent dialog
+	* #1475: Fix save and restore Preferences dialog size from config
+	* Add search as you type to the torrent view
+	* #1456: Fix no ETA showing with multiple files
+	* #1560: Fix FilesTab Progress value sorting by int instead of float
+	* #1263: Fix not remembering column widths
+	* #948: New Release Dialog now shows the server version
+	* Fix peers in PeersTab showing non-zero download rate when seeding
+
+==== AutoAdd ====
+	* #1861: Fix AutoAdd Warning (column number is a boolean)
+
+==== Label ====
+	* #1246: Fix losing Labels upon restart
+
+==== Execute ====
+	* #1477: Fix ignore Added events from state file on startup
+
+==== ConsoleUI ====
+	* #1258: Add support for urls and magnet uris in add command
+	* #1801: Fix unhandled defered error and missing error message upon failed connect
+
+=== Deluge 1.3.2 (24 May 2011) ===
+==== Core ====
+	* #1527: Fix Converting unicode to unicode error in move_storage
+	* #1373: Fix creating and moving non-ascii folder names in MS Windows
+	* #1507: Fix temporary file race condition in core/core.py:add_torrent_url
+	* Fix a bug that can occur when upgrading 1.1 config files
+	* #1517: Fix isohunt urls not loading
+	* Handle redirection when adding a torrent by url
+	* #1614: Fix autoadd matching a directory called "torrent"
+	* #1742: Fix failure in Event handler prevents further emissions
+
+==== GtkUI ====
+	* #1514: Added Indicator Applet
+	* #1494: Add torrent columns Downloaded and Uploaded
+	* #1308: Add torrent column Seeds/Peers ratio
+	* #1646: Add torrent columns for per torrent upload and download speed limits
+	* Add missing icons for Trackers filter
+	* Fix inconsistancies in the text for translation
+	* #1510: Fix cannot create a torrent with only non-zero tier trackers
+	* #1513: Fix unhandled Twisted Error in test_listen_port
+	* #690:  Fix renaming folders does not remove old empty folders
+	* #1336: Fix uneeded horizontal scrollbar showing in Files & Peers Tab
+	* #1508: Fix TypeError in cell_data_queue() could not convert argument to correct param type
+	* #1498: Fix double slashes appearing when renaming
+	* #1283: Fix consistent icons for Files tab
+	* #1282: Text for AutoManaged changed to 'On/Off' and localized
+	* Fix Up/Down buttons in Edit Trackers Dialog
+	* Add Key Shortcuts for main menu functions
+
+==== WebUI ====
+	* #1194: Fix infinite login prompt in web ui through reverse proxy
+	* #1355: Fix slow changing states in webUI
+	* #1536: Fix Edit Trackers window not scrolling and not being resizable
+	* #1799: Fix Missing textbox for "Move completed" in torrent options
+	* #1562: Fix Javascript error in Web UI when re-opening preferences
+	* #1567: Fix js from plugins does not work with different 'base' setting
+	* #1268: Fix torrent errors not displayed in webui
+	* #1323: Fix filter panels not scrollable
+	* Fix file uploads from behind a reverse proxy.
+	* #1333: Fix peer list doesn't update automatically
+	* #1537: Fix editing trackers list, trackers have to be reselected
+
+==== ConsoleUI ====
+	* #755:  Fix can't set listen_ports through console UI
+	* #1500: Fix Console crashes on command longer than terminal width
+	* #1248: Fix deluge-console unicode support on redirected stdout
+	* Fix for deluge-console not adding torrent files on MS Windows
+	* #1450: Fix trailing white space in paths
+	* Misc: Updated help text for deluge-console on MS Windows
+	* #1484: Fix trying to access the screen object when not using interactive mode
+	* #1548: Fix cli argument processing
+	* #1856: Add --sort option to info command
+	* #1857: Add seeding_time, active_time and tracker_status to info command
+
+==== Scheduler ====
+	* #1506: Fix max speed not restored on a yellow->green transition
+
+=== Deluge 1.3.1 (31 October 2010) ===
+==== Core ====
+	* #1369: Fix non-ascii config folders not working in windows
+
+==== GtkUI ====
+	* #1365: Fix sidebar not updating show/hide trackers
+	* #1247: Fix hang on quit
+
+==== WebUI ====
+	* #1364: Fix preferences not saving when the web ui plugin is enabled in classic mode
+	* #1377: Fix bug when enabling plugins
+	* #1370: Fix issues with preferences
+	* #1312: Fix deluge-web using 100% CPU
+
+=== Deluge 1.3.0 (18 September 2010) ===
+==== Core ====
+	* Fix issue where the save_timer is cancelled when it's not active
+	* Fix unhandled exception when adding a torrent to the session
+	* Moved xdg import so it is not called on Windows, where it is unused. fixes #1343
+	* Fix key error after enabling a plugin that introduces a new status key
+	* Ignore global stop ratio related settings in logic, so per torrent ones are used.
+	* Ensure preferencesmanager only changes intended libtorrent session settings.
+	* Fix issue when adding torrents without a 'session'. This can happen when a plugin adds a torrent, like how the AutoAdd plugin works. The user that adds this torrent will be an empty string.
+	* Add TorrentFileCompleted event
+
+==== GtkUI ====
+	* Increase max piece size to 8 MiB in create torrent dialog (closes #1358)
+
+==== Scheduler ====
+	* Add max active downloading and seeding options to scheduler.
+	* Fix scheduler so that it keeps current state, even after global settings change.
+
+==== AutoAdd ====
+	* AutoAdd plugin can now recover when one of the watchfolders has an unhandled exception.
+	* Fix bug in AutoAdd plugin where watchdirs would not display in gtkui when first enabled.
+	* Fix bugs with unicode torrents in AutoAdd plugin.
+
+=== Deluge 1.3.0-rc2 (20 August 2010) ===
+==== Core ====
+	* Fix tracker_icons failing on windows
+	* Fix #1302 an uncaught exception in an state_changed event handler in SessionProxy was preventing the TorrentManager's stop method from properly saving all the resume data
+	* Fix issue with SessionProxy not updating the torrent status correctly when get_torrent_status calls take place within the cache_expiry time
+
+==== ConsoleUI ====
+	* #1307: Fix not being able to add torrents
+	* #1293: Fix not being able to add paths that contain backslashes
+
+==== GtkUI ====
+	* Fix uncaught exception when closing deluge in classic mode
+
+==== Execute ====
+	* #1306: Fix always executing last event
+
+==== Label ====
+	* Fix being able to remove labels in web ui
+
+==== WebUI ====
+	* #1319: Fix shift selecting in file trees
+
+=== Deluge 1.3.0-rc1 (08 May 2010) ===
+==== Core ====
+	* Implement #1063 option to delete torrent file copy on torrent removal - patch from Ghent
+	* Implement #457 progress bars for folders
+	* Implement #1012 httpdownloader supports gzip decoding
+	* #496: Remove deprecated functions in favour of get_session_status()
+	* #1112: Fix renaming files in add torrent dialog
+	* #1247: Fix deluge-gtk from hanging on shutdown
+	* #995: Rewrote tracker_icons
+	* Add AutoAdd plugin
+	* Add Notifications plugin
+
+==== GtkUI ====
+	* Use new SessionProxy class for caching torrent status client-side
+	* Use torrent status diffs to reduce RPC traffic
+
+==== Blocklist ====
+	* Implement local blocklist support
+	* #861: Pause transfers until blocklist is imported
+	* Fix redirection not working with relative paths
+
+==== Execute ====
+	* Fix running commands with the TorrentAdded event
+	* Fix the web interface
+
+==== Label ====
+	* Fix the web interface  (#733)
+
+==== Web ====
+	* Migrate to ExtJS 3.1
+	* Add gzip compression of HTTP data to the server
+	* Improve the efficiency of the TorrentGrid with lots of torrents (#1026)
+	* Add a base parameter to allow reverse proxying (#1076)
+	* Fix showing all the peers in the details tab (#1054)
+	* Fix uploading torrent files in Opera or IE (#1087)
+	* Complete IE support
+
+=== Deluge 1.2.0 - "Bursting like an infected kidney" (10 January 2010) ===
+==== Core ====
+	* Implement new RPC protocol DelugeRPC replacing XMLRPC
+	* Move to a twisted framework
+	* Add an 'Error' filter for Trackers to show trackers that currently have a tracker error
+	* Use system GeoIP database if available, this is now an optional dependency
+
+==== GtkUI ====
+	* Remove SignalReceiver
+	* Implemented a cross-platform IPC method thus removing the DBUS dependency
+	* Implement a "True" Classic Mode where there is no longer a separate daemon process
+	* Add preferences option "Add torrent in paused state"
+	* Add tracker icons to the Tracker column
+	* Implement #259 show tooltip with country name in the peers tab
+	* Add an error category to the tracker sidebar list
+	* Add Find More Plugins button to Plugins preference page
+	* Fix #518 remove header in add torrent dialog to save vertical space
+	* Add a Cache preferences page to adjust cache settings and examine cache status
+	* Add ability to rename files prior to adding them
+	* Fix shutdown handler with GNOME session manager
+	* Allow 4 MiB piece sizes when creating a torrent
+
+==== ConsoleUI ====
+	* Changed to use curses for a more interactive client
+
+==== WebUI ====
+	* Move over to using Twisted-Web for the webserver.
+	* Move to only AJAX interface built upon Ext-JS.
+
+==== Plugins ====
+	* Add Scheduler plugin
+	* Add Extractor plugin
+
+==== Misc ====
+	* PyGTK dependency bumped to => 2.12 to use new tooltip system
+	* Add new scripts for invoking UIs: deluge-gtk, deluge-web, deluge-console
+	* Remove GeoIP database from the source tree
+
+=== Deluge 1.1.0 - "Time gas!" (10 January 2009) ===
+==== Core ====
+	* Implement #79 ability to change outgoing port range
+	* Implement #296 ability to change peer TOS byte
+	* Add per-torrent move on completed settings
+	* Implement #414 use async save_resume_data method
+	* Filter Manager with torrent filtering in get_torrents_status , for sidebar and plugins.
+	* Implement #368 add torrents by infohash/magnet uri (trackerless torrents)
+	* Remove remaining gtk functions in common
+	* Tracker icons.
+	* Add ETA for torrents with stop at seed ratio set
+	* Fix #47 the state and config files are no longer invalidated when there is no diskspace
+	* Fix #619 return "" instead of "Infinity" if seconds == 0 in ftime
+	* Add -P, --pidfile option to deluged
+
+==== GtkUI ====
+	* Add peer progress to the peers tab
+	* Add ability to manually add peers
+	* Sorting # column will place downloaders above seeds
+	* Remove dependency on libtorrent for add torrent dialog
+	* Allow adding multiple trackers at once in the edit tracker dialog
+	* Implement #28 Create Torrent Dialog
+	* Redesiged sidebar with filters for Active and Tracker (see Filter Manager)
+	* Implement #428 the ability to rename files and directories
+	* Implement #229 add date added column
+	* Implement #596 show speeds in title
+	* Fix #636 not setting the daemon's config directory when using --config= with the UI in classic mode.
+	* Fix #624 do not allow changing file priorities when using compact allocation
+	* Fix #602 re-did files/peers tab state saving/loading
+	* Fix gtk warnings
+	* Add protocol traffic statusbar item
+	* Rework the Remove Torrent Dialog to only have 2 options, remove data and remove from session.
+	* Add "Install Plugin" and "Rescan Plugins" buttons to the Plugins preferences
+	* Make active port test use internal graphic instead of launching browser
+
+==== WebUI ====
+	* Lots of smaller tweaks.
+	* All details tabs have the same features as in gtk-ui 1.0.x
+	* Persistent sessions #486
+	* Plugin improvements for easy use of templates and images in eggs. #497
+	* Classic template takes over some style elements from white template.
+	* https (for users that know how to create certificates)
+	* Easier apache mod_proxy use.
+	* Redesigned sidebar
+
+==== AjaxUI ====
+	* Hosted in a webui template.
+
+==== ConsoleUI ====
+	* New ConsoleUI written by Idoa01
+	* Callable from command-line for scripts.
+
+==== Plugins ====
+	* Stats plugin for graphs.
+	* Label plugin for grouping torrents and per torrent settings.
+
+==== Misc ====
+	* Implement #478 display UI options in usage help
+	* Fix #547 add description to name field per HIG entry 2.1.1.1
+	* Fix #531 set default log level to ERROR and add 2 command-line options, "-L, --loglevel" and "-q, --quiet".

DEPENDS

@@ -0,0 +1,32 @@
+=== Core ===
+ * python >= 2.5
+ * twisted >= 8.1
+ * twisted-web >= 8.1
+ * pyopenssl
+ * simplejson (if python < 2.6)
+ * setuptools
+ * gettext
+ * intltool
+ * pyxdg
+ * chardet
+ * geoip-database (optional)
+ * setproctitle (optional)
+ * pillow (optional)
+
+ * libtorrent (rasterbar) >= 0.14
+
+ * If building libtorrent:
+   * boost >= 1.34.1
+   * openssl
+   * zlib
+
+=== Gtk ===
+ * pygtk >= 2.12
+ * librsvg
+ * xdg-utils
+ * python-notify (optional)
+ * pygame (optional)
+ * python-appindicator (optional)
+
+=== Web ===
+ * mako

LICENSE

@@ -0,0 +1,634 @@
+Deluge is licensed under the GNU General Public License version 3 with the
+addition of the following special exception:
+
+In addition, as a special exception, the copyright holders give
+permission to link the code of portions of this program with the OpenSSL
+library.
+You must obey the GNU General Public License in all respects for all of
+the code used other than OpenSSL. If you modify file(s) with this
+exception, you may extend this exception to your version of the file(s),
+but you are not obligated to do so. If you do not wish to do so, delete
+this exception statement from your version. If you delete this exception
+statement from all source files in the program, then also delete it here.
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS

MANIFEST.in

@@ -0,0 +1,12 @@
+recursive-include docs/man *
+recursive-include deluge *
+recursive-include win32 *
+
+recursive-exclude deluge *.egg-link
+exclude deluge/ui/web/gen_gettext.py
+exclude deluge/ui/web/css/*-debug.css
+exclude deluge/ui/web/js/build.sh
+exclude deluge/ui/web/js/Deluge*.js
+exclude deluge/ui/web/js/*-debug.js
+prune deluge/ui/web/docs
+prune deluge/scripts

README

@@ -0,0 +1,57 @@
+==========================
+ Deluge BitTorrent Client
+==========================
+
+Homepage: http://deluge-torrent.org
+
+Authors:
+    Andrew Resch
+    Damien Churchill
+
+For contributors and past developers see: 
+    AUTHORS
+
+==========================
+Installation Instructions:
+==========================
+
+For detailed instructions see: http://dev.deluge-torrent.org/wiki/Installing/Source
+
+Ensure build dependencies are installed, see DEPENDS for a full listing.
+
+Build and install by running:
+
+    $ python setup.py build
+    $ sudo python setup.py install
+
+==========================
+Contact/Support:
+==========================
+
+   Forum: http://forum.deluge-torrent.org
+   IRC Channel: #deluge on irc.freenode.net
+
+==========================
+FAQ
+==========================
+
+For the full FAQ see: http://dev.deluge-torrent.org/wiki/Faq
+
+How to start the various user-interfaces
+
+    Gtk:
+        deluge or deluge-gtk
+    Console:
+        deluge-console
+    Web:
+        deluge-web
+        Go to http://localhost:8112/ default-password = "deluge"
+    
+How do I start the daemon?
+
+    deluged
+
+I can't connect to the daemon from another machine
+
+    See: http://dev.deluge-torrent.org/wiki/UserGuide/ThinClient
+

TODO

@@ -1,23 +0,0 @@
-For 0.6 release:
-* Translations
-* Add progress bars for downloading and importing lists instead of hanging (blocklist)
-
-After 0.6 release:
-* Address issue where torrents will redownload if the storage is moved outside
-    of deluge.
-* Implement add by hash
-* Figure out easy way for user-made plugins to add i18n support.
-* Restart daemon function
-* Docstrings!
-* Add wizard
-* Advanced (pieces) progress bar
-* Add method for plugins to add labels
-* Add context menus for labels.. ie. setting options for all torrents in label
-* Implement caching in core
-* Use the batch torrent status info as a cache for other torrent status requests
-* Add number of torrents to labels
-* Proxy stuff
-* Webseed
-* Enable/disable webui from within gtkui
-* Notifications
-* create a clamav plugin to scan files

check_glade.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Fixes glade files which may have set gtk stock labels set to translatable
+for x in `find . -name '*.glade' |grep -v '.git\|build'` ; do \
+    for y in gtk-add gtk-apply gtk-bold gtk-cancel gtk-cdrom gtk-clear \
+        gtk-close gtk-color-picker gtk-connect gtk-convert gtk-copy gtk-cut \
+        gtk-delete gtk-dialog-error gtk-dialog-info gtk-dialog-question \
+        gtk-dialog-warning gtk-dnd gtk-dnd-multiple gtk-edit gtk-execute gtk-find \
+        gtk-find-and-replace gtk-floppy gtk-goto-bottom gtk-goto-first \
+        gtk-goto-last gtk-goto-top gtk-go-back gtk-go-down gtk-go-forward \
+        gtk-go-up gtk-help gtk-home gtk-index gtk-italic gtk-jump-to \
+        gtk-justify-center gtk-justify-fill gtk-justify-left gtk-missing-image \
+        gtk-new gtk-no gtk-ok gtk-open gtk-paste gtk-preferences gtk-print \
+        gtk-print-preview gtk-properties gtk-quit gtk-redo gtk-refresh \
+        gtk-remove gtk-revert-to-saved gtk-save gtk-save-as gtk-select-color \
+        gtk-select-font gtk-sort-descending gtk-spell-check gtk-stop \
+        gtk-strikethrough gtk-undelete gtk-underline gtk-undo gtk-yes \
+        gtk-zoom-100 gtk-zoom-fit gtk-zoom-in gtk-zoom-out; do \
+            sed -i "s/<property\ name\=\"label\"\ translatable\=\"yes\">$y<\/property>/<property\ name\=\"label\"\ translatable\=\"no\">$y<\/property>/g" $x; \
+        done;\
+    done

create_potfiles_in.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+import os
+import re
+import sys
+# Paths to exclude
+EXCLUSIONS = [
+    "deluge/scripts",
+    "deluge/i18n",
+]
+
+POTFILE_IN = "deluge/i18n/POTFILES.in"
+
+pattern = "deluge\/plugins\/.*\/build"
+compiled = re.compile(pattern)
+
+sys.stdout.write("Creating " + POTFILE_IN + " ... ")
+sys.stdout.flush()
+to_translate = []
+for (dirpath, dirnames, filenames) in os.walk("deluge"):
+    for filename in filenames:
+        if os.path.splitext(filename)[1] in (".py", ".glade", ".in") \
+                                            and dirpath not in EXCLUSIONS \
+                                            and not compiled.match(dirpath):
+            to_translate.append(os.path.join(dirpath, filename))
+
+f = open(POTFILE_IN, "wb")
+for line in to_translate:
+    f.write(line + "\n")
+
+f.close()
+
+print "Done"

debian/changelog

@@ -1,5 +0,0 @@
-deluge-torrent (0.9.02-1) unstable; urgency=low
-
-  * RC2 release
-
- -- Andrew Resch (andar) <andrewresch@gmail.com>  Tue, 17 Jul 2008 16:31:14 -0800

debian/changelog.debian-lenny

@@ -1,5 +0,0 @@
-deluge-torrent (0.6.0-svn3235-1) lenny; urgency=low
-
-  * Daily Build
-
- -- Andrew Resch (andar) <andrewresch@gmail.com>  Tue, 17 Jun 2008 16:31:14 -0800

debian/changelog.debian-sid

@@ -1,5 +0,0 @@
-deluge-torrent (0.6.0-svn3235-1) unstable; urgency=low
-
-  * Daily Build
-
- -- Andrew Resch (andar) <andrewresch@gmail.com>  Tue, 17 Jun 2008 16:31:14 -0800

debian/changelog.ubuntu-gutsy

@@ -1,5 +0,0 @@
-deluge-torrent (0.6.0-svn3235-1) gutsy; urgency=low
-
-  * Daily Build
-
- -- Andrew Resch (andar) <andrewresch@gmail.com>  Tue, 17 Jun 2008 16:31:14 -0800

debian/changelog.ubuntu-hardy

@@ -1,5 +0,0 @@
-deluge-torrent (0.6.0-svn3235-1) hardy; urgency=low
-
-  * Daily Build
-
- -- Andrew Resch (andar) <andrewresch@gmail.com>  Tue, 17 Jun 2008 16:31:14 -0800

debian/compat

@@ -1 +0,0 @@
-5

debian/control

@@ -1,21 +0,0 @@
-Source: deluge-torrent
-Section: net
-Priority: optional
-Maintainer: Andrew Resch (andar) <andrewresch@gmail.com>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-all, python-support (>= 0.5.3), libboost-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-python-dev (>= 1.34.1), libboost-iostreams-dev (>= 1.34.1), zlib1g-dev, libssl-dev, dpatch, python-setuptools
-Standards-Version: 3.7.2
-
-Package: deluge-torrent
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-gtk2, python-glade2, python-xdg, python-notify, notification-daemon, python-dbus, librsvg2-common, python-pyopenssl, python-setuptools
-Conflicts: deluge-torrent-common
-Replaces: deluge-torrent-common
-Description: A Bittorrent client written in Python/PyGTK
- Deluge is a Bittorrent client, created using Python and GTK+.
- .
- Deluge is intended to bring a native, full-featured client to Linux GTK
- desktop environments such as Gnome and XFCE.
- .
- It uses Rasterbar's version of libtorrent.
- .
-  Homepage: http://www.deluge-torrent.org/

debian/control.debian-lenny

@@ -1,19 +0,0 @@
-Source: deluge-torrent
-Section: net
-Priority: optional
-Maintainer: Andrew Resch (andar) <andrewresch@gmail.com>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-all, python-support (>= 0.5.3), libboost-dev (>= 1.33.1), libboost-thread-dev (>= 1.33.1), libboost-date-time-dev (>= 1.33.1), libboost-filesystem-dev (>= 1.33.1), libboost-serialization-dev (>= 1.33.1), libboost-program-options-dev (>= 1.33.1), libboost-regex-dev (>= 1.33.1), libboost-python-dev (>= 1.33.1), zlib1g-dev, libssl-dev, dpatch, python-setuptools
-Standards-Version: 3.7.2
-
-Package: deluge-torrent
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-gtk2, python-glade2, python-xdg, python-notify, notification-daemon, python-dbus, librsvg2-common, python-pyopenssl, python-setuptools
-Description: A Bittorrent client written in Python/PyGTK
- Deluge is a Bittorrent client, created using Python and GTK+.
- .
- Deluge is intended to bring a native, full-featured client to Linux GTK
- desktop environments such as Gnome and XFCE.
- .
- It uses Rasterbar's version of libtorrent.
- .
-  Homepage: http://www.deluge-torrent.org/

debian/control.debian-sid

@@ -1,19 +0,0 @@
-Source: deluge-torrent
-Section: net
-Priority: optional
-Maintainer: Andrew Resch (andar) <andrewresch@gmail.com>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-all, python-support (>= 0.5.3), libboost-dev (>= 1.33.1), libboost-thread-dev (>= 1.33.1), libboost-date-time-dev (>= 1.33.1), libboost-filesystem-dev (>= 1.33.1), libboost-serialization-dev (>= 1.33.1), libboost-program-options-dev (>= 1.33.1), libboost-regex-dev (>= 1.33.1), libboost-python-dev (>= 1.33.1), zlib1g-dev, libssl-dev, dpatch, python-setuptools
-Standards-Version: 3.7.2
-
-Package: deluge-torrent
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-gtk2, python-glade2, python-xdg, python-notify, notification-daemon, python-dbus, librsvg2-common, python-pyopenssl, python-setuptools
-Description: A Bittorrent client written in Python/PyGTK
- Deluge is a Bittorrent client, created using Python and GTK+.
- .
- Deluge is intended to bring a native, full-featured client to Linux GTK
- desktop environments such as Gnome and XFCE.
- .
- It uses Rasterbar's version of libtorrent.
- .
-  Homepage: http://www.deluge-torrent.org/

debian/control.ubuntu-gutsy

@@ -1,19 +0,0 @@
-Source: deluge-torrent
-Section: universe/net
-Priority: optional
-Maintainer: Andrew Resch (andar) <andrewresch@gmail.com>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-all, python-support (>= 0.5.3), libboost-dev (>= 1.33.1), libboost-thread-dev (>= 1.33.1), libboost-date-time-dev (>= 1.33.1), libboost-filesystem-dev (>= 1.33.1), libboost-serialization-dev (>= 1.33.1), libboost-program-options-dev (>= 1.33.1), libboost-regex-dev (>= 1.33.1), libboost-python-dev (>= 1.33.1), zlib1g-dev, libssl-dev, dpatch, python-setuptools
-Standards-Version: 3.7.2
-
-Package: deluge-torrent
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-gtk2, python-glade2, python-xdg, python-notify, notification-daemon, python-dbus, librsvg2-common, python-pyopenssl, python-setuptools
-Description: A Bittorrent client written in Python/PyGTK
- Deluge is a Bittorrent client, created using Python and GTK+.
- .
- Deluge is intended to bring a native, full-featured client to Linux GTK
- desktop environments such as Gnome and XFCE.
- .
- It uses Rasterbar's version of libtorrent.
- .
-  Homepage: http://www.deluge-torrent.org/

debian/control.ubuntu-hardy

@@ -1,19 +0,0 @@
-Source: deluge-torrent
-Section: universe/net
-Priority: optional
-Maintainer: Andrew Resch (andar) <andrewresch@gmail.com>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-all, python-support (>= 0.5.3), libboost-dev (>= 1.33.1), libboost-thread-dev (>= 1.33.1), libboost-date-time-dev (>= 1.33.1), libboost-filesystem-dev (>= 1.33.1), libboost-serialization-dev (>= 1.33.1), libboost-program-options-dev (>= 1.33.1), libboost-regex-dev (>= 1.33.1), libboost-python-dev (>= 1.33.1), zlib1g-dev, libssl-dev, dpatch, python-setuptools
-Standards-Version: 3.7.2
-
-Package: deluge-torrent
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-gtk2, python-glade2, python-xdg, python-notify, notification-daemon, python-dbus, librsvg2-common, python-pyopenssl, python-setuptools
-Description: A Bittorrent client written in Python/PyGTK
- Deluge is a Bittorrent client, created using Python and GTK+.
- .
- Deluge is intended to bring a native, full-featured client to Linux GTK
- desktop environments such as Gnome and XFCE.
- .
- It uses Rasterbar's version of libtorrent.
- .
-  Homepage: http://www.deluge-torrent.org/

debian/copyright

@@ -1,103 +0,0 @@
-This package was debianized by Adam Cécile (Le_Vert) <gandalf@le-vert.net> on
-Wed, 15 Nov 2006 22:03:13 +0100.
-
-It was downloaded from http://www.deluge-torrent.org/
-
-Upstream Author: Zach Tibbitts <zach@collegegeek.org>
-                 Alon Zakai <kripkensteiner@gmail.com>
-		 Marcos Pinto
-
-Copyright: (C) 2006, Zach Tibbitts <zach@collegegeek.org>
-	   (C) 2006, Alon Zakai <kripkensteiner@gmail.com>
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-   In addition, as a special exception, the copyright holders give
-   permission to link the code of portions of this program with the OpenSSL
-   library.
-   You must obey the GNU General Public License in all respects for all of
-   the code used other than OpenSSL. If you modify file(s) with this
-   exception, you may extend this exception to your version of the file(s),
-   but you are not obligated to do so. If you do not wish to do so, delete
-   this exception statement from your version. If you delete this exception
-   statement from all source files in the program, then also delete it here.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-libtorrent/* are (C) 2006, A. Zakai ('Kripken') <kripkensteiner@gmail.com>
-and distributed unders term of GNU General Public License.
-
-  This code is baded on libtorrent which is (C) 2003 Arvid Norberg and
-  distributed under terms of the license below :
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the distribution.
-    * Neither the name of the author nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-
-    "libtorrent/include/libtorrent/asio*" are (C) 2003-2006 Christopher
-    M. Kohlhoff <chris@kohlhoff.com> and distributed under terms of the Boost
-    Software License, Version 1.0 :
-
-      Permission is hereby granted, free of charge, to any person or organization
-      obtaining a copy of the software and accompanying documentation covered by
-      this license (the "Software") to use, reproduce, display, distribute,
-      execute, and transmit the Software, and to prepare derivative works of the
-      Software, and to permit third-parties to whom the Software is furnished to
-      do so, all subject to the following:
-
-      The copyright notices in the Software and this entire statement, including
-      the above license grant, this restriction and the following disclaimer,
-      must be included in all copies of the Software, in whole or in part, and
-      all derivative works of the Software, unless such copies or derivative
-      works are solely in the form of machine-executable object code generated by
-      a source language processor.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-      SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-      FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-      ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-      DEALINGS IN THE SOFTWARE.
-
-"po/*" are (C) 2006 Rosetta Contributors and Canonical Ltd 2006 and distributed
-under the same license as the deluge software.
-
-The Debian packaging is (C) 2006-2007, Adam Cécile (Le_Vert)
-<gandalf@le-vert.net> and  is licensed under the GPL, see above.

debian/manpages

@@ -1 +0,0 @@
-debian/deluge.1

debian/menu

@@ -1,3 +0,0 @@
-?package(deluge-torrent): needs="X11" section="Applications/Network/File Transfer" \
-  title="Deluge BitTorrent Client" longtitle="Bittorrent client written in Python/PyGTK" \
-  command="/usr/bin/deluge" icon="/usr/share/pixmaps/deluge.png"

debian/pyversions

@@ -1 +0,0 @@
-2.5

debian/pyversions.debian-lenny

@@ -1 +0,0 @@
-2.5

debian/pyversions.debian-sid

@@ -1 +0,0 @@
-2.5

debian/pyversions.ubuntu-gutsy

@@ -1 +0,0 @@
-2.5

debian/pyversions.ubuntu-hardy

@@ -1 +0,0 @@
-2.5

debian/rules

@@ -1,75 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Dpatch targets
-include /usr/share/dpatch/dpatch.make
-
-# Available python (using debian/pyversions) and destdir
-PYVERS      = 2.5
-DESTDIR     = $(CURDIR)/debian/deluge-torrent
-
-# We need to known the target arch to enable/disable amd64 hack
-ARCH	    = $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-ARCH64	    = ia64 amd64 alpha kfreebsd-amd64 ppc64
-
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-# python-libtorrent need to define AMD64 to work fine on a 64 bits system
-ifneq (,$(findstring $(ARCH),$(ARCH64)))
-	CFLAGS += -DAMD64
-endif
-
-build: patch-stamp $(PYVERS:%=build-stamp%)
-build-stamp%: patch-stamp
-	dh_testdir
-	CFLAGS="$(CFLAGS)" python$* setup.py build
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -rf build/
-	find . -name \*.pyc | xargs rm -f
-	rm -rf build-stamp*
-	dh_clean
-
-install: build install-prereq $(PYVERS:%=install-%) install-finish
-install-prereq:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-install-%:
-	python$* setup.py install --root=$(DESTDIR) --prefix=/usr --no-compile
-install-finish:
-	# Desktop menu
-	rm -rf $(DESTDIR)/usr/share/applications
-	install -D -m644 $(CURDIR)/deluge/data/share/applications/deluge.desktop $(DESTDIR)/usr/share/applications/deluge.desktop
-
-
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installmenu
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_pysupport
-	dh_desktop
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

debian/rules.debian-lenny

@@ -1,75 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Dpatch targets
-include /usr/share/dpatch/dpatch.make
-
-# Available python (using debian/pyversions) and destdir
-PYVERS      = 2.4
-DESTDIR     = $(CURDIR)/debian/deluge-torrent
-
-# We need to known the target arch to enable/disable amd64 hack
-ARCH	    = $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-ARCH64	    = ia64 amd64 alpha kfreebsd-amd64 ppc64
-
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-# python-libtorrent need to define AMD64 to work fine on a 64 bits system
-ifneq (,$(findstring $(ARCH),$(ARCH64)))
-	CFLAGS += -DAMD64
-endif
-
-build: patch-stamp $(PYVERS:%=build-stamp%)
-build-stamp%: patch-stamp
-	dh_testdir
-	CFLAGS="$(CFLAGS)" python$* setup.py build
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -rf build/
-	find . -name \*.pyc | xargs rm -f
-	rm -rf build-stamp*
-	dh_clean
-
-install: build install-prereq $(PYVERS:%=install-%) install-finish
-install-prereq:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-install-%:
-	python$* setup.py install --root=$(DESTDIR) --prefix=/usr --no-compile
-install-finish:
-	# Desktop menu
-	rm -rf $(DESTDIR)/usr/share/applications
-	install -D -m644 $(CURDIR)/deluge/data/share/applications/deluge.desktop $(DESTDIR)/usr/share/applications/deluge.desktop
-
-
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installmenu
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_pysupport
-	dh_desktop
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

debian/rules.debian-sid

@@ -1,75 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Dpatch targets
-include /usr/share/dpatch/dpatch.make
-
-# Available python (using debian/pyversions) and destdir
-PYVERS      = 2.4
-DESTDIR     = $(CURDIR)/debian/deluge-torrent
-
-# We need to known the target arch to enable/disable amd64 hack
-ARCH	    = $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-ARCH64	    = ia64 amd64 alpha kfreebsd-amd64 ppc64
-
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-# python-libtorrent need to define AMD64 to work fine on a 64 bits system
-ifneq (,$(findstring $(ARCH),$(ARCH64)))
-	CFLAGS += -DAMD64
-endif
-
-build: patch-stamp $(PYVERS:%=build-stamp%)
-build-stamp%: patch-stamp
-	dh_testdir
-	CFLAGS="$(CFLAGS)" python$* setup.py build
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -rf build/
-	find . -name \*.pyc | xargs rm -f
-	rm -rf build-stamp*
-	dh_clean
-
-install: build install-prereq $(PYVERS:%=install-%) install-finish
-install-prereq:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-install-%:
-	python$* setup.py install --root=$(DESTDIR) --prefix=/usr --no-compile
-install-finish:
-	# Desktop menu
-	rm -rf $(DESTDIR)/usr/share/applications
-	install -D -m644 $(CURDIR)/deluge/data/share/applications/deluge.desktop $(DESTDIR)/usr/share/applications/deluge.desktop
-
-
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installmenu
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_pysupport
-	dh_desktop
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

debian/rules.ubuntu-gutsy

@@ -1,75 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Dpatch targets
-include /usr/share/dpatch/dpatch.make
-
-# Available python (using debian/pyversions) and destdir
-PYVERS      = 2.5
-DESTDIR     = $(CURDIR)/debian/deluge-torrent
-
-# We need to known the target arch to enable/disable amd64 hack
-ARCH	    = $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-ARCH64	    = ia64 amd64 alpha kfreebsd-amd64 ppc64
-
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-# python-libtorrent need to define AMD64 to work fine on a 64 bits system
-ifneq (,$(findstring $(ARCH),$(ARCH64)))
-	CFLAGS += -DAMD64
-endif
-
-build: patch-stamp $(PYVERS:%=build-stamp%)
-build-stamp%: patch-stamp
-	dh_testdir
-	CFLAGS="$(CFLAGS)" python$* setup.py build
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -rf build/
-	find . -name \*.pyc | xargs rm -f
-	rm -rf build-stamp*
-	dh_clean
-
-install: build install-prereq $(PYVERS:%=install-%) install-finish
-install-prereq:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-install-%:
-	python$* setup.py install --root=$(DESTDIR) --prefix=/usr --no-compile
-install-finish:
-	# Desktop menu
-	rm -rf $(DESTDIR)/usr/share/applications
-	install -D -m644 $(CURDIR)/deluge/data/share/applications/deluge.desktop $(DESTDIR)/usr/share/applications/deluge.desktop
-
-
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installmenu
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_pysupport
-	dh_desktop
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

debian/rules.ubuntu-hardy

@@ -1,75 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Dpatch targets
-include /usr/share/dpatch/dpatch.make
-
-# Available python (using debian/pyversions) and destdir
-PYVERS      = 2.5
-DESTDIR     = $(CURDIR)/debian/deluge-torrent
-
-# We need to known the target arch to enable/disable amd64 hack
-ARCH	    = $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-ARCH64	    = ia64 amd64 alpha kfreebsd-amd64 ppc64
-
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-# python-libtorrent need to define AMD64 to work fine on a 64 bits system
-ifneq (,$(findstring $(ARCH),$(ARCH64)))
-	CFLAGS += -DAMD64
-endif
-
-build: patch-stamp $(PYVERS:%=build-stamp%)
-build-stamp%: patch-stamp
-	dh_testdir
-	CFLAGS="$(CFLAGS)" python$* setup.py build
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -rf build/
-	find . -name \*.pyc | xargs rm -f
-	rm -rf build-stamp*
-	dh_clean
-
-install: build install-prereq $(PYVERS:%=install-%) install-finish
-install-prereq:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-install-%:
-	python$* setup.py install --root=$(DESTDIR) --prefix=/usr --no-compile
-install-finish:
-	# Desktop menu
-	rm -rf $(DESTDIR)/usr/share/applications
-	install -D -m644 $(CURDIR)/deluge/data/share/applications/deluge.desktop $(DESTDIR)/usr/share/applications/deluge.desktop
-
-
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installmenu
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_pysupport
-	dh_desktop
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

deluge/SimpleXMLRPCServer.py

@@ -1,595 +0,0 @@
-"""Simple XML-RPC Server.
-
-This module can be used to create simple XML-RPC servers
-by creating a server and either installing functions, a
-class instance, or by extending the SimpleXMLRPCServer
-class.
-
-It can also be used to handle XML-RPC requests in a CGI
-environment using CGIXMLRPCRequestHandler.
-
-A list of possible usage patterns follows:
-
-1. Install functions:
-
-server = SimpleXMLRPCServer(("localhost", 8000))
-server.register_function(pow)
-server.register_function(lambda x,y: x+y, 'add')
-server.serve_forever()
-
-2. Install an instance:
-
-class MyFuncs:
-    def __init__(self):
-        # make all of the string functions available through
-        # string.func_name
-        import string
-        self.string = string
-    def _listMethods(self):
-        # implement this method so that system.listMethods
-        # knows to advertise the strings methods
-        return list_public_methods(self) + \
-                ['string.' + method for method in list_public_methods(self.string)]
-    def pow(self, x, y): return pow(x, y)
-    def add(self, x, y) : return x + y
-
-server = SimpleXMLRPCServer(("localhost", 8000))
-server.register_introspection_functions()
-server.register_instance(MyFuncs())
-server.serve_forever()
-
-3. Install an instance with custom dispatch method:
-
-class Math:
-    def _listMethods(self):
-        # this method must be present for system.listMethods
-        # to work
-        return ['add', 'pow']
-    def _methodHelp(self, method):
-        # this method must be present for system.methodHelp
-        # to work
-        if method == 'add':
-            return "add(2,3) => 5"
-        elif method == 'pow':
-            return "pow(x, y[, z]) => number"
-        else:
-            # By convention, return empty
-            # string if no help is available
-            return ""
-    def _dispatch(self, method, params):
-        if method == 'pow':
-            return pow(*params)
-        elif method == 'add':
-            return params[0] + params[1]
-        else:
-            raise 'bad method'
-
-server = SimpleXMLRPCServer(("localhost", 8000))
-server.register_introspection_functions()
-server.register_instance(Math())
-server.serve_forever()
-
-4. Subclass SimpleXMLRPCServer:
-
-class MathServer(SimpleXMLRPCServer):
-    def _dispatch(self, method, params):
-        try:
-            # We are forcing the 'export_' prefix on methods that are
-            # callable through XML-RPC to prevent potential security
-            # problems
-            func = getattr(self, 'export_' + method)
-        except AttributeError:
-            raise Exception('method "%s" is not supported' % method)
-        else:
-            return func(*params)
-
-    def export_add(self, x, y):
-        return x + y
-
-server = MathServer(("localhost", 8000))
-server.serve_forever()
-
-5. CGI script:
-
-server = CGIXMLRPCRequestHandler()
-server.register_function(pow)
-server.handle_request()
-"""
-
-# Written by Brian Quinlan (brian@sweetapp.com).
-# Based on code written by Fredrik Lundh.
-
-import xmlrpclib
-from xmlrpclib import Fault
-import SocketServer
-import BaseHTTPServer
-import sys
-import os
-try:
-    import fcntl
-except ImportError:
-    fcntl = None
-
-def resolve_dotted_attribute(obj, attr, allow_dotted_names=True):
-    """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
-
-    Resolves a dotted attribute name to an object.  Raises
-    an AttributeError if any attribute in the chain starts with a '_'.
-
-    If the optional allow_dotted_names argument is false, dots are not
-    supported and this function operates similar to getattr(obj, attr).
-    """
-
-    if allow_dotted_names:
-        attrs = attr.split('.')
-    else:
-        attrs = [attr]
-
-    for i in attrs:
-        if i.startswith('_'):
-            raise AttributeError(
-                'attempt to access private attribute "%s"' % i
-                )
-        else:
-            obj = getattr(obj,i)
-    return obj
-
-def list_public_methods(obj):
-    """Returns a list of attribute strings, found in the specified
-    object, which represent callable attributes"""
-
-    return [member for member in dir(obj)
-                if not member.startswith('_') and
-                    callable(getattr(obj, member))]
-
-def remove_duplicates(lst):
-    """remove_duplicates([2,2,2,1,3,3]) => [3,1,2]
-
-    Returns a copy of a list without duplicates. Every list
-    item must be hashable and the order of the items in the
-    resulting list is not defined.
-    """
-    u = {}
-    for x in lst:
-        u[x] = 1
-
-    return u.keys()
-
-class SimpleXMLRPCDispatcher:
-    """Mix-in class that dispatches XML-RPC requests.
-
-    This class is used to register XML-RPC method handlers
-    and then to dispatch them. There should never be any
-    reason to instantiate this class directly.
-    """
-
-    def __init__(self, allow_none, encoding):
-        self.funcs = {}
-        self.instance = None
-        self.allow_none = allow_none
-        self.encoding = encoding
-
-    def register_instance(self, instance, allow_dotted_names=False):
-        """Registers an instance to respond to XML-RPC requests.
-
-        Only one instance can be installed at a time.
-
-        If the registered instance has a _dispatch method then that
-        method will be called with the name of the XML-RPC method and
-        its parameters as a tuple
-        e.g. instance._dispatch('add',(2,3))
-
-        If the registered instance does not have a _dispatch method
-        then the instance will be searched to find a matching method
-        and, if found, will be called. Methods beginning with an '_'
-        are considered private and will not be called by
-        SimpleXMLRPCServer.
-
-        If a registered function matches a XML-RPC request, then it
-        will be called instead of the registered instance.
-
-        If the optional allow_dotted_names argument is true and the
-        instance does not have a _dispatch method, method names
-        containing dots are supported and resolved, as long as none of
-        the name segments start with an '_'.
-
-            *** SECURITY WARNING: ***
-
-            Enabling the allow_dotted_names options allows intruders
-            to access your module's global variables and may allow
-            intruders to execute arbitrary code on your machine.  Only
-            use this option on a secure, closed network.
-
-        """
-
-        self.instance = instance
-        self.allow_dotted_names = allow_dotted_names
-
-    def register_function(self, function, name = None):
-        """Registers a function to respond to XML-RPC requests.
-
-        The optional name argument can be used to set a Unicode name
-        for the function.
-        """
-
-        if name is None:
-            name = function.__name__
-        self.funcs[name] = function
-
-    def register_introspection_functions(self):
-        """Registers the XML-RPC introspection methods in the system
-        namespace.
-
-        see http://xmlrpc.usefulinc.com/doc/reserved.html
-        """
-
-        self.funcs.update({'system.listMethods' : self.system_listMethods,
-                      'system.methodSignature' : self.system_methodSignature,
-                      'system.methodHelp' : self.system_methodHelp})
-
-    def register_multicall_functions(self):
-        """Registers the XML-RPC multicall method in the system
-        namespace.
-
-        see http://www.xmlrpc.com/discuss/msgReader$1208"""
-
-        self.funcs.update({'system.multicall' : self.system_multicall})
-
-    def _marshaled_dispatch(self, data, dispatch_method = None):
-        """Dispatches an XML-RPC method from marshalled (XML) data.
-
-        XML-RPC methods are dispatched from the marshalled (XML) data
-        using the _dispatch method and the result is returned as
-        marshalled data. For backwards compatibility, a dispatch
-        function can be provided as an argument (see comment in
-        SimpleXMLRPCRequestHandler.do_POST) but overriding the
-        existing method through subclassing is the prefered means
-        of changing method dispatch behavior.
-        """
-
-        try:
-            params, method = xmlrpclib.loads(data)
-
-            # generate response
-            if dispatch_method is not None:
-                response = dispatch_method(method, params)
-            else:
-                response = self._dispatch(method, params)
-            # wrap response in a singleton tuple
-            response = (response,)
-            response = xmlrpclib.dumps(response, methodresponse=1,
-                                       allow_none=self.allow_none, encoding=self.encoding)
-        except Fault, fault:
-            response = xmlrpclib.dumps(fault, allow_none=self.allow_none,
-                                       encoding=self.encoding)
-        except:
-            # report exception back to server
-            response = xmlrpclib.dumps(
-                xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value)),
-                encoding=self.encoding, allow_none=self.allow_none,
-                )
-
-        return response
-
-    def system_listMethods(self):
-        """system.listMethods() => ['add', 'subtract', 'multiple']
-
-        Returns a list of the methods supported by the server."""
-
-        methods = self.funcs.keys()
-        if self.instance is not None:
-            # Instance can implement _listMethod to return a list of
-            # methods
-            if hasattr(self.instance, '_listMethods'):
-                methods = remove_duplicates(
-                        methods + self.instance._listMethods()
-                    )
-            # if the instance has a _dispatch method then we
-            # don't have enough information to provide a list
-            # of methods
-            elif not hasattr(self.instance, '_dispatch'):
-                methods = remove_duplicates(
-                        methods + list_public_methods(self.instance)
-                    )
-        methods.sort()
-        return methods
-
-    def system_methodSignature(self, method_name):
-        """system.methodSignature('add') => [double, int, int]
-
-        Returns a list describing the signature of the method. In the
-        above example, the add method takes two integers as arguments
-        and returns a double result.
-
-        This server does NOT support system.methodSignature."""
-
-        # See http://xmlrpc.usefulinc.com/doc/sysmethodsig.html
-
-        return 'signatures not supported'
-
-    def system_methodHelp(self, method_name):
-        """system.methodHelp('add') => "Adds two integers together"
-
-        Returns a string containing documentation for the specified method."""
-
-        method = None
-        if self.funcs.has_key(method_name):
-            method = self.funcs[method_name]
-        elif self.instance is not None:
-            # Instance can implement _methodHelp to return help for a method
-            if hasattr(self.instance, '_methodHelp'):
-                return self.instance._methodHelp(method_name)
-            # if the instance has a _dispatch method then we
-            # don't have enough information to provide help
-            elif not hasattr(self.instance, '_dispatch'):
-                try:
-                    method = resolve_dotted_attribute(
-                                self.instance,
-                                method_name,
-                                self.allow_dotted_names
-                                )
-                except AttributeError:
-                    pass
-
-        # Note that we aren't checking that the method actually
-        # be a callable object of some kind
-        if method is None:
-            return ""
-        else:
-            import pydoc
-            return pydoc.getdoc(method)
-
-    def system_multicall(self, call_list):
-        """system.multicall([{'methodName': 'add', 'params': [2, 2]}, ...]) => \
-[[4], ...]
-
-        Allows the caller to package multiple XML-RPC calls into a single
-        request.
-
-        See http://www.xmlrpc.com/discuss/msgReader$1208
-        """
-
-        results = []
-        for call in call_list:
-            method_name = call['methodName']
-            params = call['params']
-
-            try:
-                # XXX A marshalling error in any response will fail the entire
-                # multicall. If someone cares they should fix this.
-                results.append([self._dispatch(method_name, params)])
-            except Fault, fault:
-                results.append(
-                    {'faultCode' : fault.faultCode,
-                     'faultString' : fault.faultString}
-                    )
-            except:
-                results.append(
-                    {'faultCode' : 1,
-                     'faultString' : "%s:%s" % (sys.exc_type, sys.exc_value)}
-                    )
-        return results
-
-    def _dispatch(self, method, params):
-        """Dispatches the XML-RPC method.
-
-        XML-RPC calls are forwarded to a registered function that
-        matches the called XML-RPC method name. If no such function
-        exists then the call is forwarded to the registered instance,
-        if available.
-
-        If the registered instance has a _dispatch method then that
-        method will be called with the name of the XML-RPC method and
-        its parameters as a tuple
-        e.g. instance._dispatch('add',(2,3))
-
-        If the registered instance does not have a _dispatch method
-        then the instance will be searched to find a matching method
-        and, if found, will be called.
-
-        Methods beginning with an '_' are considered private and will
-        not be called.
-        """
-
-        func = None
-        try:
-            # check to see if a matching function has been registered
-            func = self.funcs[method]
-        except KeyError:
-            if self.instance is not None:
-                # check for a _dispatch method
-                if hasattr(self.instance, '_dispatch'):
-                    return self.instance._dispatch(method, params)
-                else:
-                    # call instance method directly
-                    try:
-                        func = resolve_dotted_attribute(
-                            self.instance,
-                            method,
-                            self.allow_dotted_names
-                            )
-                    except AttributeError:
-                        pass
-
-        if func is not None:
-            return func(*params)
-        else:
-            raise Exception('method "%s" is not supported' % method)
-
-class SimpleXMLRPCRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
-    """Simple XML-RPC request handler class.
-
-    Handles all HTTP POST requests and attempts to decode them as
-    XML-RPC requests.
-    """
-
-    # Class attribute listing the accessible path components;
-    # paths not on this list will result in a 404 error.
-    rpc_paths = ('/', '/RPC2')
-
-    def is_rpc_path_valid(self):
-        if self.rpc_paths:
-            return self.path in self.rpc_paths
-        else:
-            # If .rpc_paths is empty, just assume all paths are legal
-            return True
-
-    def do_POST(self):
-        """Handles the HTTP POST request.
-
-        Attempts to interpret all HTTP POST requests as XML-RPC calls,
-        which are forwarded to the server's _dispatch method for handling.
-        """
-
-        # Check that the path is legal
-        if not self.is_rpc_path_valid():
-            self.report_404()
-            return
-
-        try:
-            # Get arguments by reading body of request.
-            # We read this in chunks to avoid straining
-            # socket.read(); around the 10 or 15Mb mark, some platforms
-            # begin to have problems (bug #792570).
-            max_chunk_size = 10*1024*1024
-            size_remaining = int(self.headers["content-length"])
-            L = []
-            while size_remaining:
-                chunk_size = min(size_remaining, max_chunk_size)
-                L.append(self.rfile.read(chunk_size))
-                size_remaining -= len(L[-1])
-            data = ''.join(L)
-
-            # In previous versions of SimpleXMLRPCServer, _dispatch
-            # could be overridden in this class, instead of in
-            # SimpleXMLRPCDispatcher. To maintain backwards compatibility,
-            # check to see if a subclass implements _dispatch and dispatch
-            # using that method if present.
-            response = self.server._marshaled_dispatch(
-                    data, getattr(self, '_dispatch', None)
-                )
-        except: # This should only happen if the module is buggy
-            # internal error, report as HTTP server error
-            self.send_response(500)
-            self.end_headers()
-        else:
-            # got a valid XML RPC response
-            self.send_response(200)
-            self.send_header("Content-type", "text/xml")
-            self.send_header("Content-length", str(len(response)))
-            self.end_headers()
-            self.wfile.write(response)
-
-            # shut down the connection
-            self.wfile.flush()
-            self.connection.shutdown(1)
-
-    def report_404 (self):
-            # Report a 404 error
-        self.send_response(404)
-        response = 'No such page'
-        self.send_header("Content-type", "text/plain")
-        self.send_header("Content-length", str(len(response)))
-        self.end_headers()
-        self.wfile.write(response)
-        # shut down the connection
-        self.wfile.flush()
-        self.connection.shutdown(1)
-
-    def log_request(self, code='-', size='-'):
-        """Selectively log an accepted request."""
-
-        if self.server.logRequests:
-            BaseHTTPServer.BaseHTTPRequestHandler.log_request(self, code, size)
-
-class SimpleXMLRPCServer(SocketServer.TCPServer,
-                         SimpleXMLRPCDispatcher):
-    """Simple XML-RPC server.
-
-    Simple XML-RPC server that allows functions and a single instance
-    to be installed to handle requests. The default implementation
-    attempts to dispatch XML-RPC calls to the functions or instance
-    installed in the server. Override the _dispatch method inhereted
-    from SimpleXMLRPCDispatcher to change this behavior.
-    """
-
-    allow_reuse_address = True
-
-    def __init__(self, addr, requestHandler=SimpleXMLRPCRequestHandler,
-                 logRequests=True, allow_none=False, encoding=None):
-        self.logRequests = logRequests
-
-        SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding)
-        SocketServer.TCPServer.__init__(self, addr, requestHandler)
-
-        # [Bug #1222790] If possible, set close-on-exec flag; if a
-        # method spawns a subprocess, the subprocess shouldn't have
-        # the listening socket open.
-        if fcntl is not None and hasattr(fcntl, 'FD_CLOEXEC'):
-            flags = fcntl.fcntl(self.fileno(), fcntl.F_GETFD)
-            flags |= fcntl.FD_CLOEXEC
-            fcntl.fcntl(self.fileno(), fcntl.F_SETFD, flags)
-
-class CGIXMLRPCRequestHandler(SimpleXMLRPCDispatcher):
-    """Simple handler for XML-RPC data passed through CGI."""
-
-    def __init__(self, allow_none=False, encoding=None):
-        SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding)
-
-    def handle_xmlrpc(self, request_text):
-        """Handle a single XML-RPC request"""
-
-        response = self._marshaled_dispatch(request_text)
-
-        print('Content-Type: text/xml')
-        print('Content-Length: %d' % len(response))
-        print(
-        sys.stdout.write(response))
-
-    def handle_get(self):
-        """Handle a single HTTP GET request.
-
-        Default implementation indicates an error because
-        XML-RPC uses the POST method.
-        """
-
-        code = 400
-        message, explain = \
-                 BaseHTTPServer.BaseHTTPRequestHandler.responses[code]
-
-        response = BaseHTTPServer.DEFAULT_ERROR_MESSAGE % \
-            {
-             'code' : code,
-             'message' : message,
-             'explain' : explain
-            }
-        print('Status: %d %s' % (code, message))
-        print('Content-Type: text/html')
-        print('Content-Length: %d' % len(response))
-        print(
-        sys.stdout.write(response))
-
-    def handle_request(self, request_text = None):
-        """Handle a single XML-RPC request passed through a CGI post method.
-
-        If no XML data is given then it is read from stdin. The resulting
-        XML-RPC response is printed to stdout along with the correct HTTP
-        headers.
-        """
-
-        if request_text is None and \
-            os.environ.get('REQUEST_METHOD', None) == 'GET':
-            self.handle_get()
-        else:
-            # POST data is normally available through stdin
-            if request_text is None:
-                request_text = sys.stdin.read()
-
-            self.handle_xmlrpc(request_text)
-
-if __name__ == '__main__':
-    print('Running XML-RPC server on port 8000')
-    server = SimpleXMLRPCServer(("localhost", 8000))
-    server.register_function(pow)
-    server.register_function(lambda x,y: x+y, 'add')
-    server.serve_forever()

deluge/__rpcapi.py

@@ -0,0 +1,20 @@
+from new import classobj
+from deluge.core.core import Core
+from deluge.core.daemon import Daemon
+
+class RpcApi:
+    pass
+
+def scan_for_methods(obj):
+    methods = {
+        '__doc__': 'Methods available in %s' % obj.__name__.lower()
+    }
+    for d in dir(obj):
+        if not hasattr(getattr(obj,d), '_rpcserver_export'):
+            continue
+        methods[d] = getattr(obj, d)
+    cobj = classobj(obj.__name__.lower(), (object,), methods)
+    setattr(RpcApi, obj.__name__.lower(), cobj)
+
+scan_for_methods(Core)
+scan_for_methods(Daemon)

deluge/_libtorrent.py

@@ -0,0 +1,60 @@
+#
+# _libtorrent.py
+#
+# Copyright (C) 2009 Andrew Resch <andrewresch@gmail.com>
+#
+# Deluge is free software.
+#
+# You may redistribute it and/or modify it under the terms of the
+# GNU General Public License, as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# deluge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with deluge.    If not, write to:
+# 	The Free Software Foundation, Inc.,
+# 	51 Franklin Street, Fifth Floor
+# 	Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+#
+
+"""
+This module is used to handle the importing of libtorrent.
+
+We use this module to control what versions of libtorrent this version of Deluge
+supports.
+
+** Usage **
+
+>>> from deluge._libtorrent import lt
+
+"""
+
+REQUIRED_VERSION = "0.14.9.0"
+
+def check_version(lt):
+    from deluge.common import VersionSplit
+    if VersionSplit(lt.version) < VersionSplit(REQUIRED_VERSION):
+        raise ImportError("This version of Deluge requires libtorrent >=%s!" % REQUIRED_VERSION)
+
+try:
+    import deluge.libtorrent as lt
+    check_version(lt)
+except ImportError:
+    import libtorrent as lt
+    check_version(lt)

deluge/bencode.py

@@ -0,0 +1,129 @@
+# The contents of this file are subject to the Python Software Foundation
+# License Version 2.3 (the License).  You may not copy or use this file, in
+# either source code or executable form, except in compliance with the License.
+# You may obtain a copy of the License at http://www.python.org/license.
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the License
+# for the specific language governing rights and limitations under the
+# License.
+
+# Written by Petru Paler
+
+# Minor modifications made by Andrew Resch to replace the BTFailure errors with Exceptions
+
+def decode_int(x, f):
+    f += 1
+    newf = x.index('e', f)
+    n = int(x[f:newf])
+    if x[f] == '-':
+        if x[f + 1] == '0':
+            raise ValueError
+    elif x[f] == '0' and newf != f+1:
+        raise ValueError
+    return (n, newf+1)
+
+def decode_string(x, f):
+    colon = x.index(':', f)
+    n = int(x[f:colon])
+    if x[f] == '0' and colon != f+1:
+        raise ValueError
+    colon += 1
+    return (x[colon:colon+n], colon+n)
+
+def decode_list(x, f):
+    r, f = [], f+1
+    while x[f] != 'e':
+        v, f = decode_func[x[f]](x, f)
+        r.append(v)
+    return (r, f + 1)
+
+def decode_dict(x, f):
+    r, f = {}, f+1
+    while x[f] != 'e':
+        k, f = decode_string(x, f)
+        r[k], f = decode_func[x[f]](x, f)
+    return (r, f + 1)
+
+decode_func = {}
+decode_func['l'] = decode_list
+decode_func['d'] = decode_dict
+decode_func['i'] = decode_int
+decode_func['0'] = decode_string
+decode_func['1'] = decode_string
+decode_func['2'] = decode_string
+decode_func['3'] = decode_string
+decode_func['4'] = decode_string
+decode_func['5'] = decode_string
+decode_func['6'] = decode_string
+decode_func['7'] = decode_string
+decode_func['8'] = decode_string
+decode_func['9'] = decode_string
+
+def bdecode(x):
+    try:
+        r, l = decode_func[x[0]](x, 0)
+    except (IndexError, KeyError, ValueError):
+        raise Exception("not a valid bencoded string")
+
+    return r
+
+from types import StringType, IntType, LongType, DictType, ListType, TupleType
+
+
+class Bencached(object):
+
+    __slots__ = ['bencoded']
+
+    def __init__(self, s):
+        self.bencoded = s
+
+def encode_bencached(x,r):
+    r.append(x.bencoded)
+
+def encode_int(x, r):
+    r.extend(('i', str(x), 'e'))
+
+def encode_bool(x, r):
+    if x:
+        encode_int(1, r)
+    else:
+        encode_int(0, r)
+
+def encode_string(x, r):
+    r.extend((str(len(x)), ':', x))
+
+def encode_list(x, r):
+    r.append('l')
+    for i in x:
+        encode_func[type(i)](i, r)
+    r.append('e')
+
+def encode_dict(x,r):
+    r.append('d')
+    ilist = x.items()
+    ilist.sort()
+    for k, v in ilist:
+        r.extend((str(len(k)), ':', k))
+        encode_func[type(v)](v, r)
+    r.append('e')
+
+encode_func = {}
+encode_func[Bencached] = encode_bencached
+encode_func[IntType] = encode_int
+encode_func[LongType] = encode_int
+encode_func[StringType] = encode_string
+encode_func[ListType] = encode_list
+encode_func[TupleType] = encode_list
+encode_func[DictType] = encode_dict
+
+try:
+    from types import BooleanType
+    encode_func[BooleanType] = encode_bool
+except ImportError:
+    pass
+
+def bencode(x):
+    r = []
+    encode_func[type(x)](x, r)
+    return ''.join(r)

deluge/common.py

@@ -1,25 +1,25 @@
 #
 # common.py
 #
-# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com>
-# 
+# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com>
+#
 # Deluge is free software.
-# 
+#
 # You may redistribute it and/or modify it under the terms of the
 # GNU General Public License, as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option)
+# Foundation; either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # deluge is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with deluge.    If not, write to:
-# 	The Free Software Foundation, Inc.,
-# 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
+#   The Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor
+#   Boston, MA  02110-1301, USA.
 #
 #    In addition, as a special exception, the copyright holders give
 #    permission to link the code of portions of this program with the OpenSSL
@@ -30,34 +30,75 @@
 #    but you are not obligated to do so. If you do not wish to do so, delete
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
+#
+#
+
 
 """Common functions for various parts of Deluge to use."""
 
 import os
+import time
 import subprocess
-
+import platform
+import sys
+import chardet
 import pkg_resources
-import xdg, xdg.BaseDirectory
+import gettext
+import locale
+
+try:
+    import json
+except ImportError:
+    import simplejson as json
+
+from deluge.error import *
+from deluge.log import LOG as log
+
+# Do a little hack here just in case the user has json-py installed since it
+# has a different api
+if not hasattr(json, "dumps"):
+    json.dumps = json.write
+    json.loads = json.read
+
+    def dump(obj, fp, **kw):
+        fp.write(json.dumps(obj))
+
+    def load(fp, **kw):
+        return json.loads(fp.read())
+
+    json.dump = dump
+    json.load = load
+
+# Initialize gettext
+try:
+    if hasattr(locale, "bindtextdomain"):
+        locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
+    if hasattr(locale, "textdomain"):
+        locale.textdomain("deluge")
+    gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n"), unicode=True)
+except Exception, e:
+    log.error("Unable to initialize gettext/locale!")
+    log.exception(e)
+    import __builtin__
+    __builtin__.__dict__["_"] = lambda x: x
 
 LT_TORRENT_STATE = {
     "Queued": 0,
     "Checking": 1,
-    "Connecting": 2,
-    "Downloading Metadata": 3,
-    "Downloading": 4,
-    "Finished": 5,
-    "Seeding": 6,
-    "Allocating": 7,
-    "Paused": 8,
+    "Downloading Metadata": 2,
+    "Downloading": 3,
+    "Finished": 4,
+    "Seeding": 5,
+    "Allocating": 6,
+    "Checking Resume Data": 7,
     0: "Queued",
     1: "Checking",
-    2: "Connecting",
-    3: "Downloading Metadata",
-    4: "Downloading",
-    5: "Finished",
-    6: "Seeding",
-    7: "Allocating",
-    8: "Paused"
+    2: "Downloading Metadata",
+    3: "Downloading",
+    4: "Finished",
+    5: "Seeding",
+    6: "Allocating",
+    7: "Checking Resume Data"
 }
 
 TORRENT_STATE = [
@@ -74,282 +115,630 @@ FILE_PRIORITY = {
     0: "Do Not Download",
     1: "Normal Priority",
     2: "High Priority",
-    5: "Highest Priority",
+    3: "High Priority",
+    4: "High Priority",
+    5: "High Priority",
+    6: "High Priority",
+    7: "Highest Priority",
     "Do Not Download": 0,
     "Normal Priority": 1,
-    "High Priority": 2,
-    "Highest Priority": 5
+    "High Priority": 5,
+    "Highest Priority": 7
 }
 
 def get_version():
-    """Returns the program version from the egg metadata"""
-    return pkg_resources.require("Deluge")[0].version.split("r")[0]
+    """
+    Returns the program version from the egg metadata
+
+    :returns: the version of Deluge
+    :rtype: string
+
+    """
+    return pkg_resources.require("Deluge")[0].version
 
-def get_revision():
-    revision = ""
-    try:
-        f = open(pkg_resources.resource_filename("deluge", os.path.join("data", "revision")))
-        revision = f.read()
-        f.close()
-    except IOError, e:
-        pass
-        
-    return revision
-    
 def get_default_config_dir(filename=None):
-    """ Returns the config path if no filename is specified
-    Returns the config directory + filename as a path if filename is specified
+    """
+    :param filename: if None, only the config path is returned, if provided, a path including the filename will be returned
+    :type filename: string
+    :returns: a file path to the config directory and optional filename
+    :rtype: string
+
     """
     if windows_check():
+        appDataPath = os.environ.get("APPDATA")
+        if not appDataPath:
+            import _winreg
+            hkey = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders")
+            appDataReg = _winreg.QueryValueEx(hkey, "AppData")
+            appDataPath = appDataReg[0]
+            _winreg.CloseKey(hkey)
         if filename:
-            return os.path.join(os.environ.get("APPDATA"), "deluge", filename)
+            return os.path.join(appDataPath, "deluge", filename)
         else:
-            return os.path.join(os.environ.get("APPDATA"), "deluge")
+            return os.path.join(appDataPath, "deluge")
     else:
-        if filename:
-            return os.path.join(xdg.BaseDirectory.save_config_path("deluge"), filename)
-        else:
-            return xdg.BaseDirectory.save_config_path("deluge")
+        from xdg.BaseDirectory import save_config_path
+        try:
+            if filename:
+                return os.path.join(save_config_path("deluge"), filename)
+            else:
+                return save_config_path("deluge")
+        except OSError, e:
+            log.error("Unable to use default config directory, exiting... (%s)", e)
+            sys.exit(1)
 
 def get_default_download_dir():
-    """Returns the default download directory"""
-    if windows_check():
-        return os.path.expanduser("~")
-    else:
-        return os.environ.get("HOME")
+    """
+    :returns: the default download directory
+    :rtype: string
+
+    """
+    download_dir = ""
+    if not windows_check():
+        from xdg.BaseDirectory import xdg_config_home
+        try:
+            for line in open(os.path.join(xdg_config_home, 'user-dirs.dirs'), 'r'):
+                if not line.startswith('#') and line.startswith('XDG_DOWNLOAD_DIR'):
+                    download_dir = os.path.expandvars(line.partition("=")[2].rstrip().strip('"'))
+                    break
+        except IOError:
+            pass
+
+    if not download_dir:
+        download_dir = os.path.join(os.path.expanduser("~"), 'Downloads')
+    return download_dir
 
 def windows_check():
-    """Checks if the current platform is Windows.  Returns True if it is Windows
-        and False if not."""
-    import platform
-    if platform.system() in ('Windows', 'Microsoft'):
-        return True
-    else:
-        return False
+    """
+    Checks if the current platform is Windows
+
+    :returns: True or False
+    :rtype: bool
+
+    """
+    return platform.system() in ('Windows', 'Microsoft')
+
+def vista_check():
+    """
+    Checks if the current platform is Windows Vista
+
+    :returns: True or False
+    :rtype: bool
+
+    """
+    return platform.release() == "Vista"
+
+def osx_check():
+    """
+    Checks if the current platform is Mac OS X
+
+    :returns: True or False
+    :rtype: bool
+
+    """
+    return platform.system() == "Darwin"
 
 def get_pixmap(fname):
-    """Returns a pixmap file included with deluge"""
+    """
+    Provides easy access to files in the deluge/data/pixmaps folder within the Deluge egg
+
+    :param fname: the filename to look for
+    :type fname: string
+    :returns: a path to a pixmap file included with Deluge
+    :rtype: string
+
+    """
     return pkg_resources.resource_filename("deluge", os.path.join("data", \
                                            "pixmaps", fname))
 
-def get_logo(size):
-    """Returns a deluge logo pixbuf based on the size parameter."""
-    import gtk
-    if windows_check(): 
-        return gtk.gdk.pixbuf_new_from_file_at_size(get_pixmap("deluge.png"), \
-            size, size)
-    else:
-        return gtk.gdk.pixbuf_new_from_file_at_size(get_pixmap("deluge.svg"), \
-            size, size)
+def open_file(path, timestamp=None):
+    """
+    Opens a file or folder using the system configured program
 
-def open_file(path):
-    """Opens a file or folder."""
+    :param path: the path to the file or folder to open
+    :type path: string
+    :param timestamp: the timestamp of the event that requested to open
+    :type timestamp: int
+
+    """
     if windows_check():
-        os.startfile("'%s'" % path)
+        os.startfile(path.decode("utf8"))
+    elif osx_check():
+        subprocess.Popen(["open", "%s" % path])
     else:
-        subprocess.Popen(["xdg-open", "%s" % path])
+        if timestamp is None:
+            timestamp = int(time.time())
+        env = os.environ.copy()
+        env["DESKTOP_STARTUP_ID"] = "%s-%u-%s-xdg_open_TIME%d" % \
+            (os.path.basename(sys.argv[0]), os.getpid(), os.uname()[1], timestamp)
+        subprocess.Popen(["xdg-open", "%s" % path], env=env)
 
 def open_url_in_browser(url):
-    """Opens link in the desktop's default browser"""
-    def start_browser():
-        import threading
-        import webbrowser
-        class BrowserThread(threading.Thread):
-            def __init__(self, url):
-                threading.Thread.__init__(self)
-                self.url = url
-            def run(self):
-                webbrowser.open(self.url)
-        BrowserThread(url).start()
-        return False
-        
-    import gobject
-    gobject.idle_add(start_browser)
+    """
+    Opens a url in the desktop's default browser
 
+    :param url: the url to open
+    :type url: string
 
-def build_menu_radio_list(value_list, callback, pref_value=None, 
-    suffix=None, show_notset=False, notset_label=None, notset_lessthan=0, 
-    show_other=False, show_activated=False, activated_label=None):
-    # Build a menu with radio menu items from a list and connect them to 
-    # the callback. The pref_value is what you would like to test for the 
-    # default active radio item.
-    import gtk
-    if notset_label is None:
-        notset_label = _("Unlimited")
+    """
+    import webbrowser
+    webbrowser.open(url)
 
-    if activated_label is None:
-        activated_label = _("Activated")
-
-    menu = gtk.Menu()
-    group = None
-    if show_activated is False:
-        if pref_value > -1 and pref_value not in value_list:
-            value_list.pop()
-            value_list.append(pref_value)
-            
-        for value in sorted(value_list):
-            if suffix != None:
-                menuitem = gtk.RadioMenuItem(group, str(value) + " " + \
-                    suffix)
-            else:
-                menuitem = gtk.RadioMenuItem(group, str(value))
-        
-            group = menuitem
-
-            if value == pref_value and pref_value != None:
-                menuitem.set_active(True)
-
-            if callback != None:
-                menuitem.connect("toggled", callback)
-
-            menu.append(menuitem)
-
-    if show_activated is True:
-        for value in sorted(value_list):
-            menuitem = gtk.RadioMenuItem(group, str(activated_label))
-        
-            group = menuitem
-
-            if value == pref_value and pref_value != None:
-                menuitem.set_active(True)
-
-            if callback != None:
-                menuitem.connect("toggled", callback)
-
-            menu.append(menuitem)
-
-    if show_notset:
-        menuitem = gtk.RadioMenuItem(group, notset_label)
-        if pref_value < notset_lessthan and pref_value != None:
-            menuitem.set_active(True)
-        if show_activated and pref_value == 1:
-            menuitem.set_active(True)
-        menuitem.connect("toggled", callback)
-        menu.append(menuitem)
-        
-    # Add the Other... menuitem
-    if show_other is True:
-        menuitem = gtk.SeparatorMenuItem()
-        menu.append(menuitem)
-        menuitem = gtk.MenuItem(_("Other..."))
-        menuitem.connect("activate", callback)
-        menu.append(menuitem)
-                
-    return menu
-
-def show_other_dialog(string, default=None):
-    """Shows a dialog to get an 'other' speed and return the value"""
-    import gtk
-    import gtk.glade
-    dialog_glade = gtk.glade.XML(
-        pkg_resources.resource_filename("deluge.ui.gtkui", 
-                                    "glade/dgtkpopups.glade"))
-    speed_dialog = dialog_glade.get_widget("speed_dialog")
-    spin_title = dialog_glade.get_widget("spin_title")
-    spin_title.set_text(_("%s" % string))
-    spin_speed = dialog_glade.get_widget("spin_speed")
-    if default != None:
-        spin_speed.set_value(default)
-    spin_speed.select_region(0, -1)
-    response = speed_dialog.run()
-    if response == 1: # OK Response
-        value = spin_speed.get_value()
-    else:
-        speed_dialog.destroy()
-        return None
-        
-    speed_dialog.destroy()
-    return value
-        
 ## Formatting text functions
 
 def fsize(fsize_b):
-    """Returns formatted string describing filesize
-       fsize_b should be in bytes
-       Returned value will be in either KB, MB, or GB
-    """    
+    """
+    Formats the bytes value into a string with KiB, MiB or GiB units
+
+    :param fsize_b: the filesize in bytes
+    :type fsize_b: int
+    :returns: formatted string in KiB, MiB or GiB units
+    :rtype: string
+
+    **Usage**
+
+    >>> fsize(112245)
+    '109.6 KiB'
+
+    """
     fsize_kb = fsize_b / 1024.0
-    if fsize_kb < 1000:
-        return "%.1f KiB" % fsize_kb
+    if fsize_kb < 1024:
+        return "%.1f %s" % (fsize_kb, _("KiB"))
     fsize_mb = fsize_kb / 1024.0
-    if fsize_mb < 1000:
-        return "%.1f MiB" % fsize_mb
+    if fsize_mb < 1024:
+        return "%.1f %s" % (fsize_mb, _("MiB"))
     fsize_gb = fsize_mb / 1024.0
-    return "%.1f GiB" % fsize_gb
+    return "%.1f %s" % (fsize_gb, _("GiB"))
+
+def fsize_short(fsize_b):
+    """
+    Formats the bytes value into a string with K, M or G units
+
+    :param fsize_b: the filesize in bytes
+    :type fsize_b: int
+    :returns: formatted string in K, M or G units
+    :rtype: string
+
+    **Usage**
+
+    >>> fsize(112245)
+    '109.6 K'
+
+    """
+    fsize_kb = fsize_b / 1024.0
+    if fsize_kb < 1024:
+        return "%.1f %s" % (fsize_kb, _("K"))
+    fsize_mb = fsize_kb / 1024.0
+    if fsize_mb < 1024:
+        return "%.1f %s" % (fsize_mb, _("M"))
+    fsize_gb = fsize_mb / 1024.0
+    return "%.1f %s" % (fsize_gb, _("G"))
 
 def fpcnt(dec):
-    """Returns a formatted string representing a percentage"""
+    """
+    Formats a string to display a percentage with two decimal places
+
+    :param dec: the ratio in the range [0.0, 1.0]
+    :type dec: float
+    :returns: a formatted string representing a percentage
+    :rtype: string
+
+    **Usage**
+
+    >>> fpcnt(0.9311)
+    '93.11%'
+
+    """
     return '%.2f%%' % (dec * 100)
 
 def fspeed(bps):
-    """Returns a formatted string representing transfer speed"""
-    return '%s/s' % (fsize(bps))
+    """
+    Formats a string to display a transfer speed utilizing :func:`fsize`
+
+    :param bps: bytes per second
+    :type bps: int
+    :returns: a formatted string representing transfer speed
+    :rtype: string
+
+    **Usage**
+
+    >>> fspeed(43134)
+    '42.1 KiB/s'
+
+    """
+    fspeed_kb = bps / 1024.0
+    if fspeed_kb < 1024:
+        return "%.1f %s" % (fspeed_kb, _("KiB/s"))
+    fspeed_mb = fspeed_kb / 1024.0
+    if fspeed_mb < 1024:
+        return "%.1f %s" % (fspeed_mb, _("MiB/s"))
+    fspeed_gb = fspeed_mb / 1024.0
+    return "%.1f %s" % (fspeed_gb, _("GiB/s"))
 
 def fpeer(num_peers, total_peers):
-    """Returns a formatted string num_peers (total_peers)"""
+    """
+    Formats a string to show 'num_peers' ('total_peers')
+
+    :param num_peers: the number of connected peers
+    :type num_peers: int
+    :param total_peers: the total number of peers
+    :type total_peers: int
+    :returns: a formatted string: num_peers (total_peers), if total_peers < 0, then it will not be shown
+    :rtype: string
+
+    **Usage**
+
+    >>> fpeer(10, 20)
+    '10 (20)'
+    >>> fpeer(10, -1)
+    '10'
+
+    """
     if total_peers > -1:
         return "%d (%d)" % (num_peers, total_peers)
     else:
         return "%d" % num_peers
-    
+
 def ftime(seconds):
-    """Returns a formatted time string"""
+    """
+    Formats a string to show time in a human readable form
+
+    :param seconds: the number of seconds
+    :type seconds: int
+    :returns: a formatted time string, will return '' if seconds == 0
+    :rtype: string
+
+    **Usage**
+
+    >>> ftime(23011)
+    '6h 23m'
+
+    """
     if seconds == 0:
-        return "Infinity"
+        return ""
     if seconds < 60:
         return '%ds' % (seconds)
     minutes = seconds / 60
-    seconds = seconds % 60
     if minutes < 60:
+        seconds = seconds % 60
         return '%dm %ds' % (minutes, seconds)
     hours = minutes / 60
-    minutes = minutes % 60
     if hours < 24:
+        minutes = minutes % 60
         return '%dh %dm' % (hours, minutes)
     days = hours / 24
-    hours = hours % 24
     if days < 7:
+        hours = hours % 24
         return '%dd %dh' % (days, hours)
     weeks = days / 7
-    days = days % 7
-    if weeks < 10:
+    if weeks < 52:
+        days = days % 7
         return '%dw %dd' % (weeks, days)
-    return 'unknown'
+    years = weeks / 52
+    weeks = weeks % 52
+    return '%dy %dw' % (years, weeks)
+
+def fdate(seconds):
+    """
+    Formats a date time string in the locale's date representation based on the systems timezone
+
+    :param seconds: time in seconds since the Epoch
+    :type seconds: float
+    :returns: a string in the locale's datetime representation or "" if seconds < 0
+    :rtype: string
+
+    """
+    if seconds < 0:
+        return ""
+    return time.strftime("%x %X", time.localtime(seconds))
 
 def is_url(url):
-    """A simple regex test to check if the URL is valid."""
-    import re
-    return bool(re.search('^(https?|ftp)://', url))
+    """
+    A simple test to check if the URL is valid
 
-def fetch_url(url):
-    """Downloads a torrent file from a given 
-    URL and checks the file's validity."""
-    import urllib
-    from deluge.log import LOG as log
-    try:
-        filename, headers = urllib.urlretrieve(url)
-    except IOError:
-        log.debug("Network error while trying to fetch torrent from %s", url)
+    :param url: the url to test
+    :type url: string
+    :returns: True or False
+    :rtype: bool
+
+    **Usage**
+
+    >>> is_url("http://deluge-torrent.org")
+    True
+
+    """
+    return url.partition('://')[0] in ("http", "https", "ftp", "udp")
+
+def is_magnet(uri):
+    """
+    A check to determine if a uri is a valid bittorrent magnet uri
+
+    :param uri: the uri to check
+    :type uri: string
+    :returns: True or False
+    :rtype: bool
+
+    **Usage**
+
+    >>> is_magnet("magnet:?xt=urn:btih:SU5225URMTUEQLDXQWRB2EQWN6KLTYKN")
+    True
+
+    """
+    magnet_scheme = 'magnet:?'
+    xt_param = 'xt=urn:btih:'
+    if uri.startswith(magnet_scheme) and xt_param in uri:
+        return True
+    return False
+
+def create_magnet_uri(infohash, name=None, trackers=[]):
+    """
+    Creates a magnet uri
+
+    :param infohash: the info-hash of the torrent
+    :type infohash: string
+    :param name: the name of the torrent (optional)
+    :type name: string
+    :param trackers: the trackers to announce to (optional)
+    :type trackers: list of strings
+
+    :returns: a magnet uri string
+    :rtype: string
+
+    """
+    from base64 import b32encode
+    uri = "magnet:?xt=urn:btih:" + b32encode(infohash.decode("hex"))
+    if name:
+        uri = uri + "&dn=" + name
+    if trackers:
+        for t in trackers:
+            uri = uri + "&tr=" + t
+
+    return uri
+
+def get_path_size(path):
+    """
+    Gets the size in bytes of 'path'
+
+    :param path: the path to check for size
+    :type path: string
+    :returns: the size in bytes of the path or -1 if the path does not exist
+    :rtype: int
+
+    """
+    if not os.path.exists(path):
+        return -1
+
+    if os.path.isfile(path):
+        return os.path.getsize(path)
+
+    dir_size = 0
+    for (p, dirs, files) in os.walk(path):
+        for file in files:
+            filename = os.path.join(p, file)
+            dir_size += os.path.getsize(filename)
+    return dir_size
+
+def free_space(path):
+    """
+    Gets the free space available at 'path'
+
+    :param path: the path to check
+    :type path: string
+    :returns: the free space at path in bytes
+    :rtype: int
+
+    :raises InvalidPathError: if the path is not valid
+
+    """
+    if not path or not os.path.exists(path):
+        raise InvalidPathError("%s is not a valid path" % path)
+
+    if windows_check():
+        from win32file import GetDiskFreeSpaceEx
+        return GetDiskFreeSpaceEx(path)[0]
     else:
-        if filename.endswith(".torrent") or headers["content-type"] ==\
-        "application/x-bittorrent":
-            return filename
-        else:
-            log.debug("URL doesn't appear to be a valid torrent file: %s", url)
-            return None
-            
-def pythonize(var):
-    """Translates DBUS types back to basic Python types."""
-    if isinstance(var, list):
-        return [pythonize(value) for value in var]
-    if isinstance(var, tuple):
-        return tuple([pythonize(value) for value in var])
-    if isinstance(var, dict):
-        return dict(
-        [(pythonize(key), pythonize(value)) for key, value in var.iteritems()]
-        )
+        disk_data = os.statvfs(path.encode("utf8"))
+        block_size = disk_data.f_frsize
+        return disk_data.f_bavail * block_size
 
-    for klass in [unicode, str, bool, int, float, long]:
-        if isinstance(var, klass):
-            return klass(var)
-    return var
+def is_ip(ip):
+    """
+    A simple test to see if 'ip' is valid
+
+    :param ip: the ip to check
+    :type ip: string
+    :returns: True or False
+    :rtype: bool
+
+    ** Usage **
+
+    >>> is_ip("127.0.0.1")
+    True
+
+    """
+    import socket
+    #first we test ipv4
+    try:
+        if windows_check():
+            if socket.inet_aton("%s" % (ip)):
+                return True
+        else:
+            if socket.inet_pton(socket.AF_INET, "%s" % (ip)):
+                return True
+    except socket.error:
+        if not socket.has_ipv6:
+            return False
+    #now test ipv6
+    try:
+        if windows_check():
+            log.warning("ipv6 check unavailable on windows")
+            return True
+        else:
+            if socket.inet_pton(socket.AF_INET6, "%s" % (ip)):
+                return True
+    except socket.error:
+        return False
+
+def path_join(*parts):
+    """
+    An implementation of os.path.join that always uses / for the separator
+    to ensure that the correct paths are produced when working with internal
+    paths on Windows.
+    """
+    path = ''
+    for part in parts:
+        if not part:
+            continue
+        elif part[0] == '/':
+            path = part
+        elif not path:
+            path = part
+        else:
+            path += '/' + part
+    return path
+
+XML_ESCAPES = (
+    ('&', '&amp;'),
+    ('<', '&lt;'),
+    ('>', '&gt;'),
+    ('"', '&quot;'),
+    ("'", '&apos;')
+)
+
+def xml_decode(string):
+    """
+    Unescape a string that was previously encoded for use within xml.
+
+    :param string: The string to escape
+    :type string: string
+    :returns: The unescaped version of the string.
+    :rtype: string
+    """
+    for char, escape in XML_ESCAPES:
+        string = string.replace(escape, char)
+    return string
+
+def xml_encode(string):
+    """
+    Escape a string for use within an xml element or attribute.
+
+    :param string: The string to escape
+    :type string: string
+    :returns: An escaped version of the string.
+    :rtype: string
+    """
+    for char, escape in XML_ESCAPES:
+        string = string.replace(char, escape)
+    return string
+
+def decode_string(s, encoding="utf8"):
+    """
+    Decodes a string and return unicode. If it cannot decode using
+    `:param:encoding` then it will try latin1, and if that fails,
+    try to detect the string encoding. If that fails, decode with
+    ignore.
+
+    :param s: string to decode
+    :type s: string
+    :keyword encoding: the encoding to use in the decoding
+    :type encoding: string
+    :returns: s converted to unicode
+    :rtype: unicode
+
+    """
+    if not s:
+        return u''
+    elif isinstance(s, unicode):
+        return s
+
+    encodings = [lambda: ("utf8", 'strict'),
+                 lambda: ("iso-8859-1", 'strict'),
+                 lambda: (chardet.detect(s)["encoding"], 'strict'),
+                 lambda: (encoding, 'ignore')]
+
+    if not encoding is "utf8":
+        encodings.insert(0, lambda: (encoding, 'strict'))
+
+    for l in encodings:
+        try:
+            return s.decode(*l())
+        except UnicodeDecodeError:
+            pass
+    return u''
+
+def utf8_encoded(s, encoding="utf8"):
+    """
+    Returns a utf8 encoded string of s
+
+    :param s: (unicode) string to (re-)encode
+    :type s: basestring
+    :keyword encoding: the encoding to use in the decoding
+    :type encoding: string
+    :returns: a utf8 encoded string of s
+    :rtype: str
+
+    """
+    if isinstance(s, str):
+        s = decode_string(s, encoding).encode("utf8")
+    elif isinstance(s, unicode):
+        s = s.encode("utf8")
+    return s
+
+class VersionSplit(object):
+    """
+    Used for comparing version numbers.
+
+    :param ver: the version
+    :type ver: string
+
+    """
+    def __init__(self, ver):
+        ver = ver.lower()
+        vs = ver.replace("_", "-").split("-")
+        self.version = [int(x) for x in vs[0].split(".") if x.isdigit()]
+        self.suffix = None
+        self.dev = False
+        if len(vs) > 1:
+            if vs[1].startswith(("rc", "alpha", "beta")):
+                self.suffix = vs[1]
+            if vs[-1] == 'dev':
+                self.dev = True
+
+    def __cmp__(self, ver):
+        """
+        The comparison method.
+
+        :param ver: the version to compare with
+        :type ver: VersionSplit
+
+        """
+
+        # If there is no suffix we use z because we want final
+        # to appear after alpha, beta, and rc alphabetically.
+        v1 = [self.version, self.suffix or 'z', self.dev]
+        v2 = [ver.version, ver.suffix or 'z', ver.dev]
+        return cmp(v1, v2)
+
+def win32_unicode_argv():
+    """ Gets sys.argv as list of unicode objects on any platform."""
+    if windows_check():
+        # Versions 2.x of Python don't support Unicode in sys.argv on Windows, with the
+        # underlying Windows API instead replacing multi-byte characters with '?'.
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        get_cmd_linew = cdll.kernel32.GetCommandLineW
+        get_cmd_linew.argtypes = []
+        get_cmd_linew.restype = LPCWSTR
+
+        cmdline_to_argvw = windll.shell32.CommandLineToArgvW
+        cmdline_to_argvw.argtypes = [LPCWSTR, POINTER(c_int)]
+        cmdline_to_argvw.restype = POINTER(LPWSTR)
+
+        cmd = get_cmd_linew()
+        argc = c_int(0)
+        argv = cmdline_to_argvw(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in xrange(start, argc.value)]

deluge/component.py

@@ -1,25 +1,25 @@
 #
 # component.py
 #
-# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com>
-# 
+# Copyright (C) 2007-2010 Andrew Resch <andrewresch@gmail.com>
+#
 # Deluge is free software.
-# 
+#
 # You may redistribute it and/or modify it under the terms of the
 # GNU General Public License, as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option)
+# Foundation; either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # deluge is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with deluge.    If not, write to:
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
+# 	Boston, MA  02110-1301, USA.
 #
 #    In addition, as a special exception, the copyright holders give
 #    permission to link the code of portions of this program with the OpenSSL
@@ -30,200 +30,398 @@
 #    but you are not obligated to do so. If you do not wish to do so, delete
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
+#
+#
 
-import gobject
+from twisted.internet.defer import maybeDeferred, succeed, DeferredList, fail
+from twisted.internet.task import LoopingCall
 from deluge.log import LOG as log
 
-COMPONENT_STATE = [
-    "Stopped",
-    "Started",
-    "Paused"
-]
+class ComponentAlreadyRegistered(Exception):
+    pass
+
+class Component(object):
+    """
+    Component objects are singletons managed by the :class:`ComponentRegistry`.
+    When a new Component object is instantiated, it will be automatically
+    registered with the :class:`ComponentRegistry`.
+
+    The ComponentRegistry has the ability to start, stop, pause and shutdown the
+    components registered with it.
+
+    **Events:**
+
+        **start()** - This method is called when the client has connected to a
+                  Deluge core.
+
+        **stop()** - This method is called when the client has disconnected from a
+                 Deluge core.
+
+        **update()** - This method is called every 1 second by default while the
+                   Componented is in a *Started* state.  The interval can be
+                   specified during instantiation.  The update() timer can be
+                   paused by instructing the :class:`ComponentRegistry` to pause
+                   this Component.
+
+        **shutdown()** - This method is called when the client is exiting.  If the
+                     Component is in a "Started" state when this is called, a
+                     call to stop() will be issued prior to shutdown().
+
+    **States:**
+
+        A Component can be in one of these 5 states.
+
+        **Started** - The Component has been started by the :class:`ComponentRegistry`
+                    and will have it's update timer started.
+
+        **Starting** - The Component has had it's start method called, but it hasn't
+                    fully started yet.
+
+        **Stopped** - The Component has either been stopped or has yet to be started.
+
+        **Stopping** - The Component has had it's stop method called, but it hasn't
+                    fully stopped yet.
+
+        **Paused** - The Component has had it's update timer stopped, but will
+                    still be considered in a Started state.
+
+    """
+    def __init__(self, name, interval=1, depend=None):
+        self._component_name = name
+        self._component_interval = interval
+        self._component_depend = depend
+        self._component_state = "Stopped"
+        self._component_timer = None
+        self._component_starting_deferred = None
+        self._component_stopping_deferred = None
+        _ComponentRegistry.register(self)
+
+    def __del__(self):
+        if _ComponentRegistry:
+            _ComponentRegistry.deregister(self._component_name)
+
+    def _component_start_timer(self):
+        if hasattr(self, "update"):
+            self._component_timer = LoopingCall(self.update)
+            self._component_timer.start(self._component_interval)
+
+    def _component_start(self):
+        def on_start(result):
+            self._component_state = "Started"
+            self._component_starting_deferred = None
+            self._component_start_timer()
+            return True
+
+        def on_start_fail(result):
+            self._component_state = "Stopped"
+            self._component_starting_deferred = None
+            log.error(result)
+            return result
+
+        if self._component_state == "Stopped":
+            if hasattr(self, "start"):
+                self._component_state = "Starting"
+                d = maybeDeferred(self.start)
+                d.addCallback(on_start)
+                d.addErrback(on_start_fail)
+                self._component_starting_deferred = d
+            else:
+                d = maybeDeferred(on_start, None)
+        elif self._component_state == "Starting":
+            return self._component_starting_deferred
+        elif self._component_state == "Started":
+            d = succeed(True)
+        else:
+            d = fail("Cannot start a component not in a Stopped state!")
+
+        return d
+
+    def _component_stop(self):
+        def on_stop(result):
+            self._component_state = "Stopped"
+            if self._component_timer and self._component_timer.running:
+                self._component_timer.stop()
+            return True
+
+        def on_stop_fail(result):
+            self._component_state = "Started"
+            self._component_stopping_deferred = None
+            log.error(result)
+            return result
+
+        if self._component_state != "Stopped" and self._component_state != "Stopping":
+            if hasattr(self, "stop"):
+                self._component_state = "Stopping"
+                d = maybeDeferred(self.stop)
+                d.addCallback(on_stop)
+                d.addErrback(on_stop_fail)
+                self._component_stopping_deferred = d
+            else:
+                d = maybeDeferred(on_stop, None)
+
+        if self._component_state == "Stopping":
+            return self._component_stopping_deferred
+
+        return succeed(None)
+
+    def _component_pause(self):
+        def on_pause(result):
+            self._component_state = "Paused"
+
+        if self._component_state == "Started":
+            if self._component_timer and self._component_timer.running:
+                d = maybeDeferred(self._component_timer.stop)
+                d.addCallback(on_pause)
+            else:
+                d = succeed(None)
+        elif self._component_state == "Paused":
+            d = succeed(None)
+        else:
+            d = fail("Cannot pause a component in a non-Started state!")
+
+        return d
+
+    def _component_resume(self):
+        def on_resume(result):
+            self._component_state = "Started"
+
+        if self._component_state == "Paused":
+            d = maybeDeferred(self._component_start_timer)
+            d.addCallback(on_resume)
+        else:
+            d = fail("Component cannot be resumed from a non-Paused state!")
+
+        return d
+
+    def _component_shutdown(self):
+        def on_stop(result):
+            if hasattr(self, "shutdown"):
+                return maybeDeferred(self.shutdown)
+            return succeed(None)
+
+        d = self._component_stop()
+        d.addCallback(on_stop)
+        return d
 
-class Component:
-    def __init__(self, name, interval=1000, depend=None):
-        # Register with the ComponentRegistry
-        register(name, self, depend)
-        self._interval = interval
-        self._timer = None
-        self._state = COMPONENT_STATE.index("Stopped")
-    
-    def get_state(self):
-        return self._state
-        
     def start(self):
         pass
-    
-    def _start(self):
-        self._state = COMPONENT_STATE.index("Started")
-        if self._update():
-            self._timer = gobject.timeout_add(self._interval, self._update)
-        
+
     def stop(self):
         pass
 
-    def _stop(self):
-        self._state = COMPONENT_STATE.index("Stopped")
-        try:
-            gobject.source_remove(self._timer)
-        except:
-            pass
-    
-    def _pause(self):
-        self._state = COMPONENT_STATE.index("Paused")
-        try:
-            gobject.source_remove(self._timer)
-        except:
-            pass
-    
-    def _resume(self):
-        self._start()
-            
-    def shutdown(self):
-        pass
-    
-    def _update(self):
-        try:
-            self.update()
-        except AttributeError:
-            # This will stop the timer since the component doesn't have an
-            # update method.
-            return False
-        return True
-        
-        
-class ComponentRegistry:
-    def __init__(self):
-        self.components = {}
-        self.depend = {}
-    
-    def register(self, name, obj, depend):
-        """Registers a component.. depend must be list or None"""
-        log.debug("Registered %s with ComponentRegistry..", name)
-        self.components[name] = obj
-        if depend != None:
-            self.depend[name] = depend
-    
-    def get(self, name):
-        """Returns a reference to the component 'name'"""
-        return self.components[name]
-        
-    def start(self):
-        """Starts all components"""
-        for component in self.components.keys():
-            self.start_component(component)
-    
-    def start_component(self, name):
-        """Starts a component"""
-        # Check to see if this component has any dependencies
-        if self.depend.has_key(name):
-            for depend in self.depend[name]:
-                self.start_component(depend)
-        # Only start if the component is stopped.
-        if self.components[name].get_state() == \
-            COMPONENT_STATE.index("Stopped"):
-            log.debug("Starting component %s..", name)
-            self.components[name].start()
-            self.components[name]._start()
-        
-    def stop(self):
-        """Stops all components"""
-        for component in self.components.keys():
-            self.stop_component(component)
-                
-    def stop_component(self, component):
-        if self.components[component].get_state() != \
-                COMPONENT_STATE.index("Stopped"):
-            log.debug("Stopping component %s..", component)
-            self.components[component].stop()
-            self.components[component]._stop()
-    
-    def pause(self):
-        """Pauses all components.  Stops calling update()"""
-        for component in self.components.keys():
-            self.pause_component(component)
-    
-    def pause_component(self, component):
-        if self.components[component].get_state() not in \
-            [COMPONENT_STATE.index("Paused"), COMPONENT_STATE.index("Stopped")]:
-            log.debug("Pausing component %s..", component)
-            self.components[component]._pause()
-
-    def resume(self):
-        """Resumes all components.  Starts calling update()"""
-        for component in self.components.keys():
-            self.resume_component(component)
-    
-    def resume_component(self, component):
-        if self.components[component].get_state() == COMPONENT_STATE.index("Paused"):
-            log.debug("Resuming component %s..", component)
-            self.components[component]._resume()            
-
     def update(self):
-        """Updates all components"""
-        for component in self.components.keys():
-            # Only update the component if it's started
-            if self.components[component].get_state() == \
-                COMPONENT_STATE.index("Started"):
-                self.components[component].update()
-         
-        return True
-    
+        pass
+
     def shutdown(self):
-        """Shuts down all components.  This should be called when the program
-        exits so that components can do any necessary clean-up."""
-        # Stop all components first
-        self.stop()
-        for component in self.components.keys():
-            log.debug("Shutting down component %s..", component)
-            try:
-                self.components[component].shutdown()
-            except Exception, e:
-                log.debug("Unable to call shutdown(): %s", e)
-                
-            
+        pass
+
+class ComponentRegistry(object):
+    """
+    The ComponentRegistry holds a list of currently registered
+    :class:`Component` objects.  It is used to manage the Components by
+    starting, stopping, pausing and shutting them down.
+    """
+    def __init__(self):
+        self.components = {}
+
+    def register(self, obj):
+        """
+        Registers a component object with the registry.  This is done
+        automatically when a Component object is instantiated.
+
+        :param obj: the Component object
+        :type obj: object
+
+        :raises ComponentAlreadyRegistered: if a component with the same name is already registered.
+
+        """
+        name = obj._component_name
+        if name in self.components:
+            raise ComponentAlreadyRegistered(
+                "Component already registered with name %s" % name)
+
+        self.components[obj._component_name] = obj
+
+    def deregister(self, name):
+        """
+        Deregisters a component from the registry.  A stop will be
+        issued to the component prior to deregistering it.
+
+        :param name: the name of the component
+        :type name: string
+
+        """
+
+        if name in self.components:
+            log.debug("Deregistering Component: %s", name)
+            d = self.stop([name])
+            def on_stop(result, name):
+                del self.components[name]
+            return d.addCallback(on_stop, name)
+        else:
+            return succeed(None)
+
+    def start(self, names=[]):
+        """
+        Starts Components that are currently in a Stopped state and their
+        dependencies.  If *names* is specified, will only start those
+        Components and their dependencies and if not it will start all
+        registered components.
+
+        :param names: a list of Components to start
+        :type names: list
+
+        :returns: a Deferred object that will fire once all Components have been sucessfully started
+        :rtype: twisted.internet.defer.Deferred
+
+        """
+        # Start all the components if names is empty
+        if not names:
+            names = self.components.keys()
+        elif isinstance(names, str):
+            names = [names]
+
+        def on_depends_started(result, name):
+            return self.components[name]._component_start()
+
+        deferreds = []
+
+        for name in names:
+            if self.components[name]._component_depend:
+                # This component has depends, so we need to start them first.
+                d = self.start(self.components[name]._component_depend)
+                d.addCallback(on_depends_started, name)
+                deferreds.append(d)
+            else:
+                deferreds.append(self.components[name]._component_start())
+
+        return DeferredList(deferreds)
+
+    def stop(self, names=[]):
+        """
+        Stops Components that are currently not in a Stopped state.  If
+        *names* is specified, then it will only stop those Components,
+        and if not it will stop all the registered Components.
+
+        :param names: a list of Components to start
+        :type names: list
+
+        :returns: a Deferred object that will fire once all Components have been sucessfully stopped
+        :rtype: twisted.internet.defer.Deferred
+
+        """
+        if not names:
+            names = self.components.keys()
+        elif isinstance(names, str):
+            names = [names]
+
+        deferreds = []
+
+        for name in names:
+            if name in self.components:
+                deferreds.append(self.components[name]._component_stop())
+
+        return DeferredList(deferreds)
+
+    def pause(self, names=[]):
+        """
+        Pauses Components that are currently in a Started state.  If
+        *names* is specified, then it will only pause those Components,
+        and if not it will pause all the registered Components.
+
+        :param names: a list of Components to pause
+        :type names: list
+
+        :returns: a Deferred object that will fire once all Components have been sucessfully paused
+        :rtype: twisted.internet.defer.Deferred
+
+        """
+        if not names:
+            names = self.components.keys()
+        elif isinstance(names, str):
+            names = [names]
+
+        deferreds = []
+
+        for name in names:
+            if self.components[name]._component_state == "Started":
+                deferreds.append(self.components[name]._component_pause())
+
+        return DeferredList(deferreds)
+
+    def resume(self, names=[]):
+        """
+        Resumes Components that are currently in a Paused state.  If
+        *names* is specified, then it will only resume those Components,
+        and if not it will resume all the registered Components.
+
+        :param names: a list of Components to resume
+        :type names: list
+
+        :returns: a Deferred object that will fire once all Components have been sucessfully resumed
+        :rtype: twisted.internet.defer.Deferred
+
+        """
+        if not names:
+            names = self.components.keys()
+        elif isinstance(names, str):
+            names = [names]
+
+        deferreds = []
+
+        for name in names:
+            if self.components[name]._component_state == "Paused":
+                deferreds.append(self.components[name]._component_resume())
+
+        return DeferredList(deferreds)
+
+    def shutdown(self):
+        """
+        Shutdowns all Components regardless of state.  This will call
+        :meth:`stop` on call the components prior to shutting down.  This should
+        be called when the program is exiting to ensure all Components have a
+        chance to properly shutdown.
+
+        :returns: a Deferred object that will fire once all Components have been sucessfully resumed
+        :rtype: twisted.internet.defer.Deferred
+
+        """
+        deferreds = []
+
+        for component in self.components.values():
+            deferreds.append(component._component_shutdown())
+
+        return DeferredList(deferreds)
+
+    def update(self):
+        """
+        Updates all Components that are in a Started state.
+
+        """
+        for component in self.components.items():
+            component.update()
+
 _ComponentRegistry = ComponentRegistry()
 
-def register(name, obj, depend=None):
-    """Registers a component with the registry"""
-    _ComponentRegistry.register(name, obj, depend)
+deregister = _ComponentRegistry.deregister
+start = _ComponentRegistry.start
+stop = _ComponentRegistry.stop
+pause = _ComponentRegistry.pause
+resume = _ComponentRegistry.resume
+update = _ComponentRegistry.update
+shutdown = _ComponentRegistry.shutdown
 
-def start(component=None):
-    """Starts all components"""
-    if component == None:
-        _ComponentRegistry.start()
-    else:
-        _ComponentRegistry.start_component(component)
+def get(name):
+    """
+    Return a reference to a component.
 
-def stop(component=None):
-    """Stops all or specified components"""
-    if component == None:
-        _ComponentRegistry.stop()
-    else:
-        _ComponentRegistry.stop_component(component)
+    :param name: the Component name to get
+    :type name: string
 
-def pause(component=None):
-    """Pauses all or specificed components"""
-    if component == None:
-        _ComponentRegistry.pause()
-    else:
-        _ComponentRegistry.pause_component(component)
+    :returns: the Component object
+    :rtype: object
 
-def resume(component=None):
-    """Resumes all or specificed components"""
-    if component == None:
-        _ComponentRegistry.resume()
-    else:
-        _ComponentRegistry.resume_component(component)
-        
-def update():
-    """Updates all components"""
-    _ComponentRegistry.update()
+    :raises KeyError: if the Component does not exist
 
-def shutdown():
-    """Shutdowns all components"""
-    _ComponentRegistry.shutdown()
-    
-def get(component):
-    """Return a reference to the component"""
-    return _ComponentRegistry.get(component)
+    """
+    return _ComponentRegistry.components[name]

deluge/config.py

@@ -1,25 +1,25 @@
 #
 # config.py
 #
-# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com>
-# 
+# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com>
+#
 # Deluge is free software.
-# 
+#
 # You may redistribute it and/or modify it under the terms of the
 # GNU General Public License, as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option)
+# Foundation; either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # deluge is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with deluge.    If not, write to:
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
+# 	Boston, MA  02110-1301, USA.
 #
 #    In addition, as a special exception, the copyright holders give
 #    permission to link the code of portions of this program with the OpenSSL
@@ -30,147 +30,470 @@
 #    but you are not obligated to do so. If you do not wish to do so, delete
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
+#
+#
 
-"""Configuration class used to access/create/modify configuration files."""
 
-import cPickle
-import os.path
+"""
+Deluge Config Module
+
+This module is used for loading and saving of configuration files.. or anything
+really.
+
+The format of the config file is two json encoded dicts:
+
+<version dict>
+<content dict>
+
+The version dict contains two keys: file and format.  The format version is
+controlled by the Config class.  It should only be changed when anything below
+it is changed directly by the Config class.  An example of this would be if we
+changed the serializer for the content to something different.
+
+The config file version is changed by the 'owner' of the config file.  This is
+to signify that there is a change in the naming of some config keys or something
+similar along those lines.
+
+The content is simply the dict to be saved and will be serialized before being
+written.
+
+Converting
+
+Since the format of the config could change, there needs to be a way to have
+the Config object convert to newer formats.  To do this, you will need to
+register conversion functions for various versions of the config file. Note that
+this can only be done for the 'config file version' and not for the 'format'
+version as this will be done internally.
+
+"""
+
+import cPickle as pickle
+import shutil
+import os
 
-import gobject
 import deluge.common
 from deluge.log import LOG as log
 
-class Config:
-    """This class is used to access configuration files."""
-    
+json = deluge.common.json
+
+def prop(func):
+    """Function decorator for defining property attributes
+
+    The decorated function is expected to return a dictionary
+    containing one or more of the following pairs:
+        fget - function for getting attribute value
+        fset - function for setting attribute value
+        fdel - function for deleting attribute
+    This can be conveniently constructed by the locals() builtin
+    function; see:
+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/205183
+    """
+    return property(doc=func.__doc__, **func())
+
+def find_json_objects(s):
+    """
+    Find json objects in a string.
+
+    :param s: the string to find json objects in
+    :type s: string
+
+    :returns: a list of tuples containing start and end locations of json objects in the string `s`
+    :rtype: [(start, end), ...]
+
+    """
+    objects = []
+    opens = 0
+    start = s.find("{")
+    offset = start
+
+    if start < 0:
+        return []
+
+    for index, c in enumerate(s[offset:]):
+        if c == "{":
+            opens += 1
+        elif c == "}":
+            opens -= 1
+            if opens == 0:
+                objects.append((start, index+offset+1))
+                start = index + offset + 1
+
+    return objects
+
+
+class Config(object):
+    """
+    This class is used to access/create/modify config files
+
+    :param filename: the name of the config file
+    :param defaults: dictionary of default values
+    :param config_dir: the path to the config directory
+
+    """
     def __init__(self, filename, defaults=None, config_dir=None):
-        log.debug("Config created with filename: %s", filename)
-        log.debug("Config defaults: %s", defaults)
-        self.config = {}
-        self.previous_config = {}
-        self.set_functions = {}
-        self._change_callback = None
-        
-        # If defaults is not None then we need to use "defaults".
-        if defaults != None:
-            self.config = defaults
+        self.__config = {}
+        self.__set_functions = {}
+        self.__change_callbacks = []
+
+        # These hold the version numbers and they will be set when loaded
+        self.__version = {
+            "format": 1,
+            "file": 1
+        }
+
+        # This will get set with a reactor.callLater whenever a config option
+        # is set.
+        self._save_timer = None
+
+        if defaults:
+            for key, value in defaults.iteritems():
+                self.set_item(key, value)
 
         # Load the config from file in the config_dir
-        if config_dir == None:
-            self.config_file = deluge.common.get_default_config_dir(filename)
+        if config_dir:
+            self.__config_file = os.path.join(config_dir, filename)
         else:
-            self.config_file = os.path.join(config_dir, filename)
-            
-        self.load(self.config_file)
-        # Save
-        self.save()
-        
-    def __del__(self):
-        self.save()
-            
-    def load(self, filename=None):
-        """Load a config file either by 'filename' or the filename set during
-        construction of this object."""
-        # Use self.config_file if filename is None
-        if filename is None:
-            filename = self.config_file
+            self.__config_file = deluge.common.get_default_config_dir(filename)
+
+        self.load()
+
+    def __contains__(self, item):
+        return item in self.__config
+
+    def __setitem__(self, key, value):
+        """
+        See
+        :meth:`set_item`
+        """
+
+        return self.set_item(key, value)
+
+    def set_item(self, key, value):
+        """
+        Sets item 'key' to 'value' in the config dictionary, but does not allow
+        changing the item's type unless it is None.  If the types do not match,
+        it will attempt to convert it to the set type before raising a ValueError.
+
+        :param key: string, item to change to change
+        :param value: the value to change item to, must be same type as what is currently in the config
+
+        :raises ValueError: raised when the type of value is not the same as\
+what is currently in the config and it could not convert the value
+
+        **Usage**
+
+        >>> config = Config("test.conf")
+        >>> config["test"] = 5
+        >>> config["test"]
+        5
+
+        """
+        if isinstance(value, basestring):
+            value = deluge.common.utf8_encoded(value)
+
+
+        if not self.__config.has_key(key):
+            self.__config[key] = value
+            log.debug("Setting '%s' to %s of %s", key, value, type(value))
+            return
+
+        if self.__config[key] == value:
+            return
+
+        # Do not allow the type to change unless it is None
+        oldtype, newtype = type(self.__config[key]), type(value)
+
+        if value is not None and oldtype != type(None) and oldtype != newtype:
+            try:
+                if oldtype == unicode:
+                    value = oldtype(value, "utf8")
+                else:
+                    value = oldtype(value)
+            except ValueError:
+                log.warning("Type '%s' invalid for '%s'", newtype, key)
+                raise
+
+        log.debug("Setting '%s' to %s of %s", key, value, type(value))
+
+        self.__config[key] = value
+        # Run the set_function for this key if any
+        from twisted.internet import reactor
         try:
-            # Un-pickle the file and update the config dictionary
-            pkl_file = open(filename, "rb")
-            filedump = cPickle.load(pkl_file)
-            self.config.update(filedump)
-            pkl_file.close()
-        except IOError:
-            log.warning("IOError: Unable to load file '%s'", filename)
-        except EOFError:
-            pkl_file.close()
-            
+            for func in self.__set_functions[key]:
+                reactor.callLater(0, func, key, value)
+        except KeyError:
+            pass
+        try:
+            def do_change_callbacks(key, value):
+                for func in self.__change_callbacks:
+                    func(key, value)
+            reactor.callLater(0, do_change_callbacks, key, value)
+        except:
+            pass
+
+        # We set the save_timer for 5 seconds if not already set
+        if not self._save_timer or not self._save_timer.active():
+            self._save_timer = reactor.callLater(5, self.save)
+
+    def __getitem__(self, key):
+        """
+        See
+        :meth:`get_item`
+        """
+        return self.get_item(key)
+
+    def get_item(self, key):
+        """
+        Gets the value of item 'key'
+
+        :param key: the item for which you want it's value
+        :return: the value of item 'key'
+
+        :raises KeyError: if 'key' is not in the config dictionary
+
+        **Usage**
+
+        >>> config = Config("test.conf", defaults={"test": 5})
+        >>> config["test"]
+        5
+
+        """
+        if isinstance(self.__config[key], str):
+            try:
+                return self.__config[key].decode("utf8")
+            except UnicodeDecodeError:
+                return self.__config[key]
+        else:
+            return self.__config[key]
+
+    def register_change_callback(self, callback):
+        """
+        Registers a callback function that will be called when a value is changed in the config dictionary
+
+        :param callback: the function, callback(key, value)
+
+        **Usage**
+
+        >>> config = Config("test.conf", defaults={"test": 5})
+        >>> def cb(key, value):
+        ...     print key, value
+        ...
+        >>> config.register_change_callback(cb)
+
+        """
+        self.__change_callbacks.append(callback)
+
+    def register_set_function(self, key, function, apply_now=True):
+        """
+        Register a function to be called when a config value changes
+
+        :param key: the item to monitor for change
+        :param function: the function to call when the value changes, f(key, value)
+        :keyword apply_now: if True, the function will be called after it's registered
+
+        **Usage**
+
+        >>> config = Config("test.conf", defaults={"test": 5})
+        >>> def cb(key, value):
+        ...     print key, value
+        ...
+        >>> config.register_set_function("test", cb, apply_now=True)
+        test 5
+
+        """
+        log.debug("Registering function for %s key..", key)
+        if key not in self.__set_functions:
+            self.__set_functions[key] = []
+
+        self.__set_functions[key].append(function)
+
+        # Run the function now if apply_now is set
+        if apply_now:
+            function(key, self.__config[key])
+        return
+
+    def apply_all(self):
+        """
+        Calls all set functions
+
+        **Usage**
+
+        >>> config = Config("test.conf", defaults={"test": 5})
+        >>> def cb(key, value):
+        ...     print key, value
+        ...
+        >>> config.register_set_function("test", cb, apply_now=False)
+        >>> config.apply_all()
+        test 5
+
+        """
+        log.debug("Calling all set functions..")
+        for key, value in self.__set_functions.iteritems():
+            for func in value:
+                func(key, self.__config[key])
+
+    def apply_set_functions(self, key):
+        """
+        Calls set functions for `:param:key`.
+
+        :param key: str, the config key
+
+        """
+        log.debug("Calling set functions for key %s..", key)
+        if key in self.__set_functions:
+            for func in self.__set_functions[key]:
+                func(key, self.__config[key])
+
+    def load(self, filename=None):
+        """
+        Load a config file
+
+        :param filename: if None, uses filename set in object initialization
+
+
+        """
+        if not filename:
+            filename = self.__config_file
+
+        try:
+            data = open(filename, "rb").read()
+        except IOError, e:
+            log.warning("Unable to open config file %s: %s", filename, e)
+            return
+
+        objects = find_json_objects(data)
+
+        if not len(objects):
+            # No json objects found, try depickling it
+            try:
+                self.__config.update(pickle.loads(data))
+            except Exception, e:
+                log.exception(e)
+                log.warning("Unable to load config file: %s", filename)
+        elif len(objects) == 1:
+            start, end = objects[0]
+            try:
+                self.__config.update(json.loads(data[start:end]))
+            except Exception, e:
+                log.exception(e)
+                log.warning("Unable to load config file: %s", filename)
+        elif len(objects) == 2:
+            try:
+                start, end = objects[0]
+                self.__version.update(json.loads(data[start:end]))
+                start, end = objects[1]
+                self.__config.update(json.loads(data[start:end]))
+            except Exception, e:
+                log.exception(e)
+                log.warning("Unable to load config file: %s", filename)
+
+        log.debug("Config %s version: %s.%s loaded: %s", filename,
+            self.__version["format"], self.__version["file"], self.__config)
+
     def save(self, filename=None):
-        """Save configuration to either 'filename' or the filename set during
-        construction of this object."""
-        # Saves the config dictionary
-        if filename is None:
-            filename = self.config_file
+        """
+        Save configuration to disk
+
+        :param filename: if None, uses filename set in object initiliazation
+        :rtype bool:
+        :return: whether or not the save succeeded.
+
+        """
+        if not filename:
+            filename = self.__config_file
         # Check to see if the current config differs from the one on disk
         # We will only write a new config file if there is a difference
         try:
-            pkl_file = open(filename, "rb")
-            filedump = cPickle.load(pkl_file)
-            pkl_file.close()
-            if filedump == self.config:
+            data = open(filename, "rb").read()
+            objects = find_json_objects(data)
+            start, end = objects[0]
+            version = json.loads(data[start:end])
+            start, end = objects[1]
+            loaded_data = json.loads(data[start:end])
+            if self.__config == loaded_data and self.__version == version:
                 # The config has not changed so lets just return
-                return
-        except (EOFError, IOError):
-            log.warning("IOError: Unable to open file: '%s'", filename)
-            
+                if self._save_timer and self._save_timer.active():
+                    self._save_timer.cancel()
+                return True
+        except (IOError, IndexError), e:
+            log.warning("Unable to open config file: %s because: %s", filename, e)
+
+        # Save the new config and make sure it's written to disk
         try:
-            pkl_file = open(filename, "wb")
-            cPickle.dump(self.config, pkl_file)
-            pkl_file.close()
-        except IOError:
-            log.warning("IOError: Unable to save file '%s'", filename)
-            
-    def set(self, key, value):
-        """Set the 'key' with 'value'."""
-	    # Sets the "key" with "value" in the config dict
-        if self.config[key] != value:
-            log.debug("Setting '%s' to %s of %s", key, value, type(value))
-            # Make a copy of the current config prior to changing it
-            self.previous_config = self.config.copy()
-            self.config[key] = value
-            # Run the set_function for this key if any
-            try:
-                gobject.idle_add(self.set_functions[key], key, value)
-            except KeyError:
-                pass
-            try:
-                gobject.idle_add(self._change_callback, key, value)
-            except:
-                pass
+            log.debug("Saving new config file %s", filename + ".new")
+            f = open(filename + ".new", "wb")
+            json.dump(self.__version, f, indent=2)
+            json.dump(self.__config, f, indent=2)
+            f.flush()
+            os.fsync(f.fileno())
+            f.close()
+        except IOError, e:
+            log.error("Error writing new config file: %s", e)
+            return False
 
-    def get(self, key):
-        """Get the value of 'key'.  If it is an invalid key then get() will
-        return None."""
-        # Attempts to get the "key" value and returns None if the key is 
-        # invalid
+        # Make a backup of the old config
         try:
-            value = self.config[key]
-            log.debug("Getting '%s' as %s of %s", key, value, type(value))
-            return value
-        except KeyError:
-            log.warning("Key does not exist, returning None")
-            return None
+            log.debug("Backing up old config file to %s~", filename)
+            shutil.move(filename, filename + "~")
+        except Exception, e:
+            log.warning("Unable to backup old config...")
 
-    def get_config(self):
-        """Returns the entire configuration as a dictionary."""
-        return self.config
-    
-    def get_previous_config(self):
-        """Returns the config prior to the last set()"""
-        return self.previous_config
-    
-    def register_change_callback(self, callback):
-        """Registers a callback that will be called when a value is changed"""
-        self._change_callback = callback
-            
-    def register_set_function(self, key, function, apply_now=True):
-        """Register a function to be run when a config value changes."""
-        log.debug("Registering function for %s key..", key)
-        self.set_functions[key] = function
-        # Run the function now if apply_now is set
-        if apply_now:
-            self.set_functions[key](key, self.config[key])
-        return
-    
-    def apply_all(self):
-        """Runs all set functions"""
-        log.debug("Running all set functions..")
-        for key in self.set_functions.keys():
-            self.set_functions[key](key, self.config[key])
-                    
-    def __getitem__(self, key):
-        return self.config[key]
+        # The new config file has been written successfully, so let's move it over
+        # the existing one.
+        try:
+            log.debug("Moving new config file %s to %s..", filename + ".new", filename)
+            shutil.move(filename + ".new", filename)
+        except Exception, e:
+            log.error("Error moving new config file: %s", e)
+            return False
+        else:
+            return True
+        finally:
+            if self._save_timer and self._save_timer.active():
+                self._save_timer.cancel()
 
-    def __setitem__(self, key, value):
-        self.set(key, value)
+    def run_converter(self, input_range, output_version, func):
+        """
+        Runs a function that will convert file versions in the `:param:input_range`
+        to the `:param:output_version`.
 
+        :param input_range: tuple, (int, int) the range of input versions this
+            function will accept
+        :param output_version: int, the version this function will return
+        :param func: func, the function that will do the conversion, it will take
+            the config dict as an argument and return the augmented dict
+
+        :raises ValueError: if the output_version is less than the input_range
+
+        """
+        if output_version in input_range or output_version <= max(input_range):
+            raise ValueError("output_version needs to be greater than input_range")
+
+        if self.__version["file"] not in input_range:
+            log.debug("File version %s is not in input_range %s, ignoring converter function..",
+                self.__version["file"], input_range)
+            return
+
+        try:
+            self.__config = func(self.__config)
+        except Exception, e:
+            log.exception(e)
+            log.error("There was an exception try to convert config file %s %s to %s",
+                self.__config_file, self.__version["file"], output_version)
+            raise e
+        else:
+            self.__version["file"] = output_version
+            self.save()
+
+    @property
+    def config_file(self):
+        return self.__config_file
+
+    @prop
+    def config():
+        """The config dictionary"""
+        def fget(self):
+            return self.__config
+        def fdel(self):
+            return self.save()
+        return locals()

deluge/configmanager.py

@@ -1,25 +1,25 @@
 #
 # configmanager.py
 #
-# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com>
-# 
+# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com>
+#
 # Deluge is free software.
-# 
+#
 # You may redistribute it and/or modify it under the terms of the
 # GNU General Public License, as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option)
+# Foundation; either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # deluge is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with deluge.    If not, write to:
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
+# 	Boston, MA  02110-1301, USA.
 #
 #    In addition, as a special exception, the copyright holders give
 #    permission to link the code of portions of this program with the OpenSSL
@@ -30,10 +30,10 @@
 #    but you are not obligated to do so. If you do not wish to do so, delete
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
+#
+#
 
-import gobject
 import os
-import os.path
 
 import deluge.common
 from deluge.log import LOG as log
@@ -43,55 +43,78 @@ class _ConfigManager:
     def __init__(self):
         log.debug("ConfigManager started..")
         self.config_files = {}
-        self.config_directory = deluge.common.get_default_config_dir()
-        # Set a 5 minute timer to call save()
-        gobject.timeout_add(300000, self.save)
+        self.__config_directory = None
+
+    @property
+    def config_directory(self):
+        if self.__config_directory is None:
+            self.__config_directory = deluge.common.get_default_config_dir()
+        return self.__config_directory
 
     def __del__(self):
         log.debug("ConfigManager stopping..")
         del self.config_files
 
     def set_config_dir(self, directory):
-        """Sets the config directory"""
-        if directory == None:
-            return
+        """
+        Sets the config directory.
+
+        :param directory: str, the directory where the config info should be
+
+        :returns bool: True if successfully changed directory, False if not
+        """
+
+        if not directory:
+            return False
+
         log.info("Setting config directory to: %s", directory)
         if not os.path.exists(directory):
             # Try to create the config folder if it doesn't exist
             try:
                 os.makedirs(directory)
             except Exception, e:
-                log.warning("Unable to make config directory: %s", e)
-                
-        self.config_directory = directory
-    
+                log.error("Unable to make config directory: %s", e)
+                return False
+        elif not os.path.isdir(directory):
+            log.error("Config directory needs to be a directory!")
+            return False
+
+        self.__config_directory = directory
+
+        # Reset the config_files so we don't get config from old config folder
+        # XXX: Probably should have it go through the config_files dict and try
+        # to reload based on the new config directory
+        self.save()
+        self.config_files = {}
+
+        return True
+
     def get_config_dir(self):
-        log.debug("get_config_dir: %s", self.config_directory)
         return self.config_directory
-            
+
     def close(self, config):
         """Closes a config file."""
         try:
             del self.config_files[config]
         except KeyError:
             pass
-            
+
     def save(self):
         """Saves all the configs to disk."""
-        for key in self.config_files.keys():
-            self.config_files[key].save()
+        for value in self.config_files.values():
+            value.save()
         # We need to return True to keep the timer active
         return True
-        
+
     def get_config(self, config_file, defaults=None):
         """Get a reference to the Config object for this filename"""
         log.debug("Getting config '%s'", config_file)
         # Create the config object if not already created
         if config_file not in self.config_files.keys():
             self.config_files[config_file] = Config(config_file, defaults, self.config_directory)
-        
+
         return self.config_files[config_file]
-        
+
 # Singleton functions
 _configmanager = _ConfigManager()
 
@@ -107,6 +130,6 @@ def get_config_dir(filename=None):
         return os.path.join(_configmanager.get_config_dir(), filename)
     else:
         return _configmanager.get_config_dir()
-        
+
 def close(config):
     return _configmanager.close(config)

deluge/core/alertmanager.py

@@ -1,25 +1,25 @@
 #
 # alertmanager.py
 #
-# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com>
-# 
+# Copyright (C) 2007-2009 Andrew Resch <andrewresch@gmail.com>
+#
 # Deluge is free software.
-# 
+#
 # You may redistribute it and/or modify it under the terms of the
 # GNU General Public License, as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option)
+# Foundation; either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # deluge is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with deluge.    If not, write to:
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
+# 	Boston, MA  02110-1301, USA.
 #
 #    In addition, as a special exception, the copyright holders give
 #    permission to link the code of portions of this program with the OpenSSL
@@ -30,80 +30,104 @@
 #    but you are not obligated to do so. If you do not wish to do so, delete
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
+#
 
-"""The AlertManager handles all the libtorrent alerts."""
+"""
 
-import gobject
+The AlertManager handles all the libtorrent alerts.
+
+This should typically only be used by the Core.  Plugins should utilize the
+`:mod:EventManager` for similar functionality.
+
+"""
+
+from twisted.internet import reactor
 
 import deluge.component as component
-import deluge.libtorrent as lt
+from deluge._libtorrent import lt
+
 from deluge.log import LOG as log
 
 class AlertManager(component.Component):
-    def __init__(self, session):
+    def __init__(self):
         log.debug("AlertManager initialized..")
-        component.Component.__init__(self, "AlertManager", interval=50)
-        self.session = session
+        component.Component.__init__(self, "AlertManager", interval=0.3)
+        self.session = component.get("Core").session
+
         self.session.set_alert_mask(
             lt.alert.category_t.error_notification |
             lt.alert.category_t.port_mapping_notification |
             lt.alert.category_t.storage_notification |
             lt.alert.category_t.tracker_notification |
             lt.alert.category_t.status_notification |
-            lt.alert.category_t.ip_block_notification)
-            
+            lt.alert.category_t.ip_block_notification |
+            lt.alert.category_t.performance_warning)
+
         # handlers is a dictionary of lists {"alert_type": [handler1,h2,..]}
         self.handlers = {}
 
+        self.delayed_calls = []
+
     def update(self):
+        self.delayed_calls = [dc for dc in self.delayed_calls if dc.active()]
         self.handle_alerts()
-        
-    def shutdown(self):
-        del self.session
-        del self.handlers
-        
+
+    def stop(self):
+        for dc in self.delayed_calls:
+            if dc.active():
+                dc.cancel()
+        self.delayed_calls = []
+
     def register_handler(self, alert_type, handler):
-        """Registers a function that will be called when 'alert_type' is pop'd
-        in handle_alerts.  The handler function should look like:
-        handler(alert)
-        Where 'alert' is the actual alert object from libtorrent
         """
-        if alert_type not in self.handlers.keys():
+        Registers a function that will be called when 'alert_type' is pop'd
+        in handle_alerts.  The handler function should look like: handler(alert)
+        Where 'alert' is the actual alert object from libtorrent.
+
+        :param alert_type: str, this is string representation of the alert name
+        :param handler: func(alert), the function to be called when the alert is raised
+        """
+        if alert_type not in self.handlers:
             # There is no entry for this alert type yet, so lets make it with an
             # empty list.
             self.handlers[alert_type] = []
-        
+
         # Append the handler to the list in the handlers dictionary
         self.handlers[alert_type].append(handler)
         log.debug("Registered handler for alert %s", alert_type)
-    
+
     def deregister_handler(self, handler):
-        """De-registers the 'handler' function from all alert types."""
+        """
+        De-registers the `:param:handler` function from all alert types.
+
+        :param handler: func, the handler function to deregister
+        """
         # Iterate through all handlers and remove 'handler' where found
-        for (key, value) in self.handlers:
+        for (key, value) in self.handlers.items():
             if handler in value:
                 # Handler is in this alert type list
                 value.remove(handler)
-                    
+
     def handle_alerts(self, wait=False):
-        """Pops all libtorrent alerts in the session queue and handles them
-        appropriately."""
+        """
+        Pops all libtorrent alerts in the session queue and handles them
+        appropriately.
+
+        :param wait: bool, if True then the handler functions will be run right
+            away and waited to return before processing the next alert
+        """
         alert = self.session.pop_alert()
+        # Loop through all alerts in the queue
         while alert is not None:
-            # Loop through all alerts in the queue
-            # Do some magic to get the alert type as a string
-            alert_type = str(type(alert)).split("'")[1].split(".")[2]
+            alert_type = type(alert).__name__
             # Display the alert message
             log.debug("%s: %s", alert_type, alert.message())
             # Call any handlers for this alert type
-            if alert_type in self.handlers.keys():
+            if alert_type in self.handlers:
                 for handler in self.handlers[alert_type]:
                     if not wait:
-                        gobject.idle_add(handler, alert)
+                        self.delayed_calls.append(reactor.callLater(0, handler, alert))
                     else:
                         handler(alert)
-                    
-            alert = self.session.pop_alert()
 
-        # Return True so that the timer continues
-        return True
+            alert = self.session.pop_alert()

deluge/core/authmanager.py

@@ -0,0 +1,146 @@
+#
+# authmanager.py
+#
+# Copyright (C) 2009 Andrew Resch <andrewresch@gmail.com>
+#
+# Deluge is free software.
+#
+# You may redistribute it and/or modify it under the terms of the
+# GNU General Public License, as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# deluge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with deluge.    If not, write to:
+# 	The Free Software Foundation, Inc.,
+# 	51 Franklin Street, Fifth Floor
+# 	Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+#
+
+import os
+import random
+import stat
+
+import deluge.component as component
+import deluge.configmanager as configmanager
+import deluge.error
+
+from deluge.log import LOG as log
+
+AUTH_LEVEL_NONE = 0
+AUTH_LEVEL_READONLY = 1
+AUTH_LEVEL_NORMAL = 5
+AUTH_LEVEL_ADMIN = 10
+
+AUTH_LEVEL_DEFAULT = AUTH_LEVEL_NORMAL
+
+class BadLoginError(deluge.error.DelugeError):
+    pass
+
+class AuthManager(component.Component):
+    def __init__(self):
+        component.Component.__init__(self, "AuthManager")
+        self.__auth = {}
+
+    def start(self):
+        self.__load_auth_file()
+
+    def stop(self):
+        self.__auth = {}
+
+    def shutdown(self):
+        pass
+
+    def authorize(self, username, password):
+        """
+        Authorizes users based on username and password
+
+        :param username: str, username
+        :param password: str, password
+        :returns: int, the auth level for this user
+        :rtype: int
+
+        :raises BadLoginError: if the username does not exist or password does not match
+
+        """
+
+        if username not in self.__auth:
+            # Let's try to re-load the file.. Maybe it's been updated
+            self.__load_auth_file()
+            if username not in self.__auth:
+                raise BadLoginError("Username does not exist")
+
+        if self.__auth[username][0] == password:
+            # Return the users auth level
+            return int(self.__auth[username][1])
+        else:
+            raise BadLoginError("Password does not match")
+
+    def __create_localclient_account(self):
+        """
+        Returns the string.
+        """
+        # We create a 'localclient' account with a random password
+        try:
+            from hashlib import sha1 as sha_hash
+        except ImportError:
+            from sha import new as sha_hash
+        return "localclient:" + sha_hash(str(random.random())).hexdigest() + ":" + str(AUTH_LEVEL_ADMIN) + "\n"
+
+    def __load_auth_file(self):
+        auth_file = configmanager.get_config_dir("auth")
+        # Check for auth file and create if necessary
+        if not os.path.exists(auth_file):
+            localclient = self.__create_localclient_account()
+            fd = open(auth_file, "w")
+            fd.write(localclient)
+            fd.flush()
+            os.fsync(fd.fileno())
+            fd.close()
+            # Change the permissions on the file so only this user can read/write it
+            os.chmod(auth_file, stat.S_IREAD | stat.S_IWRITE)
+            f = [localclient]
+        else:
+            # Load the auth file into a dictionary: {username: password, ...}
+            f = open(auth_file, "r").readlines()
+
+        for line in f:
+            line = line.strip()
+            if line.startswith("#") or not line:
+                # This line is a comment or empty
+                continue
+            try:
+                lsplit = line.split(":")
+            except Exception, e:
+                log.error("Your auth file is malformed: %s", e)
+                continue
+            if len(lsplit) == 2:
+                username, password = lsplit
+                log.warning("Your auth entry for %s contains no auth level, using AUTH_LEVEL_DEFAULT(%s)..", username, AUTH_LEVEL_DEFAULT)
+                level = AUTH_LEVEL_DEFAULT
+            elif len(lsplit) == 3:
+                username, password, level = lsplit
+            else:
+                log.error("Your auth file is malformed: Incorrect number of fields!")
+                continue
+
+            self.__auth[username.strip()] = (password.strip(), level)
+
+        if "localclient" not in self.__auth:
+            open(auth_file, "a").write(self.__create_localclient_account())

deluge/core/autoadd.py

@@ -1,25 +1,25 @@
 #
 # autoadd.py
 #
-# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com>
-# 
+# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com>
+#
 # Deluge is free software.
-# 
+#
 # You may redistribute it and/or modify it under the terms of the
 # GNU General Public License, as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option)
+# Foundation; either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # deluge is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with deluge.    If not, write to:
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
+# 	Boston, MA  02110-1301, USA.
 #
 #    In addition, as a special exception, the copyright holders give
 #    permission to link the code of portions of this program with the OpenSSL
@@ -30,10 +30,14 @@
 #    but you are not obligated to do so. If you do not wish to do so, delete
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
+#
+#
+
 
 import os
 
-import deluge.libtorrent as lt
+from deluge._libtorrent import lt
+
 import deluge.component as component
 from deluge.configmanager import ConfigManager
 from deluge.log import LOG as log
@@ -42,10 +46,10 @@ MAX_NUM_ATTEMPTS = 10
 
 class AutoAdd(component.Component):
     def __init__(self):
-        component.Component.__init__(self, "AutoAdd", depend=["TorrentManager"], interval=3000)
+        component.Component.__init__(self, "AutoAdd", depend=["TorrentManager"], interval=5)
         # Get the core config
         self.config = ConfigManager("core.conf")
-        
+
         # A list of filenames
         self.invalid_torrents = []
         # Filename:Attempts
@@ -56,25 +60,29 @@ class AutoAdd(component.Component):
             self._on_autoadd_enable, apply_now=True)
         self.config.register_set_function("autoadd_location",
             self._on_autoadd_location)
-            
+
     def update(self):
         if not self.config["autoadd_enable"]:
             # We shouldn't be updating because autoadd is not enabled
             component.pause("AutoAdd")
             return
-            
+
         # Check the auto add folder for new torrents to add
-        if not os.path.exists(self.config["autoadd_location"]):
+        if not os.path.isdir(self.config["autoadd_location"]):
             log.warning("Invalid AutoAdd folder: %s", self.config["autoadd_location"])
             component.pause("AutoAdd")
             return
-            
+
         for filename in os.listdir(self.config["autoadd_location"]):
-            if filename.split(".")[-1] == "torrent":
+            try:
                 filepath = os.path.join(self.config["autoadd_location"], filename)
+            except UnicodeDecodeError, e:
+                log.error("Unable to auto add torrent due to improper filename encoding: %s", e)
+                continue
+            if os.path.isfile(filepath) and filename.endswith(".torrent"):
                 try:
                     filedump = self.load_torrent(filepath)
-                except Exception, e:
+                except (RuntimeError, Exception), e:
                     # If the torrent is invalid, we keep track of it so that we
                     # can try again on the next pass.  This is because some
                     # torrents may not be fully saved during the pass.
@@ -85,29 +93,31 @@ class AutoAdd(component.Component):
                             os.rename(filepath, filepath + ".invalid")
                             del self.attempts[filename]
                             self.invalid_torrents.remove(filename)
-                    else:        
+                    else:
                         self.invalid_torrents.append(filename)
                         self.attempts[filename] = 1
                     continue
-                    
+
                 # The torrent looks good, so lets add it to the session
                 component.get("TorrentManager").add(filedump=filedump, filename=filename)
 
                 os.remove(filepath)
-    
+
     def load_torrent(self, filename):
         try:
             log.debug("Attempting to open %s for add.", filename)
             _file = open(filename, "rb")
             filedump = _file.read()
+            if not filedump:
+                raise RuntimeError, "Torrent is 0 bytes!"
             _file.close()
         except IOError, e:
             log.warning("Unable to open %s: %s", filename, e)
             raise e
-        
+
         # Get the info to see if any exceptions are raised
         info = lt.torrent_info(lt.bdecode(filedump))
-        
+
         return filedump
 
     def _on_autoadd_enable(self, key, value):

deluge/core/daemon.py

@@ -1,25 +1,25 @@
 #
 # daemon.py
 #
-# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com>
-# 
+# Copyright (C) 2007-2009 Andrew Resch <andrewresch@gmail.com>
+#
 # Deluge is free software.
-# 
+#
 # You may redistribute it and/or modify it under the terms of the
 # GNU General Public License, as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option)
+# Foundation; either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # deluge is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with deluge.    If not, write to:
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
+# 	Boston, MA  02110-1301, USA.
 #
 #    In addition, as a special exception, the copyright holders give
 #    permission to link the code of portions of this program with the OpenSSL
@@ -30,24 +30,182 @@
 #    but you are not obligated to do so. If you do not wish to do so, delete
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
+#
 
+import os
+import gettext
+import locale
+import pkg_resources
+from twisted.internet import reactor
+import twisted.internet.error
+
+import deluge.component as component
 import deluge.configmanager
 import deluge.common
+from deluge.core.rpcserver import RPCServer, export
 from deluge.log import LOG as log
+import deluge.error
+
+class Daemon(object):
+    def __init__(self, options=None, args=None, classic=False):
+        # Check for another running instance of the daemon
+        if os.path.isfile(deluge.configmanager.get_config_dir("deluged.pid")):
+            # Get the PID and the port of the supposedly running daemon
+            try:
+                (pid, port) = open(deluge.configmanager.get_config_dir("deluged.pid")).read().strip().split(";")
+                pid = int(pid)
+                port = int(port)
+            except ValueError:
+                pid = None
+                port = None
+
+
+            def process_running(pid):
+                if deluge.common.windows_check():
+                    import win32process
+                    return pid in win32process.EnumProcesses()
+                else:
+                    # We can just use os.kill on UNIX to test if the process is running
+                    try:
+                        os.kill(pid, 0)
+                    except OSError:
+                        return False
+                    else:
+                        return True
+
+            if pid is not None and process_running(pid):
+                # Ok, so a process is running with this PID, let's make doubly-sure
+                # it's a deluged process by trying to open a socket to it's port.
+                import socket
+                s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                try:
+                    s.connect(("127.0.0.1", port))
+                except socket.error:
+                    # Can't connect, so it must not be a deluged process..
+                    pass
+                else:
+                    # This is a deluged!
+                    s.close()
+                    raise deluge.error.DaemonRunningError("There is a deluge daemon running with this config directory!")
+
+        # Initialize gettext
+        try:
+            locale.setlocale(locale.LC_ALL, '')
+            if hasattr(locale, "bindtextdomain"):
+                locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
+            if hasattr(locale, "textdomain"):
+                locale.textdomain("deluge")
+            gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
+            gettext.textdomain("deluge")
+            gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n"))
+        except Exception, e:
+            log.error("Unable to initialize gettext/locale: %s", e)
+            import __builtin__
+            __builtin__.__dict__["_"] = lambda x: x
+
+        # Twisted catches signals to terminate, so just have it call the shutdown
+        # method.
+        reactor.addSystemEventTrigger("before", "shutdown", self._shutdown)
+
+        # Catch some Windows specific signals
+        if deluge.common.windows_check():
+            from win32api import SetConsoleCtrlHandler
+            from win32con import CTRL_CLOSE_EVENT
+            from win32con import CTRL_SHUTDOWN_EVENT
+            def win_handler(ctrl_type):
+                log.debug("ctrl_type: %s", ctrl_type)
+                if ctrl_type == CTRL_CLOSE_EVENT or ctrl_type == CTRL_SHUTDOWN_EVENT:
+                    self._shutdown()
+                    return 1
+            SetConsoleCtrlHandler(win_handler)
 
-class Daemon:
-    def __init__(self, options, args):
         version = deluge.common.get_version()
-        if deluge.common.get_revision() != "":
-            version = version + "r" + deluge.common.get_revision()   
-            
+
         log.info("Deluge daemon %s", version)
         log.debug("options: %s", options)
         log.debug("args: %s", args)
         # Set the config directory
-        deluge.configmanager.set_config_dir(options.config)
+        if options and options.config:
+            deluge.configmanager.set_config_dir(options.config)
+
+        if options and options.listen_interface:
+            listen_interface = options.listen_interface
+        else:
+            listen_interface = ""
+
+        if options and options.read_only_config_keys:
+            read_only_config_keys = options.read_only_config_keys.split(",")
+        else:
+            read_only_config_keys = []
 
         from deluge.core.core import Core
         # Start the core as a thread and join it until it's done
-        self.core = Core(options.port).run()
+        self.core = Core(listen_interface=listen_interface,
+                         read_only_config_keys=read_only_config_keys)
 
+        port = self.core.config["daemon_port"]
+        if options and options.port:
+            port = options.port
+        if options and options.ui_interface:
+            interface = options.ui_interface
+        else:
+            interface = ""
+
+        self.rpcserver = RPCServer(
+            port=port,
+            allow_remote=self.core.config["allow_remote"],
+            listen=not classic,
+            interface=interface
+        )
+
+        # Register the daemon and the core RPCs
+        self.rpcserver.register_object(self.core)
+        self.rpcserver.register_object(self)
+
+
+        # Make sure we start the PreferencesManager first
+        component.start("PreferencesManager")
+
+        if not classic:
+            # Write out a pid file all the time, we use this to see if a deluged is running
+            # We also include the running port number to do an additional test
+            open(deluge.configmanager.get_config_dir("deluged.pid"), "wb").write(
+                "%s;%s\n" % (os.getpid(), port))
+
+            component.start()
+            try:
+                reactor.run()
+            finally:
+                self._shutdown()
+
+    @export()
+    def shutdown(self, *args, **kwargs):
+        reactor.callLater(0, reactor.stop)
+
+    def _shutdown(self, *args, **kwargs):
+        if os.path.exists(deluge.configmanager.get_config_dir("deluged.pid")):
+            try:
+                os.remove(deluge.configmanager.get_config_dir("deluged.pid"))
+            except Exception, e:
+                log.exception(e)
+                log.error("Error removing deluged.pid!")
+
+        log.info("Waiting for components to shutdown..")
+        d = component.shutdown()
+        return d
+
+    @export()
+    def info(self):
+        """
+        Returns some info from the daemon.
+
+        :returns: str, the version number
+        """
+        return deluge.common.get_version()
+
+    @export()
+    def get_method_list(self):
+        """
+        Returns a list of the exported methods.
+        """
+        return self.rpcserver.get_method_list()

deluge/core/eventmanager.py

@@ -0,0 +1,84 @@
+#
+# eventmanager.py
+#
+# Copyright (C) 2009 Andrew Resch <andrewresch@gmail.com>
+#
+# Deluge is free software.
+#
+# You may redistribute it and/or modify it under the terms of the
+# GNU General Public License, as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# deluge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with deluge.    If not, write to:
+# 	The Free Software Foundation, Inc.,
+# 	51 Franklin Street, Fifth Floor
+# 	Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+#
+
+import deluge.component as component
+from deluge.log import LOG as log
+
+class EventManager(component.Component):
+    def __init__(self):
+        component.Component.__init__(self, "EventManager")
+        self.handlers = {}
+
+    def emit(self, event):
+        """
+        Emits the event to interested clients.
+
+        :param event: DelugeEvent
+        """
+        # Emit the event to the interested clients
+        component.get("RPCServer").emit_event(event)
+        # Call any handlers for the event
+        if event.name in self.handlers:
+            for handler in self.handlers[event.name]:
+                #log.debug("Running handler %s for event %s with args: %s", event.name, handler, event.args)
+                try:
+                    handler(*event.args)
+                except Exception, e:
+                    log.error("Event handler %s failed in %s with exception %s", event.name, handler, e)
+
+    def register_event_handler(self, event, handler):
+        """
+        Registers a function to be called when a `:param:event` is emitted.
+
+        :param event: str, the event name
+        :param handler: function, to be called when `:param:event` is emitted
+
+        """
+        if event not in self.handlers:
+            self.handlers[event] = []
+
+        if handler not in self.handlers[event]:
+            self.handlers[event].append(handler)
+
+    def deregister_event_handler(self, event, handler):
+        """
+        Deregisters an event handler function.
+
+        :param event: str, the event name
+        :param handler: function, currently registered to handle `:param:event`
+
+        """
+        if event in self.handlers and handler in self.handlers[event]:
+            self.handlers[event].remove(handler)

deluge/core/filtermanager.py

@@ -0,0 +1,268 @@
+#
+# core.py
+#
+# Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
+#
+# Deluge is free software.
+#
+# You may redistribute it and/or modify it under the terms of the
+# GNU General Public License, as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# deluge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with deluge.    If not, write to:
+# 	The Free Software Foundation, Inc.,
+# 	51 Franklin Street, Fifth Floor
+# 	Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+#
+
+
+import deluge.component as component
+from deluge.log import LOG as log
+
+STATE_SORT = ["All", "Downloading", "Seeding", "Active", "Paused", "Queued"]
+
+#special purpose filters:
+def filter_keywords(torrent_ids, values):
+    #cleanup.
+    keywords = ",".join([v.lower() for v in values])
+    keywords = keywords.split(",")
+
+
+    for keyword in keywords:
+        torrent_ids = filter_one_keyword(torrent_ids, keyword)
+    return torrent_ids
+
+def filter_one_keyword(torrent_ids, keyword):
+    """
+    search torrent on keyword.
+    searches title,state,tracker-status,tracker,files
+    """
+    all_torrents = component.get("TorrentManager").torrents
+    #filter:
+    found = False
+    for torrent_id in torrent_ids:
+        torrent = all_torrents[torrent_id]
+        if keyword in torrent.filename.lower():
+            yield torrent_id
+        elif keyword in torrent.state.lower():
+            yield torrent_id
+        elif torrent.trackers and keyword in torrent.trackers[0]["url"]:
+            yield torrent_id
+        elif keyword in torrent_id:
+            yield torrent_id
+        #i want to find broken torrents (search on "error", or "unregistered")
+        elif keyword in torrent.tracker_status.lower():
+            yield torrent_id
+        else:
+            for t_file in torrent.get_files():
+                if keyword in t_file["path"].lower():
+                    yield torrent_id
+                    break
+
+def tracker_error_filter(torrent_ids, values):
+    filtered_torrent_ids = []
+    tm = component.get("TorrentManager")
+
+    # If this is a tracker_host, then we need to filter on it
+    if values[0] != "Error":
+        for torrent_id in torrent_ids:
+            if values[0] == tm[torrent_id].get_status(["tracker_host"])["tracker_host"]:
+                filtered_torrent_ids.append(torrent_id)
+        return filtered_torrent_ids
+
+    # Check all the torrent's tracker_status for 'Error:' and only return torrent_ids
+    # that have this substring in their tracker_status
+    for torrent_id in torrent_ids:
+        if _("Error") + ":" in tm[torrent_id].get_status(["tracker_status"])["tracker_status"]:
+            filtered_torrent_ids.append(torrent_id)
+
+    return filtered_torrent_ids
+
+class FilterManager(component.Component):
+    """FilterManager
+
+    """
+    def __init__(self, core):
+        component.Component.__init__(self, "FilterManager")
+        log.debug("FilterManager init..")
+        self.core = core
+        self.torrents = core.torrentmanager
+        self.registered_filters = {}
+        self.register_filter("keyword", filter_keywords)
+        self.tree_fields = {}
+
+        self.register_tree_field("state", self._init_state_tree)
+        def _init_tracker_tree():
+            return {"Error": 0}
+        self.register_tree_field("tracker_host", _init_tracker_tree)
+
+        self.register_filter("tracker_host", tracker_error_filter)
+
+    def filter_torrent_ids(self, filter_dict):
+        """
+        returns a list of torrent_id's matching filter_dict.
+        core filter method
+        """
+        if not filter_dict:
+            return self.torrents.get_torrent_list()
+
+        #sanitize input: filter-value must be a list of strings
+        for key, value in filter_dict.items():
+            if isinstance(value, basestring):
+                filter_dict[key] = [value]
+
+        if "id" in filter_dict: #optimized filter for id:
+            torrent_ids = list(filter_dict["id"])
+            del filter_dict["id"]
+        else:
+            torrent_ids = self.torrents.get_torrent_list()
+
+        if not filter_dict: #return if there's  nothing more to filter
+            return torrent_ids
+
+        #special purpose: state=Active.
+        if "state" in filter_dict:
+            # We need to make sure this is a list for the logic below
+            filter_dict["state"] = list(filter_dict["state"])
+
+        if "state" in filter_dict and "Active" in filter_dict["state"]:
+            filter_dict["state"].remove("Active")
+            if not filter_dict["state"]:
+                del filter_dict["state"]
+            torrent_ids = self.filter_state_active(torrent_ids)
+
+        if not filter_dict: #return if there's  nothing more to filter
+            return torrent_ids
+
+        #Registered filters:
+        for field, values in filter_dict.items():
+            if field in self.registered_filters:
+                # a set filters out the doubles.
+                torrent_ids = list(set(self.registered_filters[field](torrent_ids, values)))
+                del filter_dict[field]
+
+
+        if not filter_dict: #return if there's  nothing more to filter
+            return torrent_ids
+
+        #leftover filter arguments:
+        #default filter on status fields.
+        status_func = self.core.get_torrent_status #premature optimalisation..
+        for torrent_id in list(torrent_ids):
+            status = status_func(torrent_id, filter_dict.keys()) #status={key:value}
+            for field, values in filter_dict.iteritems():
+                if field in status and status[field] in values:
+                    continue
+                elif torrent_id in torrent_ids:
+                    torrent_ids.remove(torrent_id)
+
+        return torrent_ids
+
+    def get_filter_tree(self, show_zero_hits=True, hide_cat=None):
+        """
+        returns {field: [(value,count)] }
+        for use in sidebar.
+        """
+        torrent_ids = self.torrents.get_torrent_list()
+        status_func = self.core.get_torrent_status #premature optimalisation..
+        tree_keys = list(self.tree_fields.keys())
+        if hide_cat:
+            for cat in hide_cat:
+                tree_keys.remove(cat)
+
+        items = dict( (field, self.tree_fields[field]()) for field in tree_keys)
+
+        #count status fields.
+        for torrent_id in list(torrent_ids):
+            status = status_func(torrent_id, tree_keys) #status={key:value}
+            for field in tree_keys:
+                value = status[field]
+                items[field][value] = items[field].get(value, 0) + 1
+
+        if "tracker_host" in items:
+            items["tracker_host"]["All"] = len(torrent_ids)
+            items["tracker_host"]["Error"] = len(tracker_error_filter(torrent_ids, ("Error",)))
+
+        if "state" in tree_keys and not show_zero_hits:
+            self._hide_state_items(items["state"])
+
+        #return a dict of tuples:
+        sorted_items = {}
+        for field in tree_keys:
+            sorted_items[field] = sorted(items[field].iteritems())
+
+        if "state" in tree_keys:
+            sorted_items["state"].sort(self._sort_state_items)
+
+        return sorted_items
+
+    def _init_state_tree(self):
+        return {"All":len(self.torrents.get_torrent_list()),
+            "Downloading":0,
+            "Seeding":0,
+            "Paused":0,
+            "Checking":0,
+            "Queued":0,
+            "Error":0,
+            "Active":len(self.filter_state_active(self.torrents.get_torrent_list()))
+            }
+
+    def register_filter(self, id, filter_func, filter_value = None):
+        self.registered_filters[id] = filter_func
+
+    def deregister_filter(self, id):
+        del self.registered_filters[id]
+
+    def register_tree_field(self, field, init_func = lambda : {}):
+        self.tree_fields[field] = init_func
+
+    def deregister_tree_field(self, field):
+        if field in self.tree_fields:
+            del self.tree_fields[field]
+
+    def filter_state_active(self, torrent_ids):
+        get_status = self.core.get_torrent_status
+        for torrent_id in list(torrent_ids):
+            status = get_status(torrent_id, ["download_payload_rate", "upload_payload_rate"])
+            if status["download_payload_rate"] or status["upload_payload_rate"]:
+                pass #ok
+            else:
+                torrent_ids.remove(torrent_id)
+        return torrent_ids
+
+    def _hide_state_items(self, state_items):
+        "for hide(show)-zero hits"
+        for (value, count)  in state_items.items():
+            if value != "All" and count == 0:
+                del state_items[value]
+
+    def _sort_state_items(self, x, y):
+        ""
+        if x[0] in STATE_SORT:
+            ix = STATE_SORT.index(x[0])
+        else:
+            ix = 99
+        if y[0] in STATE_SORT:
+            iy = STATE_SORT.index(y[0])
+        else:
+            iy = 99
+
+        return ix - iy

deluge/core/oldstateupgrader.py

@@ -0,0 +1,141 @@
+#
+# oldstateupgrader.py
+#
+# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com>
+#
+# Deluge is free software.
+#
+# You may redistribute it and/or modify it under the terms of the
+# GNU General Public License, as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# deluge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with deluge.    If not, write to:
+# 	The Free Software Foundation, Inc.,
+# 	51 Franklin Street, Fifth Floor
+# 	Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+#
+
+
+import os
+import os.path
+import pickle
+import cPickle
+import shutil
+
+from deluge._libtorrent import lt
+
+from deluge.configmanager import ConfigManager, get_config_dir
+import deluge.core.torrentmanager
+from deluge.log import LOG as log
+
+#start : http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/286203
+def makeFakeClass(module, name):
+    class FakeThing(object):
+        pass
+    FakeThing.__name__ = name
+    FakeThing.__module__ = '(fake)' + module
+    return FakeThing
+
+class PickleUpgrader(pickle.Unpickler):
+    def find_class(self, module, cname):
+        # Pickle tries to load a couple things like copy_reg and
+        # __builtin__.object even though a pickle file doesn't
+        # explicitly reference them (afaict): allow them to be loaded
+        # normally.
+        if module in ('copy_reg', '__builtin__'):
+            thing = pickle.Unpickler.find_class(self, module, cname)
+            return thing
+        return makeFakeClass(module, cname)
+# end: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/286203
+
+class OldStateUpgrader:
+    def __init__(self):
+        self.config = ConfigManager("core.conf")
+        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
+            self.upgrade05()
+
+    def upgrade05(self):
+        try:
+            state = PickleUpgrader(open(self.state05_location, "rb")).load()
+        except Exception, e:
+            log.debug("Unable to open 0.5 state file: %s", e)
+            return
+
+        # Check to see if we can upgrade this file
+        if type(state).__name__ == 'list':
+            log.warning("0.5 state file is too old to upgrade")
+            return
+
+        new_state = deluge.core.torrentmanager.TorrentManagerState()
+        for ti, uid in state.torrents.items():
+            torrent_path = os.path.join(get_config_dir(), "torrentfiles", ti.filename)
+            try:
+                torrent_info = None
+                log.debug("Attempting to create torrent_info from %s", torrent_path)
+                _file = open(torrent_path, "rb")
+                torrent_info = lt.torrent_info(lt.bdecode(_file.read()))
+                _file.close()
+            except (IOError, RuntimeError), e:
+                log.warning("Unable to open %s: %s", torrent_path, e)
+
+            # Copy the torrent file to the new location
+            import shutil
+            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
+            if not hasattr(ti, "priorities"):
+                ti.priorities = [1] * torrent_info.num_files()
+
+            # Create the new TorrentState object
+            new_torrent = deluge.core.torrentmanager.TorrentState(
+                torrent_id=str(torrent_info.info_hash()),
+                filename=ti.filename,
+                save_path=ti.save_dir,
+                compact=ti.compact,
+                paused=ti.user_paused,
+                total_uploaded=ti.uploaded_memory,
+                max_upload_speed=ti.upload_rate_limit,
+                max_download_speed=ti.download_rate_limit,
+                file_priorities=ti.priorities,
+                queue=state.queue.index(ti)
+            )
+            # Append the object to the state list
+            new_state.torrents.append(new_torrent)
+
+        # Now we need to write out the new state file
+        try:
+            log.debug("Saving torrent state file.")
+            state_file = open(
+                os.path.join(get_config_dir(), "state", "torrents.state"), "wb")
+            cPickle.dump(new_state, state_file)
+            state_file.close()
+        except IOError, e:
+            log.warning("Unable to save state file: %s", e)
+            return
+
+        # Rename the persistent.state file
+        try:
+            os.rename(self.state05_location, self.state05_location + ".old")
+        except Exception, e:
+            log.debug("Unable to rename old persistent.state file! %s", e)

deluge/core/pluginmanager.py

@@ -1,25 +1,25 @@
 #
 # pluginmanager.py
 #
-# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com>
-# 
+# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com>
+#
 # Deluge is free software.
-# 
+#
 # You may redistribute it and/or modify it under the terms of the
 # GNU General Public License, as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option)
+# Foundation; either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # deluge is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with deluge.    If not, write to:
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
+# 	Boston, MA  02110-1301, USA.
 #
 #    In addition, as a special exception, the copyright holders give
 #    permission to link the code of portions of this program with the OpenSSL
@@ -30,30 +30,28 @@
 #    but you are not obligated to do so. If you do not wish to do so, delete
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
+#
+#
+
 
 """PluginManager for Core"""
 
-import gobject
+from twisted.internet import reactor
+from twisted.internet.task import LoopingCall
 
+from deluge.event import PluginEnabledEvent, PluginDisabledEvent
 import deluge.pluginmanagerbase
 import deluge.component as component
 from deluge.log import LOG as log
 
-class PluginManager(deluge.pluginmanagerbase.PluginManagerBase, 
+class PluginManager(deluge.pluginmanagerbase.PluginManagerBase,
     component.Component):
     """PluginManager handles the loading of plugins and provides plugins with
     functions to access parts of the core."""
-    
+
     def __init__(self, core):
-        component.Component.__init__(self, "PluginManager")
-        self.core = core
-        # Set up the hooks dictionary
-        self.hooks = {
-            "post_torrent_add": [],
-            "post_torrent_remove": [],
-            "post_session_load": []
-        }
-        
+        component.Component.__init__(self, "CorePluginManager")
+
         self.status_fields = {}
 
         # Call the PluginManagerBase constructor
@@ -63,37 +61,52 @@ class PluginManager(deluge.pluginmanagerbase.PluginManagerBase,
     def start(self):
         # Enable plugins that are enabled in the config
         self.enable_plugins()
-                            
-        # Set update timer to call update() in plugins every second
-        self.update_timer = gobject.timeout_add(1000, self.update_plugins)
 
     def stop(self):
         # Disable all enabled plugins
-        self.disable_plugins()      
-        # Stop the update timer
-        gobject.source_remove(self.update_timer)
-        
+        self.disable_plugins()
+
     def shutdown(self):
         self.stop()
-        
+
     def update_plugins(self):
         for plugin in self.plugins.keys():
-            try:
-                self.plugins[plugin].update()
-            except AttributeError:
-                # We don't care if this doesn't work
-                pass
+            if hasattr(self.plugins[plugin], "update"):
+                try:
+                    self.plugins[plugin].update()
+                except Exception, e:
+                    log.exception(e)
+
+    def enable_plugin(self, name):
+        if name not in self.plugins:
+            super(PluginManager, self).enable_plugin(name)
+            if name in self.plugins:
+                component.get("EventManager").emit(PluginEnabledEvent(name))
+
+    def disable_plugin(self, name):
+        if name in self.plugins:
+            super(PluginManager, self).disable_plugin(name)
+            if name not in self.plugins:
+                component.get("EventManager").emit(PluginDisabledEvent(name))
+
+    def get_status(self, torrent_id, fields):
+        """Return the value of status fields for the selected torrent_id."""
+        status = {}
+        if len(fields) == 0:
+            fields = self.status_fields.keys()
+        for field in fields:
+            try:
+                status[field] = self.status_fields[field](torrent_id)
+            except KeyError:
+                pass
+        return status
 
-    def get_core(self):
-        """Returns a reference to the core"""
-        return self.core
-        
     def register_status_field(self, field, function):
         """Register a new status field.  This can be used in the same way the
         client requests other status information from core."""
         log.debug("Registering status field %s with PluginManager", field)
         self.status_fields[field] = function
-    
+
     def deregister_status_field(self, field):
         """Deregisters a status field"""
         log.debug("Deregistering status field %s with PluginManager", field)
@@ -101,62 +114,3 @@ class PluginManager(deluge.pluginmanagerbase.PluginManagerBase,
             del self.status_fields[field]
         except:
             log.warning("Unable to deregister status field %s", field)
-            
-    def get_status(self, torrent_id, fields):
-        """Return the value of status fields for the selected torrent_id."""
-        status = {}
-        for field in fields:
-            try:
-                status[field] = self.status_fields[field](torrent_id)
-            except KeyError:
-                log.warning("Status field %s is not registered with the\
-                    PluginManager.", field)
-        return status
-        
-    def register_hook(self, hook, function):
-        """Register a hook function with the plugin manager"""
-        try:
-            self.hooks[hook].append(function)
-        except KeyError:
-            log.warning("Plugin attempting to register invalid hook.")
-    
-    def deregister_hook(self, hook, function):
-        """Deregisters a hook function"""
-        try:
-            self.hooks[hook].remove(function)
-        except:
-            log.warning("Unable to deregister hook %s", hook)
-            
-    def run_post_torrent_add(self, torrent_id):
-        """This hook is run after a torrent has been added to the session."""
-        log.debug("run_post_torrent_add")
-        for function in self.hooks["post_torrent_add"]:
-            function(torrent_id)
-            
-    def run_post_torrent_remove(self, torrent_id):
-        """This hook is run after a torrent has been removed from the session.
-        """
-        log.debug("run_post_torrent_remove")
-        for function in self.hooks["post_torrent_remove"]:
-            function(torrent_id)
-
-    def run_post_session_load(self):
-        """This hook is run after all the torrents have been loaded into the
-        session from the saved state.  It is called prior to resuming the
-        torrents and they all will have a 'Paused' state."""
-        log.debug("run_post_session_load")
-        for function in self.hooks["post_session_load"]:
-            function()
-        
-    def get_torrent_list(self):
-        """Returns a list of torrent_id's in the current session."""
-        return component.get("TorrentManager").get_torrent_list()
-    
-    def block_ip_range(self, range):
-        """Blocks the ip range in the core"""
-        return self.core.export_block_ip_range(range)
-    
-    def reset_ip_filter(self):
-        """Resets the ip filter"""
-        return self.core.export_reset_ip_filter()
-        

deluge/core/preferencesmanager.py

@@ -0,0 +1,511 @@
+#
+# preferencesmanager.py
+#
+# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com>
+#
+# Deluge is free software.
+#
+# You may redistribute it and/or modify it under the terms of the
+# GNU General Public License, as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# deluge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with deluge.    If not, write to:
+# 	The Free Software Foundation, Inc.,
+# 	51 Franklin Street, Fifth Floor
+# 	Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+#
+
+
+import os.path
+import threading
+import pkg_resources
+from twisted.internet import reactor
+from twisted.internet.task import LoopingCall
+
+from deluge._libtorrent import lt
+
+from deluge.event import *
+import deluge.configmanager
+import deluge.common
+import deluge.component as component
+from deluge.log import LOG as log
+
+DEFAULT_PREFS = {
+    "send_info": False,
+    "info_sent": 0.0,
+    "daemon_port": 58846,
+    "allow_remote": False,
+    "compact_allocation": False,
+    "download_location": deluge.common.get_default_download_dir(),
+    "listen_ports": [6881, 6891],
+    "listen_interface": "",
+    "copy_torrent_file": False,
+    "del_copy_torrent_file": False,
+    "torrentfiles_location": deluge.common.get_default_download_dir(),
+    "plugins_location": os.path.join(deluge.configmanager.get_config_dir(), "plugins"),
+    "prioritize_first_last_pieces": False,
+    "random_port": True,
+    "dht": True,
+    "upnp": True,
+    "natpmp": True,
+    "utpex": True,
+    "lsd": True,
+    "enc_in_policy": 1,
+    "enc_out_policy": 1,
+    "enc_level": 2,
+    "enc_prefer_rc4": True,
+    "max_connections_global": 200,
+    "max_upload_speed": -1.0,
+    "max_download_speed": -1.0,
+    "max_upload_slots_global": 4,
+    "max_half_open_connections": (lambda: deluge.common.windows_check() and
+        (lambda: deluge.common.vista_check() and 4 or 8)() or 50)(),
+    "max_connections_per_second": 20,
+    "ignore_limits_on_local_network": True,
+    "max_connections_per_torrent": -1,
+    "max_upload_slots_per_torrent": -1,
+    "max_upload_speed_per_torrent": -1,
+    "max_download_speed_per_torrent": -1,
+    "enabled_plugins": [],
+    "autoadd_location": deluge.common.get_default_download_dir(),
+    "autoadd_enable": False,
+    "add_paused": False,
+    "max_active_seeding": 5,
+    "max_active_downloading": 3,
+    "max_active_limit": 8,
+    "dont_count_slow_torrents": False,
+    "queue_new_to_top": False,
+    "stop_seed_at_ratio": False,
+    "remove_seed_at_ratio": False,
+    "stop_seed_ratio": 2.00,
+    "share_ratio_limit": 2.00,
+    "seed_time_ratio_limit": 7.00,
+    "seed_time_limit": 180,
+    "auto_managed": True,
+    "move_completed": False,
+    "move_completed_path": deluge.common.get_default_download_dir(),
+    "new_release_check": True,
+    "proxies": {
+        "peer": {
+            "type": 0,
+            "hostname": "",
+            "username": "",
+            "password": "",
+            "port": 8080
+        },
+        "web_seed": {
+            "type": 0,
+            "hostname": "",
+            "username": "",
+            "password": "",
+            "port": 8080
+        },
+        "tracker": {
+            "type": 0,
+            "hostname": "",
+            "username": "",
+            "password": "",
+            "port": 8080
+        },
+        "dht": {
+            "type": 0,
+            "hostname": "",
+            "username": "",
+            "password": "",
+            "port": 8080
+        },
+
+    },
+    "outgoing_ports": [0, 0],
+    "random_outgoing_ports": True,
+    "peer_tos": "0x00",
+    "rate_limit_ip_overhead": True,
+    "geoip_db_location": "/usr/share/GeoIP/GeoIP.dat",
+    "cache_size": 512,
+    "cache_expiry": 60
+}
+
+class PreferencesManager(component.Component):
+    def __init__(self):
+        component.Component.__init__(self, "PreferencesManager")
+
+        self.config = deluge.configmanager.ConfigManager("core.conf", DEFAULT_PREFS)
+
+    def start(self):
+        self.core = component.get("Core")
+        self.session = component.get("Core").session
+
+        # Register set functions in the Config
+        self.config.register_set_function("torrentfiles_location",
+            self._on_set_torrentfiles_location)
+        self.config.register_set_function("listen_ports",
+            self._on_set_listen_ports)
+        self.config.register_set_function("listen_interface",
+            self._on_set_listen_interface)
+        self.config.register_set_function("random_port",
+            self._on_set_random_port)
+        self.config.register_set_function("outgoing_ports",
+            self._on_set_outgoing_ports)
+        self.config.register_set_function("random_outgoing_ports",
+            self._on_set_random_outgoing_ports)
+        self.config.register_set_function("peer_tos",
+            self._on_set_peer_tos)
+        self.config.register_set_function("dht", self._on_set_dht)
+        self.config.register_set_function("upnp", self._on_set_upnp)
+        self.config.register_set_function("natpmp", self._on_set_natpmp)
+        self.config.register_set_function("utpex", self._on_set_utpex)
+        self.config.register_set_function("lsd", self._on_set_lsd)
+        self.config.register_set_function("enc_in_policy",
+            self._on_set_encryption)
+        self.config.register_set_function("enc_out_policy",
+            self._on_set_encryption)
+        self.config.register_set_function("enc_level",
+            self._on_set_encryption)
+        self.config.register_set_function("enc_prefer_rc4",
+            self._on_set_encryption)
+        self.config.register_set_function("max_connections_global",
+            self._on_set_max_connections_global)
+        self.config.register_set_function("max_upload_speed",
+            self._on_set_max_upload_speed)
+        self.config.register_set_function("max_download_speed",
+            self._on_set_max_download_speed)
+        self.config.register_set_function("max_upload_slots_global",
+            self._on_set_max_upload_slots_global)
+        self.config.register_set_function("max_half_open_connections",
+            self._on_set_max_half_open_connections)
+        self.config.register_set_function("max_connections_per_second",
+            self._on_set_max_connections_per_second)
+        self.config.register_set_function("ignore_limits_on_local_network",
+            self._on_ignore_limits_on_local_network)
+        self.config.register_set_function("share_ratio_limit",
+            self._on_set_share_ratio_limit)
+        self.config.register_set_function("seed_time_ratio_limit",
+            self._on_set_seed_time_ratio_limit)
+        self.config.register_set_function("seed_time_limit",
+            self._on_set_seed_time_limit)
+        self.config.register_set_function("max_active_downloading",
+            self._on_set_max_active_downloading)
+        self.config.register_set_function("max_active_seeding",
+            self._on_set_max_active_seeding)
+        self.config.register_set_function("max_active_limit",
+            self._on_set_max_active_limit)
+        self.config.register_set_function("dont_count_slow_torrents",
+            self._on_set_dont_count_slow_torrents)
+        self.config.register_set_function("send_info",
+            self._on_send_info)
+        self.config.register_set_function("proxies",
+            self._on_set_proxies)
+        self.new_release_timer = None
+        self.config.register_set_function("new_release_check",
+            self._on_new_release_check)
+        self.config.register_set_function("rate_limit_ip_overhead",
+            self._on_rate_limit_ip_overhead)
+        self.config.register_set_function("geoip_db_location",
+            self._on_geoip_db_location)
+        self.config.register_set_function("cache_size",
+            self._on_cache_size)
+        self.config.register_set_function("cache_expiry",
+            self._on_cache_expiry)
+
+        self.config.register_change_callback(self._on_config_value_change)
+
+    def stop(self):
+        if self.new_release_timer and self.new_release_timer.running:
+            self.new_release_timer.stop()
+
+    # Config set functions
+    def session_set_setting(self, key, value):
+        settings = self.session.settings()
+        setattr(settings, key, value)
+        self.session.set_settings(settings)
+
+    def _on_config_value_change(self, key, value):
+        component.get("EventManager").emit(ConfigValueChangedEvent(key, value))
+
+    def _on_set_torrentfiles_location(self, key, value):
+        if self.config["copy_torrent_file"]:
+            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
+        if self.config["random_port"] is not True:
+            log.debug("listen port range set to %s-%s", value[0], value[1])
+            self.session.listen_on(value[0], value[1], str(self.config["listen_interface"]).strip())
+
+    def _on_set_listen_interface(self, key, value):
+        # Call the random_port callback since it'll do what we need
+        self._on_set_random_port("random_port", self.config["random_port"])
+
+    def _on_set_random_port(self, key, value):
+        log.debug("random port value set to %s", value)
+        # We need to check if the value has been changed to true and false
+        # and then handle accordingly.
+        if value:
+            import random
+            listen_ports = []
+            randrange = lambda: random.randrange(49152, 65525)
+            listen_ports.append(randrange())
+            listen_ports.append(listen_ports[0]+10)
+        else:
+            listen_ports = self.config["listen_ports"]
+
+        # Set the listen ports
+        log.debug("listen port range set to %s-%s", listen_ports[0],
+            listen_ports[1])
+        self.session.listen_on(listen_ports[0], listen_ports[1], str(self.config["listen_interface"]).strip())
+
+    def _on_set_outgoing_ports(self, key, value):
+        if not self.config["random_outgoing_ports"]:
+            log.debug("outgoing port range set to %s-%s", value[0], value[1])
+            self.session_set_setting("outgoing_ports", (value[0], value[1]))
+
+    def _on_set_random_outgoing_ports(self, key, value):
+        if value:
+            self.session.outgoing_ports(0, 0)
+
+    def _on_set_peer_tos(self, key, value):
+        log.debug("setting peer_tos to: %s", value)
+        try:
+            self.session_set_setting("peer_tos", chr(int(value, 16)))
+        except ValueError, e:
+            log.debug("Invalid tos byte: %s", e)
+            return
+
+    def _on_set_dht(self, key, value):
+        log.debug("dht value set to %s", value)
+        state_file = deluge.configmanager.get_config_dir("dht.state")
+        if value:
+            state = None
+            try:
+                state = lt.bdecode(open(state_file, "rb").read())
+            except Exception, e:
+                log.warning("Unable to read DHT state file: %s", e)
+
+            try:
+                self.session.start_dht(state)
+            except Exception, e:
+                log.warning("Restoring old DHT state failed: %s", e)
+                self.session.start_dht(None)
+            self.session.add_dht_router("router.bittorrent.com", 6881)
+            self.session.add_dht_router("router.utorrent.com", 6881)
+            self.session.add_dht_router("router.bitcomet.com", 6881)
+        else:
+            self.core.save_dht_state()
+            self.session.stop_dht()
+
+    def _on_set_upnp(self, key, value):
+        log.debug("upnp value set to %s", value)
+        if value:
+            self.session.start_upnp()
+        else:
+            self.session.stop_upnp()
+
+    def _on_set_natpmp(self, key, value):
+        log.debug("natpmp value set to %s", value)
+        if value:
+            self.session.start_natpmp()
+        else:
+            self.session.stop_natpmp()
+
+    def _on_set_lsd(self, key, value):
+        log.debug("lsd value set to %s", value)
+        if value:
+            self.session.start_lsd()
+        else:
+            self.session.stop_lsd()
+
+    def _on_set_utpex(self, key, value):
+        log.debug("utpex value set to %s", value)
+        # In libtorrent versions below 0.16.7.0 disable extension bindings due to GIL issue.
+        # https://code.google.com/p/libtorrent/issues/detail?id=369
+        if value and deluge.common.VersionSplit(lt.version) >= deluge.common.VersionSplit("0.16.7.0"):
+            self.session.add_extension("ut_pex")
+
+    def _on_set_encryption(self, key, value):
+        log.debug("encryption value %s set to %s..", key, value)
+        pe_enc_level = {0: lt.enc_level.plaintext, 1: lt.enc_level.rc4, 2: lt.enc_level.both}
+        pe_settings = lt.pe_settings()
+        pe_settings.out_enc_policy = \
+            lt.enc_policy(self.config["enc_out_policy"])
+        pe_settings.in_enc_policy = lt.enc_policy(self.config["enc_in_policy"])
+        pe_settings.allowed_enc_level = lt.enc_level(pe_enc_level[self.config["enc_level"]])
+        pe_settings.prefer_rc4 = self.config["enc_prefer_rc4"]
+        self.session.set_pe_settings(pe_settings)
+        set = self.session.get_pe_settings()
+        log.debug("encryption settings:\n\t\t\tout_policy: %s\n\t\t\
+        in_policy: %s\n\t\t\tlevel: %s\n\t\t\tprefer_rc4: %s",
+            set.out_enc_policy,
+            set.in_enc_policy,
+            set.allowed_enc_level,
+            set.prefer_rc4)
+
+    def _on_set_max_connections_global(self, key, value):
+        log.debug("max_connections_global set to %s..", value)
+        self.session.set_max_connections(value)
+
+    def _on_set_max_upload_speed(self, key, value):
+        log.debug("max_upload_speed set to %s..", value)
+        # We need to convert Kb/s to B/s
+        if value < 0:
+            v = -1
+        else:
+            v = int(value * 1024)
+
+        self.session.set_upload_rate_limit(v)
+
+    def _on_set_max_download_speed(self, key, value):
+        log.debug("max_download_speed set to %s..", value)
+        # We need to convert Kb/s to B/s
+        if value < 0:
+            v = -1
+        else:
+            v = int(value * 1024)
+        self.session.set_download_rate_limit(v)
+
+    def _on_set_max_upload_slots_global(self, key, value):
+        log.debug("max_upload_slots_global set to %s..", value)
+        self.session.set_max_uploads(value)
+
+    def _on_set_max_half_open_connections(self, key, value):
+        self.session.set_max_half_open_connections(value)
+
+    def _on_set_max_connections_per_second(self, key, value):
+        self.session_set_setting("connection_speed", value)
+
+    def _on_ignore_limits_on_local_network(self, key, value):
+        self.session_set_setting("ignore_limits_on_local_network", value)
+
+    def _on_set_share_ratio_limit(self, key, value):
+        log.debug("%s set to %s..", key, value)
+        self.session_set_setting("share_ratio_limit", value)
+
+    def _on_set_seed_time_ratio_limit(self, key, value):
+        log.debug("%s set to %s..", key, value)
+        self.session_set_setting("seed_time_ratio_limit", value)
+
+    def _on_set_seed_time_limit(self, key, value):
+        log.debug("%s set to %s..", key, value)
+        # This value is stored in minutes in deluge, but libtorrent wants seconds
+        self.session_set_setting("seed_time_limit", int(value * 60))
+
+    def _on_set_max_active_downloading(self, key, value):
+        log.debug("%s set to %s..", key, value)
+        self.session_set_setting("active_downloads", value)
+
+    def _on_set_max_active_seeding(self, key, value):
+        log.debug("%s set to %s..", key, value)
+        self.session_set_setting("active_seeds", value)
+
+    def _on_set_max_active_limit(self, key, value):
+        log.debug("%s set to %s..", key, value)
+        self.session_set_setting("active_limit", value)
+
+    def _on_set_dont_count_slow_torrents(self, key, value):
+        log.debug("%s set to %s..", key, value)
+        self.session_set_setting("dont_count_slow_torrents", value)
+
+    def _on_send_info(self, key, value):
+        log.debug("Sending anonymous stats..")
+        """sends anonymous stats home"""
+        class Send_Info_Thread(threading.Thread):
+            def __init__(self, config):
+                self.config = config
+                threading.Thread.__init__(self)
+            def run(self):
+                import time
+                now = time.time()
+                # check if we've done this within the last week or never
+                if (now - self.config["info_sent"]) >= (60 * 60 * 24 * 7):
+                    import deluge.common
+                    from urllib import quote_plus
+                    from urllib2 import urlopen
+                    import platform
+                    try:
+                        url = "http://deluge-torrent.org/stats_get.php?processor=" + \
+                            platform.machine() + "&python=" + platform.python_version() \
+                            + "&deluge=" + deluge.common.get_version() \
+                            + "&os=" + platform.system() \
+                            + "&plugins=" + quote_plus(":".join(self.config["enabled_plugins"]))
+                        urlopen(url)
+                    except IOError, e:
+                        log.debug("Network error while trying to send info: %s", e)
+                    else:
+                        self.config["info_sent"] = now
+        if value:
+            Send_Info_Thread(self.config).start()
+
+    def _on_new_release_check(self, key, value):
+        if value:
+            log.debug("Checking for new release..")
+            threading.Thread(target=self.core.get_new_release).start()
+            if self.new_release_timer and self.new_release_timer.running:
+                self.new_release_timer.stop()
+            # Set a timer to check for a new release every 3 days
+            self.new_release_timer = LoopingCall(
+                self._on_new_release_check, "new_release_check", True)
+            self.new_release_timer.start(72 * 60 * 60, False)
+        else:
+            if self.new_release_timer and self.new_release_timer.running:
+                self.new_release_timer.stop()
+
+    def _on_set_proxies(self, key, value):
+        for k, v in value.items():
+            proxy_settings = lt.proxy_settings()
+            proxy_settings.type = lt.proxy_type(v["type"])
+            proxy_settings.username = str(v["username"])
+            proxy_settings.password = str(v["password"])
+            proxy_settings.hostname = str(v["hostname"])
+            proxy_settings.port = v["port"]
+            log.debug("setting %s proxy settings", k)
+            getattr(self.session, "set_%s_proxy" % k)(proxy_settings)
+
+    def _on_rate_limit_ip_overhead(self, key, value):
+        log.debug("%s: %s", key, value)
+        self.session_set_setting("rate_limit_ip_overhead", value)
+
+    def _on_geoip_db_location(self, key, value):
+        log.debug("%s: %s", key, value)
+        # Load the GeoIP DB for country look-ups if available
+        geoip_db = ""
+        if os.path.exists(value):
+            geoip_db = value
+        elif os.path.exists(pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat"))):
+            geoip_db = pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat"))
+        else:
+            log.warning("Unable to find GeoIP database file!")
+
+        if geoip_db:
+            try:
+                self.session.load_country_db(str(geoip_db))
+            except Exception, e:
+                log.error("Unable to load geoip database!")
+                log.exception(e)
+
+    def _on_cache_size(self, key, value):
+        log.debug("%s: %s", key, value)
+        self.session_set_setting("cache_size", value)
+
+    def _on_cache_expiry(self, key, value):
+        log.debug("%s: %s", key, value)
+        self.session_set_setting("cache_expiry", value)

deluge/core/rpcserver.py

@@ -0,0 +1,524 @@
+#
+# rpcserver.py
+#
+# Copyright (C) 2008,2009 Andrew Resch <andrewresch@gmail.com>
+#
+# Deluge is free software.
+#
+# You may redistribute it and/or modify it under the terms of the
+# GNU General Public License, as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# deluge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with deluge.    If not, write to:
+# 	The Free Software Foundation, Inc.,
+# 	51 Franklin Street, Fifth Floor
+# 	Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+#
+
+"""RPCServer Module"""
+
+import sys
+import zlib
+import os
+import stat
+import traceback
+
+from twisted.internet.protocol import Factory, Protocol
+from twisted.internet import ssl, reactor, defer
+
+from OpenSSL import crypto, SSL
+from types import FunctionType
+
+try:
+    import rencode
+except ImportError:
+    import deluge.rencode as rencode
+
+from deluge.log import LOG as log
+
+import deluge.component as component
+import deluge.configmanager
+from deluge.core.authmanager import AUTH_LEVEL_NONE, AUTH_LEVEL_DEFAULT
+
+RPC_RESPONSE = 1
+RPC_ERROR = 2
+RPC_EVENT = 3
+
+def export(auth_level=AUTH_LEVEL_DEFAULT):
+    """
+    Decorator function to register an object's method as an RPC.  The object
+    will need to be registered with an :class:`RPCServer` to be effective.
+
+    :param func: the function to export
+    :type func: function
+    :param auth_level: the auth level required to call this method
+    :type auth_level: int
+
+    """
+    def wrap(func, *args, **kwargs):
+        func._rpcserver_export = True
+        func._rpcserver_auth_level = auth_level
+        doc = func.__doc__
+        func.__doc__ = "**RPC Exported Function** (*Auth Level: %s*)\n\n" % auth_level
+        if doc:
+            func.__doc__ += doc
+
+        return func
+
+    if type(auth_level) is FunctionType:
+        func = auth_level
+        auth_level = AUTH_LEVEL_DEFAULT
+        return wrap(func)
+    else:
+        return wrap
+
+
+def format_request(call):
+    """
+    Format the RPCRequest message for debug printing
+
+    :param call: the request
+    :type call: a RPCRequest
+
+    :returns: a formatted string for printing
+    :rtype: str
+
+    """
+    try:
+        s = call[1] + "("
+        if call[2]:
+            s += ", ".join([str(x) for x in call[2]])
+        if call[3]:
+            if call[2]:
+                s += ", "
+            s += ", ".join([key + "=" + str(value) for key, value in call[3].items()])
+        s += ")"
+    except UnicodeEncodeError:
+        return "UnicodeEncodeError, call: %s" % call
+    else:
+        return s
+
+class DelugeError(Exception):
+    pass
+
+class NotAuthorizedError(DelugeError):
+    pass
+
+class ServerContextFactory(object):
+    def getContext(self):
+        """
+        Create an SSL context.
+
+        This loads the servers cert/private key SSL files for use with the
+        SSL transport.
+        """
+        ssl_dir = deluge.configmanager.get_config_dir("ssl")
+        ctx = SSL.Context(SSL.SSLv23_METHOD)
+        ctx.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3)
+        ctx.use_certificate_file(os.path.join(ssl_dir, "daemon.cert"))
+        ctx.use_privatekey_file(os.path.join(ssl_dir, "daemon.pkey"))
+        return ctx
+
+class DelugeRPCProtocol(Protocol):
+    __buffer = None
+
+    def dataReceived(self, data):
+        """
+        This method is called whenever data is received from a client.  The
+        only message that a client sends to the server is a RPC Request message.
+        If the RPC Request message is valid, then the method is called in
+        :meth:`dispatch`.
+
+        :param data: the data from the client. It should be a zlib compressed
+            rencoded string.
+        :type data: str
+
+        """
+        if self.__buffer:
+            # We have some data from the last dataReceived() so lets prepend it
+            data = self.__buffer + data
+            self.__buffer = None
+
+        while data:
+            dobj = zlib.decompressobj()
+            try:
+                request = rencode.loads(dobj.decompress(data))
+            except Exception, e:
+                #log.debug("Received possible invalid message (%r): %s", data, e)
+                # This could be cut-off data, so we'll save this in the buffer
+                # and try to prepend it on the next dataReceived()
+                self.__buffer = data
+                return
+            else:
+                data = dobj.unused_data
+
+            if type(request) is not tuple:
+                log.debug("Received invalid message: type is not tuple")
+                return
+
+            if len(request) < 1:
+                log.debug("Received invalid message: there are no items")
+                return
+
+            for call in request:
+                if len(call) != 4:
+                    log.debug("Received invalid rpc request: number of items in request is %s", len(call))
+                    continue
+                #log.debug("RPCRequest: %s", format_request(call))
+                reactor.callLater(0, self.dispatch, *call)
+
+    def sendData(self, data):
+        """
+        Sends the data to the client.
+
+        :param data: the object that is to be sent to the client.  This should
+            be one of the RPC message types.
+        :type data: object
+
+        """
+        self.transport.write(zlib.compress(rencode.dumps(data)))
+
+    def connectionMade(self):
+        """
+        This method is called when a new client connects.
+        """
+        peer = self.transport.getPeer()
+        log.info("Deluge Client connection made from: %s:%s", peer.host, peer.port)
+        # Set the initial auth level of this session to AUTH_LEVEL_NONE
+        self.factory.authorized_sessions[self.transport.sessionno] = AUTH_LEVEL_NONE
+
+    def connectionLost(self, reason):
+        """
+        This method is called when the client is disconnected.
+
+        :param reason: the reason the client disconnected.
+        :type reason: str
+
+        """
+
+        # We need to remove this session from various dicts
+        del self.factory.authorized_sessions[self.transport.sessionno]
+        if self.transport.sessionno in self.factory.session_protocols:
+            del self.factory.session_protocols[self.transport.sessionno]
+        if self.transport.sessionno in self.factory.interested_events:
+            del self.factory.interested_events[self.transport.sessionno]
+
+        log.info("Deluge client disconnected: %s", reason.value)
+
+    def dispatch(self, request_id, method, args, kwargs):
+        """
+        This method is run when a RPC Request is made.  It will run the local method
+        and will send either a RPC Response or RPC Error back to the client.
+
+        :param request_id: the request_id from the client (sent in the RPC Request)
+        :type request_id: int
+        :param method: the local method to call. It must be registered with
+            the :class:`RPCServer`.
+        :type method: str
+        :param args: the arguments to pass to `method`
+        :type args: list
+        :param kwargs: the keyword-arguments to pass to `method`
+        :type kwargs: dict
+
+        """
+        def sendError():
+            """
+            Sends an error response with the contents of the exception that was raised.
+            """
+            exceptionType, exceptionValue, exceptionTraceback = sys.exc_info()
+
+            self.sendData((
+                RPC_ERROR,
+                request_id,
+                (exceptionType.__name__,
+                exceptionValue.args[0] if len(exceptionValue.args) == 1 else "",
+                "".join(traceback.format_tb(exceptionTraceback)))
+            ))
+
+        if method == "daemon.login":
+            # This is a special case and used in the initial connection process
+            # We need to authenticate the user here
+            try:
+                ret = component.get("AuthManager").authorize(*args, **kwargs)
+                if ret:
+                    self.factory.authorized_sessions[self.transport.sessionno] = (ret, args[0])
+                    self.factory.session_protocols[self.transport.sessionno] = self
+            except Exception, e:
+                sendError()
+                log.exception(e)
+            else:
+                self.sendData((RPC_RESPONSE, request_id, (ret)))
+                if not ret:
+                    self.transport.loseConnection()
+            finally:
+                return
+        elif method == "daemon.set_event_interest" and self.transport.sessionno in self.factory.authorized_sessions:
+            # This special case is to allow clients to set which events they are
+            # interested in receiving.
+            # We are expecting a sequence from the client.
+            try:
+                if self.transport.sessionno not in self.factory.interested_events:
+                    self.factory.interested_events[self.transport.sessionno] = []
+                self.factory.interested_events[self.transport.sessionno].extend(args[0])
+            except Exception, e:
+                sendError()
+            else:
+                self.sendData((RPC_RESPONSE, request_id, (True)))
+            finally:
+                return
+
+        if method in self.factory.methods and self.transport.sessionno in self.factory.authorized_sessions:
+            try:
+                method_auth_requirement = self.factory.methods[method]._rpcserver_auth_level
+                auth_level = self.factory.authorized_sessions[self.transport.sessionno][0]
+                if auth_level < method_auth_requirement:
+                    # This session is not allowed to call this method
+                    log.debug("Session %s is trying to call a method it is not authorized to call!", self.transport.sessionno)
+                    raise NotAuthorizedError("Auth level too low: %s < %s" % (auth_level, method_auth_requirement))
+                # Set the session_id in the factory so that methods can know
+                # which session is calling it.
+                self.factory.session_id = self.transport.sessionno
+                ret = self.factory.methods[method](*args, **kwargs)
+            except Exception, e:
+                sendError()
+                # Don't bother printing out DelugeErrors, because they are just for the client
+                if not isinstance(e, DelugeError):
+                    log.exception("Exception calling RPC request: %s", e)
+            else:
+                # Check if the return value is a deferred, since we'll need to
+                # wait for it to fire before sending the RPC_RESPONSE
+                if isinstance(ret, defer.Deferred):
+                    def on_success(result):
+                        self.sendData((RPC_RESPONSE, request_id, result))
+                        return result
+
+                    def on_fail(failure):
+                        try:
+                            failure.raiseException()
+                        except Exception, e:
+                            sendError()
+                        return failure
+
+                    ret.addCallbacks(on_success, on_fail)
+                else:
+                    self.sendData((RPC_RESPONSE, request_id, ret))
+
+class RPCServer(component.Component):
+    """
+    This class is used to handle rpc requests from the client.  Objects are
+    registered with this class and their methods are exported using the export
+    decorator.
+
+    :param port: the port the RPCServer will listen on
+    :type port: int
+    :param interface: the interface to listen on, this may override the `allow_remote` setting
+    :type interface: str
+    :param allow_remote: set True if the server should allow remote connections
+    :type allow_remote: bool
+    :param listen: if False, will not start listening.. This is only useful in Classic Mode
+    :type listen: bool
+    """
+
+    def __init__(self, port=58846, interface="", allow_remote=False, listen=True):
+        component.Component.__init__(self, "RPCServer")
+
+        self.factory = Factory()
+        self.factory.protocol = DelugeRPCProtocol
+        self.factory.session_id = -1
+
+        # Holds the registered methods
+        self.factory.methods = {}
+        # Holds the session_ids and auth levels
+        self.factory.authorized_sessions = {}
+        # Holds the protocol objects with the session_id as key
+        self.factory.session_protocols = {}
+        # Holds the interested event list for the sessions
+        self.factory.interested_events = {}
+
+        if not listen:
+            return
+
+        if allow_remote:
+            hostname = ""
+        else:
+            hostname = "localhost"
+
+        if interface:
+            hostname = interface
+
+        log.info("Starting DelugeRPC server %s:%s", hostname, port)
+
+        # Check for SSL keys and generate some if needed
+        check_ssl_keys()
+
+        try:
+            reactor.listenSSL(port, self.factory, ServerContextFactory(), interface=hostname)
+        except Exception, e:
+            log.info("Daemon already running or port not available..")
+            log.error(e)
+            sys.exit(0)
+
+    def register_object(self, obj, name=None):
+        """
+        Registers an object to export it's rpc methods.  These methods should
+        be exported with the export decorator prior to registering the object.
+
+        :param obj: the object that we want to export
+        :type obj: object
+        :param name: the name to use, if None, it will be the class name of the object
+        :type name: str
+        """
+        if not name:
+            name = obj.__class__.__name__.lower()
+
+        for d in dir(obj):
+            if d[0] == "_":
+                continue
+            if getattr(getattr(obj, d), '_rpcserver_export', False):
+                log.debug("Registering method: %s", name + "." + d)
+                self.factory.methods[name + "." + d] = getattr(obj, d)
+
+    def get_object_method(self, name):
+        """
+        Returns a registered method.
+
+        :param name: the name of the method, usually in the form of 'object.method'
+        :type name: str
+
+        :returns: method
+
+        :raises KeyError: if `name` is not registered
+
+        """
+        return self.factory.methods[name]
+
+    def get_method_list(self):
+        """
+        Returns a list of the exported methods.
+
+        :returns: the exported methods
+        :rtype: list
+        """
+        return self.factory.methods.keys()
+
+    def get_session_id(self):
+        """
+        Returns the session id of the current RPC.
+
+        :returns: the session id, this will be -1 if no connections have been made
+        :rtype: int
+
+        """
+        return self.factory.session_id
+
+    def get_session_user(self):
+        """
+        Returns the username calling the current RPC.
+
+        :returns: the username of the user calling the current RPC
+        :rtype: string
+
+        """
+        session_id = self.get_session_id()
+        if session_id > -1 and session_id in self.factory.authorized_sessions:
+            return self.factory.authorized_sessions[session_id][1]
+        else:
+            # No connections made yet
+            return ""
+
+    def is_session_valid(self, session_id):
+        """
+        Checks if the session is still valid, eg, if the client is still connected.
+
+        :param session_id: the session id
+        :type session_id: int
+
+        :returns: True if the session is valid
+        :rtype: bool
+
+        """
+        return session_id in self.factory.authorized_sessions
+
+    def emit_event(self, event):
+        """
+        Emits the event to interested clients.
+
+        :param event: the event to emit
+        :type event: :class:`deluge.event.DelugeEvent`
+        """
+        log.debug("intevents: %s", self.factory.interested_events)
+        # Find sessions interested in this event
+        for session_id, interest in self.factory.interested_events.items():
+            if event.name in interest:
+                log.debug("Emit Event: %s %s", event.name, event.args)
+                # This session is interested so send a RPC_EVENT
+                self.factory.session_protocols[session_id].sendData(
+                    (RPC_EVENT, event.name, event.args)
+                )
+
+def check_ssl_keys():
+    """
+    Check for SSL cert/key and create them if necessary
+    """
+    ssl_dir = deluge.configmanager.get_config_dir("ssl")
+    if not os.path.exists(ssl_dir):
+        # The ssl folder doesn't exist so we need to create it
+        os.makedirs(ssl_dir)
+        generate_ssl_keys()
+    else:
+        for f in ("daemon.pkey", "daemon.cert"):
+            if not os.path.exists(os.path.join(ssl_dir, f)):
+                generate_ssl_keys()
+                break
+
+def generate_ssl_keys():
+    """
+    This method generates a new SSL key/cert.
+    """
+    digest = "sha256"
+    # Generate key pair
+    pkey = crypto.PKey()
+    pkey.generate_key(crypto.TYPE_RSA, 2048)
+
+    # Generate cert request
+    req = crypto.X509Req()
+    subj = req.get_subject()
+    setattr(subj, "CN", "Deluge Daemon")
+    req.set_pubkey(pkey)
+    req.sign(pkey, digest)
+
+    # Generate certificate
+    cert = crypto.X509()
+    cert.set_serial_number(0)
+    cert.gmtime_adj_notBefore(0)
+    cert.gmtime_adj_notAfter(60 * 60 * 24 * 365 * 3)  # Three Years
+    cert.set_issuer(req.get_subject())
+    cert.set_subject(req.get_subject())
+    cert.set_pubkey(req.get_pubkey())
+    cert.sign(pkey, digest)
+
+    # Write out files
+    ssl_dir = deluge.configmanager.get_config_dir("ssl")
+    open(os.path.join(ssl_dir, "daemon.pkey"), "w").write(crypto.dump_privatekey(crypto.FILETYPE_PEM, pkey))
+    open(os.path.join(ssl_dir, "daemon.cert"), "w").write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert))
+    # Make the files only readable by this user
+    for f in ("daemon.pkey", "daemon.cert"):
+        os.chmod(os.path.join(ssl_dir, f), stat.S_IREAD | stat.S_IWRITE)

deluge/core/signalmanager.py

@@ -1,81 +0,0 @@
-#
-# signalmanager.py
-#
-# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com>
-# 
-# Deluge is free software.
-# 
-# You may redistribute it and/or modify it under the terms of the
-# GNU General Public License, as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option)
-# any later version.
-# 
-# deluge is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with deluge.    If not, write to:
-# 	The Free Software Foundation, Inc.,
-# 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
-#
-#    In addition, as a special exception, the copyright holders give
-#    permission to link the code of portions of this program with the OpenSSL
-#    library.
-#    You must obey the GNU General Public License in all respects for all of
-#    the code used other than OpenSSL. If you modify file(s) with this
-#    exception, you may extend this exception to your version of the file(s),
-#    but you are not obligated to do so. If you do not wish to do so, delete
-#    this exception statement from your version. If you delete this exception
-#    statement from all source files in the program, then also delete it here.
-
-import deluge.xmlrpclib as xmlrpclib
-import socket
-
-import gobject
-
-import deluge.component as component
-from deluge.log import LOG as log
-
-class SignalManager(component.Component):
-    def __init__(self):
-        component.Component.__init__(self, "SignalManager")
-        self.clients = {}
-
-    def shutdown(self):
-        self.clients = {}
-
-    def deregister_client(self, address):
-        """Deregisters a client"""
-        log.debug("Deregistering %s as a signal reciever..", address)
-        for client in self.clients.keys():
-            if client.split("//")[1].split(":")[0] == address:
-                del self.clients[client]
-                break
-
-    def register_client(self, address, port):
-        """Registers a client to emit signals to."""
-        uri = "http://" + str(address) + ":" + str(port)
-        log.debug("Registering %s as a signal reciever..", uri)
-        self.clients[uri] = xmlrpclib.ServerProxy(uri)
-
-    def emit(self, signal, *data):
-        for uri in self.clients:
-            gobject.idle_add(self._emit, uri, signal, 1, *data)
-
-    def _emit(self, uri, signal, count, *data):
-        if uri not in self.clients:
-            return
-        client = self.clients[uri]
-        try:
-            client.emit_signal(signal, *data)
-        except (socket.error, Exception), e:
-            log.warning("Unable to emit signal to client %s: %s (%d)", client, e, count)
-            if count < 30:
-                gobject.timeout_add(1000, self._emit, uri, signal, count + 1, *data)
-            else:
-                log.info("Removing %s because it couldn't be reached..", uri)
-                del self.clients[uri]
-

deluge/data/pixmaps/active.svg

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg4848"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/active16.png"
+   inkscape:export-xdpi="1.7055545"
+   inkscape:export-ydpi="1.7055545"
+   sodipodi:docname="active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4850">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective4856" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5467">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.69776249;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 792.51261,596.13496 C 1787.1961,462.38583 1788.2786,460.03989 1788.2786,460.03989 L 2050.3447,889.51678 C 1692.1626,1024.6476 1428.8778,1128.1462 1119.6165,1246.9702 L 792.51261,596.13496 z"
+         id="path5469"
+         sodipodi:nodetypes="ccccc" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5471">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.69776249;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 792.51261,596.13496 C 1787.1961,462.38583 1788.2786,460.03989 1788.2786,460.03989 L 2050.3447,889.51678 C 1692.1626,1024.6476 1428.8778,1128.1462 1119.6165,1246.9702 L 792.51261,596.13496 z"
+         id="path5473"
+         sodipodi:nodetypes="ccccc" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5475">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.69776249;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 792.51261,596.13496 C 1787.1961,462.38583 1788.2786,460.03989 1788.2786,460.03989 L 2050.3447,889.51678 C 1692.1626,1024.6476 1428.8778,1128.1462 1119.6165,1246.9702 L 792.51261,596.13496 z"
+         id="path5477"
+         sodipodi:nodetypes="ccccc" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.5"
+     inkscape:cx="798.86898"
+     inkscape:cy="436.74575"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="958"
+     inkscape:window-x="1280"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata4853">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       style="opacity:1"
+       id="g4871">
+      <path
+         inkscape:export-ydpi="1.7060417"
+         inkscape:export-xdpi="1.7060417"
+         inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+         sodipodi:nodetypes="ccccc"
+         id="path2069"
+         d="M 335.10794,116.43168 L 610.53935,447.76408 C 809.45408,669.41324 696.25675,938.85368 393.35753,959.46028 C -32.813273,970.60316 -9.7709676,623.52458 107.82928,464.31364 L 335.10794,116.43168 z"
+         style="fill:#5599ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:export-ydpi="1.7060417"
+         inkscape:export-xdpi="1.7060417"
+         inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+         sodipodi:nodetypes="ccccc"
+         id="path2071"
+         d="M 337.67292,165.87552 L 585.22638,464.67366 C 773.96211,684.57988 653.37942,910.02774 383.88559,930.97978 C 4.1291863,940.68143 29.040179,639.21796 125.2355,490.1649 L 337.67292,165.87552 z"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:21.67123985;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022" />
+      <path
+         inkscape:export-ydpi="1.7060417"
+         inkscape:export-xdpi="1.7060417"
+         inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+         id="rect2634"
+         d="M 359.0208,369.47132 C 289.64507,437.53055 219.98727,505.41409 150.61154,573.47313 C 187.93874,573.54143 225.35922,573.40503 262.68661,573.47313 C 262.68661,654.06643 262.68661,734.65974 262.68661,815.25304 C 329.00806,815.25304 395.32971,815.25304 461.65134,815.25304 C 461.65134,734.86969 461.65134,654.48632 461.65134,574.10276 C 496.04273,574.16582 530.52013,574.0399 564.91152,574.10276 C 496.30183,505.79126 427.63028,437.78301 359.0208,369.47132 z"
+         style="fill:#93beff;fill-opacity:1;stroke:#000000;stroke-width:14.10382843;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:#8dd35f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 1211.4629,48.95108 L 1486.8943,380.28348 C 1685.809,601.93264 1572.6117,871.37308 1269.7125,891.97968 C 843.5417,903.12256 866.584,556.04398 984.1842,396.83304 L 1211.4629,48.95108 z"
+       id="path4864"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417"
+       clip-path="url(#clipPath5475)"
+       transform="translate(-876,68)" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:21.67123985;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
+       d="M 1214.0279,98.39492 L 1461.5813,397.19306 C 1650.317,617.09928 1529.7344,842.54714 1260.2405,863.49918 C 880.4842,873.20083 905.3951,571.73736 1001.5905,422.6843 L 1214.0279,98.39492 z"
+       id="path4866"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417"
+       clip-path="url(#clipPath5471)"
+       transform="translate(-876,68)" />
+    <path
+       style="fill:#b7e399;fill-opacity:1;stroke:#000000;stroke-width:14.1288912;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1235.158,785.66485 C 1165.4485,716.69801 1095.4555,647.90922 1025.7459,578.94258 C 1063.2527,578.87336 1100.8533,579.01159 1138.3603,578.94258 C 1138.3603,497.27453 1138.3603,415.60647 1138.3603,333.93841 C 1205.0008,333.93841 1271.6416,333.93841 1338.2823,333.93841 C 1338.2823,415.39371 1338.2823,496.84903 1338.2823,578.30455 C 1372.8392,578.24065 1407.4825,578.36825 1442.0394,578.30455 C 1373.0995,647.52701 1304.0976,716.44219 1235.158,785.66485 z"
+       id="path4868"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417"
+       clip-path="url(#clipPath5467)"
+       transform="matrix(0.9958235,0,0,1.0000914,-871.02338,67.589213)" />
+  </g>
+</svg>

deluge/data/pixmaps/alert.svg

@@ -2,359 +2,95 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3440"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg5684"
    sodipodi:version="0.32"
-   inkscape:version="0.45"
-   sodipodi:docbase="/home/andrew"
+   inkscape:version="0.46"
+   inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/alert16.png"
+   inkscape:export-xdpi="1.7055545"
+   inkscape:export-ydpi="1.7055545"
    sodipodi:docname="alert.svg"
-   inkscape:export-filename="/home/andrew/alert16.png"
-   inkscape:export-xdpi="32.603073"
-   inkscape:export-ydpi="32.603073"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:modified="TRUE">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2973">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2975" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop2977" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4128" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.16494845;"
-         offset="1.0000000"
-         id="stop4130" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4114">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4116" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4118" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3962">
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop3964" />
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.15517241"
-         id="stop4134" />
-      <stop
-         style="stop-color:#4074ae;stop-opacity:1.0000000;"
-         offset="0.75000000"
-         id="stop4346" />
-      <stop
-         style="stop-color:#36486c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3966" />
-    </linearGradient>
-    <radialGradient
-       r="13.994944"
-       fy="33.506763"
-       fx="-10.089286"
-       cy="33.506763"
-       cx="-10.089286"
-       gradientTransform="matrix(1,0,0,0.791446,-14.01786,-11.28667)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4019"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       r="14.057444"
-       fy="31.329016"
-       fx="-10.323107"
-       cy="31.329016"
-       cx="-10.323107"
-       gradientTransform="matrix(1,0,0,0.792374,-19.58761,2.818569)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4004"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.792374,0,6.785475)"
-       r="14.057444"
-       fy="31.329016"
-       fx="-10.323107"
-       cy="31.329016"
-       cx="-10.323107"
-       id="radialGradient3999"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.341185,-0.153831,1.08001,2.395374,-15.42222,-25.62103)"
-       r="13.994946"
-       fy="24.241488"
-       fx="61.662098"
-       cy="24.241488"
-       cx="61.662098"
-       id="radialGradient3943"
-       xlink:href="#linearGradient1312"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient1312">
-      <stop
-         id="stop1314"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop1316"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3993">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3995" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop3997" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2973"
-       id="radialGradient3866"
-       cx="-22.375"
-       cy="18.499998"
-       fx="-22.375"
-       fy="18.499998"
-       r="14.33462"
-       gradientTransform="matrix(1,0,0,1.140022,40.17678,1.347091)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="12.289036"
-       fy="63.965388"
-       fx="15.115514"
-       cy="63.965388"
-       cx="15.115514"
-       gradientTransform="scale(1.643990,0.608276)"
-       id="radialGradient5000"
-       xlink:href="#linearGradient4114"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4989">
-      <stop
-         id="stop4991"
-         offset="0.0000000"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4993"
-         offset="0.15517241"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4995"
-         offset="0.75000000"
-         style="stop-color:#4074ae;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4997"
-         offset="1.0000000"
-         style="stop-color:#36486c;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4977">
-      <stop
-         id="stop4979"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4981"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.16494845;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4825"
-       inkscape:collect="always">
-      <stop
-         id="stop4827"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop4829"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4114"
-       id="radialGradient6090"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.64399,0.608276)"
-       cx="15.115514"
-       cy="63.965388"
-       fx="15.115514"
-       fy="63.965388"
-       r="12.289036" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4825"
-       id="radialGradient6098"
-       gradientUnits="userSpaceOnUse"
-       cx="12.071323"
-       cy="12.493138"
-       fx="12.071323"
-       fy="12.493138"
-       r="6.7175145" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2973"
-       id="radialGradient6103"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.25463,-0.898371,0.979785,0.277703,-18.00903,32.03312)"
-       cx="17.903898"
-       cy="40.159222"
-       fx="17.903898"
-       fy="40.159222"
-       r="14.33681" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2973"
-       id="radialGradient6106"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.583269,-0.431533,0.577146,0.78008,-5.80022,4.004109)"
-       cx="12.525543"
-       cy="38.09042"
-       fx="12.525543"
-       fy="38.09042"
-       r="14.33681" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1312"
-       id="radialGradient6109"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.768231,1.13675,-0.820972,0.554824,-3.72248,-85.07126)"
-       cx="65.800331"
-       cy="27.16758"
-       fx="65.800331"
-       fy="27.16758"
-       r="12.972491" />
+     id="defs5686">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective5692" />
   </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="0.17254902"
-     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.4062501"
-     inkscape:cx="11.667315"
-     inkscape:cy="19.059135"
+     inkscape:zoom="0.35"
+     inkscape:cx="807.63627"
+     inkscape:cy="520"
+     inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1024"
-     inkscape:window-height="693"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:showpageshadow="false" />
+     inkscape:window-width="686"
+     inkscape:window-height="711"
+     inkscape:window-x="1395"
+     inkscape:window-y="223" />
   <metadata
-     id="metadata4">
+     id="metadata5689">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Internet Category</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Tuomas Kuosmanen</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>internet</rdf:li>
-            <rdf:li>tools</rdf:li>
-            <rdf:li>applications</rdf:li>
-            <rdf:li>category</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     id="layer1">
     <path
-       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 23.942923,0.9561338 L 37.330543,18.266721 C 46.998995,29.84687 41.49692,43.923891 26.7742,45.000491 C 6.0597413,45.582655 6.5086231,27.37483 11.255313,18.609381 L 23.942923,0.9561338 z "
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891000000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 335.10794,116.43168 L 610.53935,447.76408 C 809.45408,669.41324 696.25675,938.85368 393.35753,959.46028 C -32.813273,970.60316 -9.7709676,623.52458 107.82928,464.31364 L 335.10794,116.43168 z"
        id="path2069"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
     <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
-       d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z "
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:21.67123984999999919;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022000000000"
+       d="M 337.67292,165.87552 L 585.22638,464.67366 C 773.96211,684.57988 653.37942,910.02774 383.88559,930.97978 C 4.1291863,940.68143 29.040179,639.21796 125.2355,490.1649 L 337.67292,165.87552 z"
        id="path2071"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
     <text
        xml:space="preserve"
-       style="font-size:55.97062302px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ff7878;fill-opacity:1;stroke:#000000;stroke-width:0.70000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="5.0072942"
-       y="59.560848"
+       style="font-size:1091.49255371px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ff7878;fill-opacity:1;stroke:#000000;stroke-width:13.65081787;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="20.453644"
+       y="1303.4996"
        id="text2767"
        transform="scale(1.4928735,0.6698491)"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan2769"
-         x="5.0072942"
-         y="59.560848"
-         style="font-size:55.97062302px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;stroke-width:0.70000001;font-family:Bitstream Vera Sans;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-linecap:round">!</tspan></text>
+         x="20.453644"
+         y="1303.4996"
+         style="font-size:1091.49255371px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;stroke-width:13.65081787;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;font-family:Bitstream Vera Sans">!</tspan></text>
   </g>
 </svg>

deluge/data/pixmaps/all.svg

@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg3001"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="all.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3003">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3009" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="375"
+     inkscape:cy="520"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="640"
+     inkscape:window-height="711"
+     inkscape:window-x="1594"
+     inkscape:window-y="77" />
+  <metadata
+     id="metadata3006">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3011"
+       transform="matrix(7.4849593,0,0,7.4849593,52.997244,360.31942)"
+       inkscape:export-filename="/home/andrew/g3060.png"
+       inkscape:export-xdpi="2.4250078"
+       inkscape:export-ydpi="2.4250078">
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path2069"
+         d="M 23.942923,0.9561338 L 37.330543,18.266721 C 46.998995,29.84687 41.49692,43.923891 26.7742,45.000491 C 6.0597413,45.582655 6.5086231,27.37483 11.255313,18.609381 L 23.942923,0.9561338 z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path2071"
+         d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022" />
+      <text
+         sodipodi:linespacing="125%"
+         transform="scale(1.4928735,0.6698491)"
+         id="text2767"
+         y="59.560848"
+         x="5.0072942"
+         style="font-size:55.97062302px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ff7878;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           style="font-size:55.97062302px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+           y="59.560848"
+           x="5.0072942"
+           id="tspan2769"
+           sodipodi:role="line">!</tspan></text>
+    </g>
+    <g
+       id="g3022"
+       transform="matrix(7.874057,0,0,7.874057,232.39499,356.39427)"
+       inkscape:export-filename="/home/andrew/g3060.png"
+       inkscape:export-xdpi="2.4250078"
+       inkscape:export-ydpi="2.4250078">
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path3030"
+         d="M 23.854535,1.0445221 L 37.242155,18.355109 C 46.910607,29.935258 41.408532,44.012279 26.685812,45.088879 C 5.971353,45.671043 6.4202348,27.463218 11.166925,18.697769 L 23.854535,1.0445221 z"
+         style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path3032"
+         d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022" />
+      <g
+         transform="matrix(0.9616363,0,0,0.855461,0.9207282,3.9296533)"
+         id="g3590">
+        <rect
+           style="fill:#cfcfcf;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect4415"
+           width="7.7589664"
+           height="14.866735"
+           x="14.548919"
+           y="19.754131" />
+        <rect
+           style="fill:#cfcfcf;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect4417"
+           width="7.7589664"
+           height="14.866735"
+           x="25.692116"
+           y="19.754131" />
+      </g>
+    </g>
+    <g
+       id="g3037"
+       transform="matrix(8.0037561,0,0,8.0037561,-22.312009,464.83023)"
+       inkscape:export-filename="/home/andrew/g3060.png"
+       inkscape:export-xdpi="2.4250078"
+       inkscape:export-ydpi="2.4250078">
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path3043"
+         d="M 23.854535,1.0445221 L 37.242155,18.355109 C 46.910607,29.935258 41.408532,44.012279 26.685812,45.088879 C 5.971353,45.671043 6.4202348,27.463218 11.166925,18.697769 L 23.854535,1.0445221 z"
+         style="fill:#d0b31d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path3045"
+         d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022" />
+      <path
+         id="rect2634"
+         d="M 24.821384,15.512309 C 22.21433,17.952223 19.604921,20.381297 16.997867,22.821211 C 18.304685,22.818964 19.61477,22.823457 20.921589,22.821211 C 20.921589,25.684801 20.921589,28.548391 20.921589,31.411981 C 19.61477,31.409734 18.304685,31.414228 16.997867,31.411981 C 19.604921,33.851895 22.21433,36.280969 24.821384,38.720883 C 27.457552,36.289986 30.104432,33.865368 32.740602,31.43447 C 31.322226,31.432031 29.900305,31.43691 28.481929,31.43447 C 28.481929,28.555887 28.481929,25.677306 28.481929,22.798722 C 29.900305,22.796282 31.322226,22.80116 32.740602,22.798722 C 30.104432,20.367823 27.457552,17.943206 24.821384,15.512309 z"
+         style="fill:#e1cf6f;fill-opacity:1;stroke:#000000;stroke-width:0.56882578;stroke-linecap:round;stroke-linejoin:round;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       id="g3048"
+       transform="matrix(7.6146585,0,0,7.6146585,318.27879,494.48113)"
+       inkscape:export-filename="/home/andrew/g3060.png"
+       inkscape:export-xdpi="2.4250078"
+       inkscape:export-ydpi="2.4250078">
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path3054"
+         d="M 23.942923,0.9561338 L 37.330543,18.266721 C 46.998995,29.84687 41.49692,43.923891 26.7742,45.000491 C 6.0597413,45.582655 6.5086231,27.37483 11.255313,18.609381 L 23.942923,0.9561338 z"
+         style="fill:#5599ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path3056"
+         d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022" />
+      <path
+         id="path3058"
+         d="M 24.3125,14.9375 C 20.869248,18.315409 17.412003,21.684591 13.96875,25.0625 C 15.821373,25.065889 17.678627,25.059111 19.53125,25.0625 C 19.53125,29.0625 19.53125,33.0625 19.53125,37.0625 C 22.822917,37.0625 26.114582,37.0625 29.40625,37.0625 C 29.40625,33.072917 29.40625,29.083333 29.40625,25.09375 C 31.113161,25.096872 32.824339,25.090627 34.53125,25.09375 C 31.126025,21.703313 27.717725,18.327937 24.3125,14.9375 z"
+         style="fill:#93beff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g3060"
+       transform="matrix(8.2631545,0,0,8.2631545,133.25792,542.4325)"
+       inkscape:export-xdpi="2.4250078"
+       inkscape:export-ydpi="2.4250078">
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path3066"
+         d="M 23.942923,0.9561338 L 37.330543,18.266721 C 46.998995,29.84687 41.49692,43.923891 26.7742,45.000491 C 6.0597413,45.582655 6.5086231,27.37483 11.255313,18.609381 L 23.942923,0.9561338 z"
+         style="fill:#8dd35f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path3068"
+         d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022" />
+      <path
+         id="path3070"
+         d="M 19.34375,17.5625 C 19.34375,21.552083 19.34375,25.541668 19.34375,29.53125 C 17.636839,29.528128 15.925661,29.534372 14.21875,29.53125 C 17.623975,32.921687 21.032275,36.297063 24.4375,39.6875 C 27.880752,36.309591 31.337996,32.94041 34.78125,29.5625 C 32.928627,29.559111 31.071373,29.565889 29.21875,29.5625 C 29.21875,25.5625 29.21875,21.562501 29.21875,17.5625 C 25.927083,17.5625 22.635418,17.562501 19.34375,17.5625 z"
+         style="fill:#b7e399;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

deluge/data/pixmaps/checking.svg

@@ -6,292 +6,83 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3440"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg6930"
    sodipodi:version="0.32"
    inkscape:version="0.46"
-   sodipodi:docbase="/home/andrew/Projects/deluge-icons"
+   inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/checking16.png"
+   inkscape:export-xdpi="1.7060417"
+   inkscape:export-ydpi="1.7060417"
    sodipodi:docname="checking.svg"
-   inkscape:export-filename="/home/andrew/checking16.png"
-   inkscape:export-xdpi="32.603073"
-   inkscape:export-ydpi="32.603073"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs6932">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective6938" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="0.17254902"
-     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="37.674028"
-     inkscape:cy="16.114442"
+     inkscape:zoom="0.7"
+     inkscape:cx="284.02575"
+     inkscape:cy="416.27643"
+     inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="768"
-     inkscape:window-height="722"
-     inkscape:window-x="4"
-     inkscape:window-y="25"
-     inkscape:showpageshadow="false" />
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       id="perspective2513"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 24 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="linearGradient2973"
-       inkscape:collect="always">
-      <stop
-         id="stop2975"
-         offset="0"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-      <stop
-         id="stop2977"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         id="stop4128"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4130"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.16494845;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4114"
-       inkscape:collect="always">
-      <stop
-         id="stop4116"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4118"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3962">
-      <stop
-         id="stop3964"
-         offset="0.0000000"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4134"
-         offset="0.15517241"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4346"
-         offset="0.75000000"
-         style="stop-color:#4074ae;stop-opacity:1.0000000;" />
-      <stop
-         id="stop3966"
-         offset="1.0000000"
-         style="stop-color:#36486c;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3993"
-       id="radialGradient4019"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.791446,-14.01786,-11.28667)"
-       cx="-10.089286"
-       cy="33.506763"
-       fx="-10.089286"
-       fy="33.506763"
-       r="13.994944" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3993"
-       id="radialGradient4004"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.792374,-19.58761,2.818569)"
-       cx="-10.323107"
-       cy="31.329016"
-       fx="-10.323107"
-       fy="31.329016"
-       r="14.057444" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3993"
-       id="radialGradient3999"
-       cx="-10.323107"
-       cy="31.329016"
-       fx="-10.323107"
-       fy="31.329016"
-       r="14.057444"
-       gradientTransform="matrix(1,0,0,0.792374,0,6.785475)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1312"
-       id="radialGradient3943"
-       cx="61.662098"
-       cy="24.241488"
-       fx="61.662098"
-       fy="24.241488"
-       r="13.994946"
-       gradientTransform="matrix(0.341185,-0.153831,1.08001,2.395374,-15.42222,-25.62103)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient1312">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop1314" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop1316" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3993">
-      <stop
-         id="stop3995"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3997"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.140022,40.17678,1.347091)"
-       r="14.33462"
-       fy="18.499998"
-       fx="-22.375"
-       cy="18.499998"
-       cx="-22.375"
-       id="radialGradient3866"
-       xlink:href="#linearGradient2973"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4114"
-       id="radialGradient5000"
-       gradientTransform="scale(1.643990,0.608276)"
-       cx="15.115514"
-       cy="63.965388"
-       fx="15.115514"
-       fy="63.965388"
-       r="12.289036"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4989">
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4991" />
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.15517241"
-         id="stop4993" />
-      <stop
-         style="stop-color:#4074ae;stop-opacity:1.0000000;"
-         offset="0.75000000"
-         id="stop4995" />
-      <stop
-         style="stop-color:#36486c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4997" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4977">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4979" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.16494845;"
-         offset="1.0000000"
-         id="stop4981" />
-    </linearGradient>
-  </defs>
+     inkscape:window-width="686"
+     inkscape:window-height="711"
+     inkscape:window-x="1387"
+     inkscape:window-y="128" />
   <metadata
-     id="metadata4">
+     id="metadata6935">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Internet Category</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Tuomas Kuosmanen</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>internet</rdf:li>
-            <rdf:li>tools</rdf:li>
-            <rdf:li>applications</rdf:li>
-            <rdf:li>category</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
      inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
      id="layer1">
     <path
-       sodipodi:nodetypes="ccccc"
+       style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891000000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 335.10794,116.43168 L 610.53935,447.76408 C 809.45408,669.41324 696.25675,938.85368 393.35753,959.46028 C -32.813273,970.60316 -9.7709676,623.52458 107.82928,464.31364 L 335.10794,116.43168 z"
        id="path2069"
-       d="M 23.854535,1.0445221 L 37.242155,18.355109 C 46.910607,29.935258 41.408532,44.012279 26.685812,45.088879 C 5.971353,45.671043 6.4202348,27.463218 11.166925,18.697769 L 23.854535,1.0445221 z "
-       style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
        sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/checking16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:21.67123984999999919;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022000000000"
+       d="M 337.67292,165.87552 L 585.22638,464.67366 C 773.96211,684.57988 653.37942,910.02774 383.88559,930.97978 C 4.1291863,940.68143 29.040179,639.21796 125.2355,490.1649 L 337.67292,165.87552 z"
        id="path2071"
-       d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z "
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       style="fill:#cfcfcf;fill-opacity:1;stroke:#000000;stroke-width:0.65121293;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 11.907735,28.259103 C 15.765379,27.553911 20.775812,26.031856 24.400866,26.377315 C 22.598873,25.111024 22.522108,24.694978 21.821837,23.470303 C 26.445155,22.178774 28.937476,23.679964 34.217776,26.922312 C 35.006715,25.3802 35.778476,24.67098 36.817957,22.869809 C 31.198009,18.792719 25.868522,17.760268 20.454911,19.207042 C 19.842813,18.404348 19.795799,17.541278 19.728831,15.812086 C 17.778356,18.179212 14.825215,22.457523 11.907735,28.259103 C 11.907735,28.259103 11.907735,28.259103 11.907735,28.259103"
-       id="path3463" />
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
     <path
+       style="fill:#cfcfcf;fill-opacity:1;stroke:#000000;stroke-width:11.50416565;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 170.93275,447.12091 C 174.01359,451.92804 181.6932,659.85017 179.71907,656.9136 C 178.40947,654.12718 411.7223,649.25335 412.30092,648.76646 C 411.08134,648.85003 338.31478,584.63588 338.93986,585.53435 C 410.72174,567.77973 462.65633,588.73801 481.03861,645.01437 C 484.19544,690.33553 466.3409,711.71891 434.77285,736.14895 C 385.89389,754.17146 322.59241,745.84878 312.37017,673.09575 C 312.32389,674.48492 156.52907,675.28833 153.0572,676.51233 C 202.03372,799.5504 269.9646,882.62913 421.73005,870.01325 C 463.0283,867.02946 568.27041,836.89042 606.41655,717.64626 C 627.84208,623.51263 596.80367,549.4096 547.34944,496.26853 C 457.7753,416.4389 296.11292,421.8444 245.11698,507.64417 C 247.55313,508.23771 173.58263,449.35852 170.93275,447.12091 z"
        id="path3485"
-       d="M 36.668898,28.597896 C 32.811254,29.303088 27.800821,30.825143 24.175767,30.479684 C 25.97776,31.745975 26.054525,32.162021 26.754796,33.386696 C 22.131478,34.678225 19.639157,33.177035 14.358857,29.934687 C 13.569918,31.476799 12.798157,32.186019 11.758676,33.98719 C 17.378624,38.06428 22.708111,39.096731 28.121722,37.649957 C 28.73382,38.452651 28.780834,39.315721 28.847802,41.044913 C 30.798277,38.677787 33.751418,34.399476 36.668898,28.597896 C 36.668898,28.597896 36.668898,28.597896 36.668898,28.597896"
-       style="fill:#cfcfcf;fill-opacity:1;stroke:#000000;stroke-width:0.65121293;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:nodetypes="ccccccccc" />
+       sodipodi:nodetypes="ccccccccccccc" />
   </g>
 </svg>

deluge/data/pixmaps/deluge.xpm

@@ -0,0 +1,433 @@
+/* XPM */
+static char * deluge_xpm[] = {
+"32 32 398 2",
+"  	c None",
+". 	c #7B869E",
+"+ 	c #7B869D",
+"@ 	c #A5ADBE",
+"# 	c #A7AFBE",
+"$ 	c #8894A9",
+"% 	c #A4ADBD",
+"& 	c #A7AFBF",
+"* 	c #95A0B4",
+"= 	c #6F7E99",
+"- 	c #A0AABD",
+"; 	c #8594AD",
+"> 	c #8A98B1",
+", 	c #A7B3C6",
+"' 	c #8496AF",
+") 	c #5B6F90",
+"! 	c #8F9EB6",
+"~ 	c #8194AF",
+"{ 	c #7C91AF",
+"] 	c #8096B3",
+"^ 	c #859BB8",
+"/ 	c #A0B1C8",
+"( 	c #728CAD",
+"_ 	c #758BAA",
+": 	c #849AB7",
+"< 	c #6F8AAE",
+"[ 	c #7591B3",
+"} 	c #7995B8",
+"| 	c #7A97B9",
+"1 	c #86A0C0",
+"2 	c #93ABC7",
+"3 	c #6585AE",
+"4 	c #5A78A0",
+"5 	c #879FBE",
+"6 	c #6485AF",
+"7 	c #698CB5",
+"8 	c #6E91BA",
+"9 	c #7295BD",
+"0 	c #7497BF",
+"a 	c #7296BF",
+"b 	c #89A6C8",
+"c 	c #809FC4",
+"d 	c #436B9C",
+"e 	c #7B99BE",
+"f 	c #5378A6",
+"g 	c #446A9A",
+"h 	c #4B6F9C",
+"i 	c #5577A2",
+"j 	c #6183AE",
+"k 	c #6D92BD",
+"l 	c #7097C3",
+"m 	c #6E96C1",
+"n 	c #8DACCF",
+"o 	c #6C93BF",
+"p 	c #587DA9",
+"q 	c #446592",
+"r 	c #1B4075",
+"s 	c #204478",
+"t 	c #2F5081",
+"u 	c #496791",
+"v 	c #4F6B94",
+"w 	c #5879A4",
+"x 	c #6B93BE",
+"y 	c #6E97C2",
+"z 	c #8EADCF",
+"A 	c #5E89BA",
+"B 	c #3E669A",
+"C 	c #567198",
+"D 	c #24477A",
+"E 	c #315281",
+"F 	c #365685",
+"G 	c #3A5A86",
+"H 	c #405E8A",
+"I 	c #567197",
+"J 	c #577298",
+"K 	c #516E97",
+"L 	c #6187B3",
+"M 	c #7098C4",
+"N 	c #85A7CC",
+"O 	c #5280B6",
+"P 	c #305C92",
+"Q 	c #5A759B",
+"R 	c #2B4D7E",
+"S 	c #3B5A88",
+"T 	c #4C6991",
+"U 	c #597397",
+"V 	c #60799D",
+"W 	c #5C769A",
+"X 	c #587298",
+"Y 	c #637C9E",
+"Z 	c #5D769B",
+"` 	c #526F96",
+" .	c #5B84B0",
+"..	c #759BC6",
+"+.	c #7398C4",
+"@.	c #325D95",
+"#.	c #4C6A94",
+"$.	c #3B5B87",
+"%.	c #44628C",
+"&.	c #5B7599",
+"*.	c #6D84A5",
+"=.	c #647D9F",
+"-.	c #6784A8",
+";.	c #7194BD",
+">.	c #769EC9",
+",.	c #709AC4",
+"'.	c #7293B8",
+").	c #6D86A9",
+"!.	c #526E96",
+"~.	c #5782B1",
+"{.	c #7A9EC8",
+"].	c #5D8ABC",
+"^.	c #325485",
+"/.	c #4F6C94",
+"(.	c #3D5C88",
+"_.	c #5E779B",
+":.	c #7489A8",
+"<.	c #667FA1",
+"[.	c #8BA3C1",
+"}.	c #8BAED4",
+"|.	c #83A9D3",
+"1.	c #82A8D2",
+"2.	c #7FA6D1",
+"3.	c #7CA4CE",
+"4.	c #7AA0CC",
+"5.	c #708EB4",
+"6.	c #5F789C",
+"7.	c #4E6C96",
+"8.	c #5986B9",
+"9.	c #7FA2CA",
+"0.	c #4B7CB2",
+"a.	c #2B5387",
+"b.	c #567199",
+"c.	c #305282",
+"d.	c #506B93",
+"e.	c #7187A5",
+"f.	c #6F85A3",
+"g.	c #8EA4BF",
+"h.	c #9DBBDC",
+"i.	c #8EB2D9",
+"j.	c #8DB1D8",
+"k.	c #8AAED6",
+"l.	c #84AAD3",
+"m.	c #7EA5D0",
+"n.	c #779FCC",
+"o.	c #6C8BB0",
+"p.	c #5E779A",
+"q.	c #5178A6",
+"r.	c #5C89BC",
+"s.	c #7198C4",
+"t.	c #325486",
+"u.	c #4C6993",
+"v.	c #5E789B",
+"w.	c #778CA8",
+"x.	c #7389A7",
+"y.	c #B6CADF",
+"z.	c #9ABBDF",
+"A.	c #9BBCE0",
+"B.	c #9ABCDF",
+"C.	c #97B9DE",
+"D.	c #93B6DB",
+"E.	c #8CB1D8",
+"F.	c #85ABD4",
+"G.	c #7CA4CF",
+"H.	c #749BC9",
+"I.	c #6783A6",
+"J.	c #56739C",
+"K.	c #5283B8",
+"L.	c #6F96C3",
+"M.	c #4E7BAE",
+"N.	c #42618D",
+"O.	c #3E5C88",
+"P.	c #667E9F",
+"Q.	c #7288A7",
+"R.	c #8EA1BA",
+"S.	c #B9CFE7",
+"T.	c #A6C5E6",
+"U.	c #A7C6E6",
+"V.	c #A5C4E6",
+"W.	c #A1C1E3",
+"X.	c #93B6DC",
+"Y.	c #8AAFD7",
+"Z.	c #80A7D1",
+"`.	c #769FCC",
+" +	c #6992BF",
+".+	c #5D789D",
+"++	c #5483B9",
+"@+	c #5281B7",
+"#+	c #688FBB",
+"$+	c #557198",
+"%+	c #1E4277",
+"&+	c #3F5E88",
+"*+	c #687FA0",
+"=+	c #6F85A5",
+"-+	c #A0B2C8",
+";+	c #BFD5ED",
+">+	c #B3CFED",
+",+	c #B2CFED",
+"'+	c #AFCCEB",
+")+	c #A9C8E8",
+"!+	c #A2C2E4",
+"~+	c #99BADF",
+"{+	c #78A1CD",
+"]+	c #6C97C6",
+"^+	c #5D88B7",
+"/+	c #4779B2",
+"(+	c #7295BE",
+"_+	c #3C6699",
+":+	c #2B4F83",
+"<+	c #59749A",
+"[+	c #657D9E",
+"}+	c #6C83A3",
+"|+	c #A3B4CA",
+"1+	c #C7DDF2",
+"2+	c #BFD9F4",
+"3+	c #BDD7F2",
+"4+	c #B8D3F0",
+"5+	c #B0CDEC",
+"6+	c #9CBDE0",
+"7+	c #91B4DA",
+"8+	c #79A1CD",
+"9+	c #5F8DBF",
+"0+	c #4578B1",
+"a+	c #6B90BA",
+"b+	c #446A9B",
+"c+	c #2D5184",
+"d+	c #577299",
+"e+	c #305181",
+"f+	c #5B749A",
+"g+	c #6C82A2",
+"h+	c #98AAC3",
+"i+	c #D2E5F6",
+"j+	c #CAE2FA",
+"k+	c #C6DEF8",
+"l+	c #BED8F3",
+"m+	c #B4D0EE",
+"n+	c #9EBEE1",
+"o+	c #92B5DB",
+"p+	c #78A0CD",
+"q+	c #6B96C5",
+"r+	c #5D8BBE",
+"s+	c #5081B7",
+"t+	c #4276AF",
+"u+	c #6489B4",
+"v+	c #4B6E9B",
+"w+	c #2C5284",
+"x+	c #234679",
+"y+	c #4C6990",
+"z+	c #6C82A3",
+"A+	c #738AA9",
+"B+	c #D9E9F9",
+"C+	c #D3E9FF",
+"D+	c #CCE3FB",
+"E+	c #C2DBF5",
+"F+	c #B6D2EF",
+"G+	c #AAC8E8",
+"H+	c #9DBEE1",
+"I+	c #90B3DA",
+"J+	c #759ECB",
+"K+	c #6893C4",
+"L+	c #5A89BC",
+"M+	c #4D7EB5",
+"N+	c #3F73AD",
+"O+	c #6386B1",
+"P+	c #486A96",
+"Q+	c #2A5082",
+"R+	c #58739A",
+"S+	c #375685",
+"T+	c #5F789B",
+"U+	c #ADBED3",
+"V+	c #D4E9FE",
+"W+	c #CFE6FD",
+"X+	c #C2DCF6",
+"Y+	c #A8C7E7",
+"Z+	c #719BC9",
+"`+	c #6490C1",
+" @	c #5685BA",
+".@	c #487AB2",
+"+@	c #3F70A8",
+"@@	c #6B8BB2",
+"#@	c #3F608D",
+"$@	c #536F97",
+"%@	c #1F4377",
+"&@	c #224679",
+"*@	c #46638D",
+"=@	c #6880A0",
+"-@	c #6F86A5",
+";@	c #BBCDE0",
+">@	c #CEE4FC",
+",@	c #C0DAF4",
+"'@	c #A5C4E5",
+")@	c #96B9DD",
+"!@	c #88AED6",
+"~@	c #7CA3CE",
+"{@	c #719BC8",
+"]@	c #6692C2",
+"^@	c #5987BA",
+"/@	c #4C7CB3",
+"(@	c #4672A5",
+"_@	c #728DB1",
+":@	c #385884",
+"<@	c #3C5C89",
+"[@	c #385886",
+"}@	c #26497B",
+"|@	c #4B6790",
+"1@	c #6980A1",
+"2@	c #768BA9",
+"3@	c #9CB1CA",
+"4@	c #B9D3EE",
+"5@	c #ADCAEA",
+"6@	c #9EBFE2",
+"7@	c #90B4DA",
+"8@	c #87ACD5",
+"9@	c #7EA4CE",
+"0@	c #749CC8",
+"a@	c #6993C1",
+"b@	c #5C89BB",
+"c@	c #4F7DB1",
+"d@	c #5D80AC",
+"e@	c #617EA4",
+"f@	c #3A547B",
+"g@	c #2A4C7E",
+"h@	c #1C4176",
+"i@	c #27497B",
+"j@	c #45628D",
+"k@	c #60799C",
+"l@	c #7288A6",
+"m@	c #7D91AD",
+"n@	c #859FBE",
+"o@	c #93B4D7",
+"p@	c #8FB2D8",
+"q@	c #86ABD2",
+"r@	c #7EA4CD",
+"s@	c #759CC8",
+"t@	c #6A94C2",
+"u@	c #5C89BA",
+"v@	c #547EAE",
+"w@	c #7994B6",
+"x@	c #44628A",
+"y@	c #375786",
+"z@	c #476590",
+"A@	c #4C6890",
+"B@	c #5B7498",
+"C@	c #667EA0",
+"D@	c #6F86A7",
+"E@	c #738CAD",
+"F@	c #7592B7",
+"G@	c #779AC1",
+"H@	c #779DC7",
+"I@	c #6993C0",
+"J@	c #5B86B6",
+"K@	c #7B97BB",
+"L@	c #5A769E",
+"M@	c #394E6E",
+"N@	c #21426C",
+"O@	c #45638E",
+"P@	c #496691",
+"Q@	c #1D4176",
+"R@	c #41608B",
+"S@	c #4C6891",
+"T@	c #506D95",
+"U@	c #4E6B94",
+"V@	c #4B6A95",
+"W@	c #5176A3",
+"X@	c #7C99BC",
+"Y@	c #6280A8",
+"Z@	c #3E567A",
+"`@	c #25446F",
+" #	c #395987",
+".#	c #214579",
+"+#	c #294C7E",
+"@#	c #315383",
+"##	c #3D5C8A",
+"$#	c #43618D",
+"%#	c #5C769C",
+"&#	c #6D84A6",
+"*#	c #405E8B",
+"=#	c #375179",
+"-#	c #1B304F",
+";#	c #2E5181",
+">#	c #415F8C",
+",#	c #547098",
+"'#	c #486590",
+")#	c #43618E",
+"!#	c #476690",
+"~#	c #6981A4",
+"{#	c #677FA3",
+"]#	c #496690",
+"^#	c #2E5283",
+"/#	c #294467",
+"(#	c #32507C",
+"_#	c #325684",
+":#	c #335484",
+"<#	c #3F5E8B",
+"[#	c #3E5F8D",
+"}#	c #345887",
+"|#	c #305383",
+"1#	c #2A4466",
+"                                                                ",
+"                              . +                               ",
+"                              @ #                               ",
+"                            $ % & *                             ",
+"                          = - ; > , '                           ",
+"                        ) ! ~ { ] ^ / (                         ",
+"                        _ : < [ } | 1 2 3                       ",
+"                      4 5 6 7 8 9 0 a b c                       ",
+"                    d e f g h i j k l m n o                     ",
+"                    p q r r s t u v w x y z A                   ",
+"                  B C r D E F G H I J K L M N O                 ",
+"                P Q R S T U V W I X Y Z `  ...+.                ",
+"              @.#.$.%.&.*.=.-.;.>.,.'.).V !.~.{.].              ",
+"              ^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.            ",
+"            a.b.c.d.e.f.g.h.i.i.j.k.l.m.n.o.p.q.r.s.            ",
+"            t.u.F v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.          ",
+"            N.c.O.P.Q.R.S.T.U.V.W.A.X.Y.Z.`. +.+++@+#+          ",
+"            $+%+&+*+=+-+;+>+,+'+)+!+~+i.|.{+]+^+++/+(+_+        ",
+"          :+<+r G [+}+|+1+2+3+4+5+T.6+7+F.8+]+9+K.0+a+b+        ",
+"          c+d+r e+f+g+h+i+j+k+l+m+)+n+o+l.p+q+r+s+t+u+v+        ",
+"          w+Q r x+y+z+A+B+C+D+E+F+G+H+I+|.J+K+L+M+N+O+P+        ",
+"          Q+R+r r S+T+*+U+V+W+X+F+Y+A.j.2.Z+`+ @.@+@@@#@        ",
+"            $@%@r &@*@=@-@;@>@,@,+'@)@!@~@{@]@^@/@(@_@:@        ",
+"            <@[@r r }@|@1@2@3@4@5@6@7@8@9@0@a@b@c@d@e@f@        ",
+"            g@b.h@r r i@j@k@l@m@n@o@p@q@r@s@t@u@v@w@x@          ",
+"              y@z@r r r %@y@A@B@C@D@E@F@G@H@I@J@K@L@M@          ",
+"              N@O@P@Q@r r r s e+R@S@T@` U@V@W@X@Y@Z@            ",
+"                `@ #Q y@Q@r r .#+#@#[@##$#%#&#*#=#              ",
+"                  -#;#>#d+,#'#)#!#u.Q ~#{#]#^#/#                ",
+"                        (#_#:# #<#$#[#}#|#1#                    ",
+"                                                                ",
+"                                                                "};

deluge/data/pixmaps/dht.svg

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/andrew"
+   sodipodi:docname="dht.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/dht16.png"
+   inkscape:export-xdpi="1.9579109"
+   inkscape:export-ydpi="1.9579109">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10561" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="217.74745"
+     inkscape:cy="658.24369"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1024"
+     inkscape:window-height="711"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     showgrid="false" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#8dd35f;fill-opacity:1;stroke:#000000;stroke-width:2.48568825;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3437"
+       sodipodi:cx="325.71429"
+       sodipodi:cy="215.21933"
+       sodipodi:rx="85.714287"
+       sodipodi:ry="85.714287"
+       d="M 411.42858,215.21933 A 85.714287,85.714287 0 1 1 240.00001,215.21933 A 85.714287,85.714287 0 1 1 411.42858,215.21933 z"
+       transform="matrix(1.6800176,0,0,1.6800176,-275.15013,-73.06899)"
+       inkscape:export-filename="/home/andrew/dht16-2.png"
+       inkscape:export-xdpi="3.8918922"
+       inkscape:export-ydpi="3.8918922" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#5599ff;fill-opacity:1;stroke:#000000;stroke-width:2.81711386;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3439"
+       sodipodi:cx="325.71429"
+       sodipodi:cy="215.21933"
+       sodipodi:rx="85.714287"
+       sodipodi:ry="85.714287"
+       d="M 411.42858,215.21933 A 85.714287,85.714287 0 1 1 240.00001,215.21933 A 85.714287,85.714287 0 1 1 411.42858,215.21933 z"
+       transform="matrix(1.4823682,0,0,1.4823682,82.877111,311.11956)"
+       inkscape:export-filename="/home/andrew/dht16-2.png"
+       inkscape:export-xdpi="3.8918922"
+       inkscape:export-ydpi="3.8918922" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#8dd35f;fill-opacity:1;stroke:#000000;stroke-width:3.2505155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3441"
+       sodipodi:cx="325.71429"
+       sodipodi:cy="215.21933"
+       sodipodi:rx="85.714287"
+       sodipodi:ry="85.714287"
+       d="M 411.42858,215.21933 A 85.714287,85.714287 0 1 1 240.00001,215.21933 A 85.714287,85.714287 0 1 1 411.42858,215.21933 z"
+       transform="matrix(1.2847193,0,0,1.2847193,-104.04248,489.18828)"
+       inkscape:export-filename="/home/andrew/dht16-2.png"
+       inkscape:export-xdpi="3.8918922"
+       inkscape:export-ydpi="3.8918922" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#5599ff;fill-opacity:1;stroke:#000000;stroke-width:3.29273035;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3443"
+       sodipodi:cx="325.71429"
+       sodipodi:cy="215.21933"
+       sodipodi:rx="85.714287"
+       sodipodi:ry="85.714287"
+       d="M 411.42858,215.21933 A 85.714287,85.714287 0 1 1 240.00001,215.21933 A 85.714287,85.714287 0 1 1 411.42858,215.21933 z"
+       transform="matrix(1.2682484,0,0,1.2682484,-282.25061,288.22576)"
+       inkscape:export-filename="/home/andrew/dht16-2.png"
+       inkscape:export-xdpi="3.8918922"
+       inkscape:export-ydpi="3.8918922" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:4.08935796;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3445"
+       sodipodi:cx="325.71429"
+       sodipodi:cy="215.21933"
+       sodipodi:rx="85.714287"
+       sodipodi:ry="85.714287"
+       d="M 411.42858,215.21933 A 85.714287,85.714287 0 1 1 240.00001,215.21933 A 85.714287,85.714287 0 1 1 411.42858,215.21933 z"
+       transform="matrix(1.0211872,0,0,1.0211872,244.38469,139.31302)"
+       inkscape:export-filename="/home/andrew/dht16-2.png"
+       inkscape:export-xdpi="3.8918922"
+       inkscape:export-ydpi="3.8918922" />
+    <path
+       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10.04848194;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 409.97291,329.4348 L 487.75261,344.44338"
+       id="path3691"
+       inkscape:export-filename="/home/andrew/dht16-2.png"
+       inkscape:export-xdpi="3.8918922"
+       inkscape:export-ydpi="3.8918922"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8.96934509;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 423.06163,747.83054 L 464.53048,708.21583"
+       id="path3693"
+       inkscape:export-filename="/home/andrew/dht16-2.png"
+       inkscape:export-xdpi="3.8918922"
+       inkscape:export-ydpi="3.8918922"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:11.37722969;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 315.62445,431.58184 L 310.19863,651.84005"
+       id="path3695"
+       inkscape:export-filename="/home/andrew/dht16-2.png"
+       inkscape:export-xdpi="3.8918922"
+       inkscape:export-ydpi="3.8918922"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10.04848194;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 143.15025,452.25537 L 171.01599,395.38786"
+       id="path3697"
+       inkscape:export-filename="/home/andrew/dht16-2.png"
+       inkscape:export-xdpi="3.8918922"
+       inkscape:export-ydpi="3.8918922"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:11.37722969;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 360.45007,405.53416 L 474.8177,539.94039"
+       id="path3699"
+       inkscape:export-filename="/home/andrew/dht16-2.png"
+       inkscape:export-xdpi="3.8918922"
+       inkscape:export-ydpi="3.8918922"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>

deluge/data/pixmaps/downloading.svg

@@ -2,349 +2,89 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3440"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg3535"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="/home/andrew/Projects/deluge-icons"
-   sodipodi:docname="downloading-border.svg"
-   inkscape:export-filename="/home/andrew/Projects/deluge-icons/downloading16.png"
-   inkscape:export-xdpi="32.603073"
-   inkscape:export-ydpi="32.603073"
+   inkscape:version="0.46"
+   inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/downloading16.png"
+   inkscape:export-xdpi="1.7075963"
+   inkscape:export-ydpi="1.7075963"
+   sodipodi:docname="downloading.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2973">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2975" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop2977" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4128" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.16494845;"
-         offset="1.0000000"
-         id="stop4130" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4114">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4116" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4118" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3962">
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop3964" />
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.15517241"
-         id="stop4134" />
-      <stop
-         style="stop-color:#4074ae;stop-opacity:1.0000000;"
-         offset="0.75000000"
-         id="stop4346" />
-      <stop
-         style="stop-color:#36486c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3966" />
-    </linearGradient>
-    <radialGradient
-       r="13.994944"
-       fy="33.506763"
-       fx="-10.089286"
-       cy="33.506763"
-       cx="-10.089286"
-       gradientTransform="matrix(1,0,0,0.791446,-14.01786,-11.28667)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4019"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       r="14.057444"
-       fy="31.329016"
-       fx="-10.323107"
-       cy="31.329016"
-       cx="-10.323107"
-       gradientTransform="matrix(1,0,0,0.792374,-19.58761,2.818569)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4004"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.792374,0,6.785475)"
-       r="14.057444"
-       fy="31.329016"
-       fx="-10.323107"
-       cy="31.329016"
-       cx="-10.323107"
-       id="radialGradient3999"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.341185,-0.153831,1.08001,2.395374,-15.42222,-25.62103)"
-       r="13.994946"
-       fy="24.241488"
-       fx="61.662098"
-       cy="24.241488"
-       cx="61.662098"
-       id="radialGradient3943"
-       xlink:href="#linearGradient1312"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient1312">
-      <stop
-         id="stop1314"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop1316"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3993">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3995" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop3997" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2973"
-       id="radialGradient3866"
-       cx="-22.375"
-       cy="18.499998"
-       fx="-22.375"
-       fy="18.499998"
-       r="14.33462"
-       gradientTransform="matrix(1,0,0,1.140022,40.17678,1.347091)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="12.289036"
-       fy="63.965388"
-       fx="15.115514"
-       cy="63.965388"
-       cx="15.115514"
-       gradientTransform="scale(1.643990,0.608276)"
-       id="radialGradient5000"
-       xlink:href="#linearGradient4114"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4989">
-      <stop
-         id="stop4991"
-         offset="0.0000000"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4993"
-         offset="0.15517241"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4995"
-         offset="0.75000000"
-         style="stop-color:#4074ae;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4997"
-         offset="1.0000000"
-         style="stop-color:#36486c;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4977">
-      <stop
-         id="stop4979"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4981"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.16494845;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4825"
-       inkscape:collect="always">
-      <stop
-         id="stop4827"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop4829"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4114"
-       id="radialGradient6090"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.64399,0.608276)"
-       cx="15.115514"
-       cy="63.965388"
-       fx="15.115514"
-       fy="63.965388"
-       r="12.289036" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4825"
-       id="radialGradient6098"
-       gradientUnits="userSpaceOnUse"
-       cx="12.071323"
-       cy="12.493138"
-       fx="12.071323"
-       fy="12.493138"
-       r="6.7175145" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2973"
-       id="radialGradient6103"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.25463,-0.898371,0.979785,0.277703,-18.00903,32.03312)"
-       cx="17.903898"
-       cy="40.159222"
-       fx="17.903898"
-       fy="40.159222"
-       r="14.33681" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2973"
-       id="radialGradient6106"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.583269,-0.431533,0.577146,0.78008,-5.80022,4.004109)"
-       cx="12.525543"
-       cy="38.09042"
-       fx="12.525543"
-       fy="38.09042"
-       r="14.33681" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1312"
-       id="radialGradient6109"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.768231,1.13675,-0.820972,0.554824,-3.72248,-85.07126)"
-       cx="65.800331"
-       cy="27.16758"
-       fx="65.800331"
-       fy="27.16758"
-       r="12.972491" />
+     id="defs3537">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3543" />
   </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="0.17254902"
-     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="34.258571"
-     inkscape:cy="32.884169"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="183.87749"
+     inkscape:cy="492.74541"
+     inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1266"
-     inkscape:window-height="944"
-     inkscape:window-x="12"
-     inkscape:window-y="34"
-     inkscape:showpageshadow="false" />
+     inkscape:window-width="686"
+     inkscape:window-height="711"
+     inkscape:window-x="1941"
+     inkscape:window-y="99" />
   <metadata
-     id="metadata4">
+     id="metadata3540">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Internet Category</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Tuomas Kuosmanen</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>internet</rdf:li>
-            <rdf:li>tools</rdf:li>
-            <rdf:li>applications</rdf:li>
-            <rdf:li>category</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     id="layer1">
     <path
-       style="fill:#8dd35f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 23.942923,0.9561338 L 37.330543,18.266721 C 46.998995,29.84687 41.49692,43.923891 26.7742,45.000491 C 6.0597413,45.582655 6.5086231,27.37483 11.255313,18.609381 L 23.942923,0.9561338 z "
+       style="fill:#8dd35f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891000000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 337.34641,113.574 L 612.77782,444.9064 C 811.69255,666.55556 698.49522,935.996 395.596,956.6026 C -30.5748,967.74548 -7.5325,620.6669 110.06775,461.45596 L 337.34641,113.574 z"
        id="path2069"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
     <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
-       d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z "
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:21.67123985;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
+       d="M 339.91139,163.01784 L 587.46485,461.81598 C 776.20058,681.7222 655.61789,907.17006 386.12406,928.1221 C 6.36766,937.82375 31.27865,636.36028 127.47397,487.30722 L 339.91139,163.01784 z"
        id="path2071"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
     <path
-       style="fill:#b7e399;fill-opacity:1;stroke:#000000;stroke-opacity:1;marker-end:none;stroke-width:0.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-linecap:round;stroke-linejoin:round"
-       d="M 19.34375 17.5625 C 19.34375 21.552083 19.34375 25.541668 19.34375 29.53125 C 17.636839 29.528128 15.925661 29.534372 14.21875 29.53125 C 17.623975 32.921687 21.032275 36.297063 24.4375 39.6875 C 27.880752 36.309591 31.337996 32.94041 34.78125 29.5625 C 32.928627 29.559111 31.071373 29.565889 29.21875 29.5625 C 29.21875 25.5625 29.21875 21.562501 29.21875 17.5625 C 25.927083 17.5625 22.635418 17.562501 19.34375 17.5625 z "
-       id="rect2634" />
+       style="fill:#b7e399;fill-opacity:1;stroke:#000000;stroke-width:14.10382843;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 362.09611,847.31541 C 292.72038,779.25618 223.06258,711.37264 153.68685,643.3136 C 191.01405,643.2453 228.43453,643.3817 265.76192,643.3136 C 265.76192,562.7203 265.76192,482.12699 265.76192,401.53369 C 332.08337,401.53369 398.40502,401.53369 464.72665,401.53369 C 464.72665,481.91704 464.72665,562.30041 464.72665,642.68397 C 499.11804,642.62091 533.59544,642.74683 567.98683,642.68397 C 499.37714,710.99547 430.70559,779.00372 362.09611,847.31541 z"
+       id="rect2634"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
   </g>
 </svg>

deluge/data/pixmaps/flags/FLAGS_LICENCE

@@ -1,2 +0,0 @@
-Flag images found at http://www.hahn-hotel.com/flags/
-"All sets provided by us are free to use to anyone, for commercial or non-commercial websites."

deluge/data/pixmaps/inactive.svg

@@ -2,283 +2,86 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3440"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg8143"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="/home/andrew/Projects/deluge-icons"
-   sodipodi:docname="inactive-border.svg"
-   inkscape:export-filename="/home/andrew/Projects/deluge-icons/inactive16.png"
-   inkscape:export-xdpi="32.603073"
-   inkscape:export-ydpi="32.603073"
+   inkscape:version="0.46"
+   inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/inactive16.png"
+   inkscape:export-xdpi="1.7060417"
+   inkscape:export-ydpi="1.7060417"
+   sodipodi:docname="inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2973">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2975" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop2977" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4128" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.16494845;"
-         offset="1.0000000"
-         id="stop4130" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4114">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4116" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4118" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3962">
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop3964" />
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.15517241"
-         id="stop4134" />
-      <stop
-         style="stop-color:#4074ae;stop-opacity:1.0000000;"
-         offset="0.75000000"
-         id="stop4346" />
-      <stop
-         style="stop-color:#36486c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3966" />
-    </linearGradient>
-    <radialGradient
-       r="13.994944"
-       fy="33.506763"
-       fx="-10.089286"
-       cy="33.506763"
-       cx="-10.089286"
-       gradientTransform="matrix(1,0,0,0.791446,-14.01786,-11.28667)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4019"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       r="14.057444"
-       fy="31.329016"
-       fx="-10.323107"
-       cy="31.329016"
-       cx="-10.323107"
-       gradientTransform="matrix(1,0,0,0.792374,-19.58761,2.818569)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4004"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.792374,0,6.785475)"
-       r="14.057444"
-       fy="31.329016"
-       fx="-10.323107"
-       cy="31.329016"
-       cx="-10.323107"
-       id="radialGradient3999"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.341185,-0.153831,1.08001,2.395374,-15.42222,-25.62103)"
-       r="13.994946"
-       fy="24.241488"
-       fx="61.662098"
-       cy="24.241488"
-       cx="61.662098"
-       id="radialGradient3943"
-       xlink:href="#linearGradient1312"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient1312">
-      <stop
-         id="stop1314"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop1316"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3993">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3995" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop3997" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2973"
-       id="radialGradient3866"
-       cx="-22.375"
-       cy="18.499998"
-       fx="-22.375"
-       fy="18.499998"
-       r="14.33462"
-       gradientTransform="matrix(1,0,0,1.140022,40.17678,1.347091)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="12.289036"
-       fy="63.965388"
-       fx="15.115514"
-       cy="63.965388"
-       cx="15.115514"
-       gradientTransform="scale(1.643990,0.608276)"
-       id="radialGradient5000"
-       xlink:href="#linearGradient4114"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4989">
-      <stop
-         id="stop4991"
-         offset="0.0000000"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4993"
-         offset="0.15517241"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4995"
-         offset="0.75000000"
-         style="stop-color:#4074ae;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4997"
-         offset="1.0000000"
-         style="stop-color:#36486c;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4977">
-      <stop
-         id="stop4979"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4981"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.16494845;" />
-    </linearGradient>
+     id="defs8145">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective8151" />
   </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="0.17254902"
-     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="36.250498"
-     inkscape:cy="23.072085"
+     inkscape:zoom="0.35"
+     inkscape:cx="873.57143"
+     inkscape:cy="520"
+     inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1278"
-     inkscape:window-height="978"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:showpageshadow="false" />
+     inkscape:window-width="686"
+     inkscape:window-height="711"
+     inkscape:window-x="1280"
+     inkscape:window-y="0" />
   <metadata
-     id="metadata4">
+     id="metadata8148">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Internet Category</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Tuomas Kuosmanen</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>internet</rdf:li>
-            <rdf:li>tools</rdf:li>
-            <rdf:li>applications</rdf:li>
-            <rdf:li>category</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     id="layer1">
     <path
-       style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 23.854535,1.0445221 L 37.242155,18.355109 C 46.910607,29.935258 41.408532,44.012279 26.685812,45.088879 C 5.971353,45.671043 6.4202348,27.463218 11.166925,18.697769 L 23.854535,1.0445221 z "
+       style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891000000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 335.10794,116.43168 L 610.53935,447.76408 C 809.45408,669.41324 696.25675,938.85368 393.35753,959.46028 C -32.813273,970.60316 -9.7709676,623.52458 107.82928,464.31364 L 335.10794,116.43168 z"
        id="path2069"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
     <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
-       d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z "
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:21.67123984999999919;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022000000000"
+       d="M 337.67292,165.87552 L 585.22638,464.67366 C 773.96211,684.57988 653.37942,910.02774 383.88559,930.97978 C 4.1291863,940.68143 29.040179,639.21796 125.2355,490.1649 L 337.67292,165.87552 z"
        id="path2071"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
     <g
        id="g3590"
-       transform="matrix(0.9616363,0,0,0.855461,0.9207282,3.9296533)">
+       transform="matrix(20.545052,0,0,22.803542,-135.93838,20.962309)">
       <rect
          y="19.754131"
          x="14.548919"

deluge/data/pixmaps/queued.svg

@@ -2,294 +2,86 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3440"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg9374"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="/home/andrew/Projects/deluge/branches/deluge-0.6/deluge/data/pixmaps"
+   inkscape:version="0.46"
+   inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/queued16.png"
+   inkscape:export-xdpi="1.7309855"
+   inkscape:export-ydpi="1.7309855"
    sodipodi:docname="queued.svg"
-   inkscape:export-filename="/home/andrew/Projects/deluge-icons/queued16.png"
-   inkscape:export-xdpi="32.684196"
-   inkscape:export-ydpi="32.684196"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2973">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2975" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop2977" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4128" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.16494845;"
-         offset="1.0000000"
-         id="stop4130" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4114">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4116" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4118" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3962">
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop3964" />
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.15517241"
-         id="stop4134" />
-      <stop
-         style="stop-color:#4074ae;stop-opacity:1.0000000;"
-         offset="0.75000000"
-         id="stop4346" />
-      <stop
-         style="stop-color:#36486c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3966" />
-    </linearGradient>
-    <radialGradient
-       r="13.994944"
-       fy="33.506763"
-       fx="-10.089286"
-       cy="33.506763"
-       cx="-10.089286"
-       gradientTransform="matrix(1,0,0,0.791446,-14.01786,-11.28667)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4019"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       r="14.057444"
-       fy="31.329016"
-       fx="-10.323107"
-       cy="31.329016"
-       cx="-10.323107"
-       gradientTransform="matrix(1,0,0,0.792374,-19.58761,2.818569)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4004"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.792374,0,6.785475)"
-       r="14.057444"
-       fy="31.329016"
-       fx="-10.323107"
-       cy="31.329016"
-       cx="-10.323107"
-       id="radialGradient3999"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.341185,-0.153831,1.08001,2.395374,-15.42222,-25.62103)"
-       r="13.994946"
-       fy="24.241488"
-       fx="61.662098"
-       cy="24.241488"
-       cx="61.662098"
-       id="radialGradient3943"
-       xlink:href="#linearGradient1312"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient1312">
-      <stop
-         id="stop1314"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop1316"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3993">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3995" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop3997" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2973"
-       id="radialGradient3866"
-       cx="-22.375"
-       cy="18.499998"
-       fx="-22.375"
-       fy="18.499998"
-       r="14.33462"
-       gradientTransform="matrix(1,0,0,1.140022,40.17678,1.347091)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="12.289036"
-       fy="63.965388"
-       fx="15.115514"
-       cy="63.965388"
-       cx="15.115514"
-       gradientTransform="scale(1.643990,0.608276)"
-       id="radialGradient5000"
-       xlink:href="#linearGradient4114"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4989">
-      <stop
-         id="stop4991"
-         offset="0.0000000"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4993"
-         offset="0.15517241"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4995"
-         offset="0.75000000"
-         style="stop-color:#4074ae;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4997"
-         offset="1.0000000"
-         style="stop-color:#36486c;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4977">
-      <stop
-         id="stop4979"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4981"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.16494845;" />
-    </linearGradient>
+     id="defs9376">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective9382" />
   </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="0.17254902"
-     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="18.120679"
-     inkscape:cy="25.176047"
+     inkscape:zoom="0.35"
+     inkscape:cx="726.34279"
+     inkscape:cy="746.86589"
+     inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="974"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:showpageshadow="false"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="vertical"
-       position="8.375"
-       id="guide4206" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="42.125"
-       id="guide2203" />
-  </sodipodi:namedview>
+     inkscape:window-width="686"
+     inkscape:window-height="711"
+     inkscape:window-x="1859"
+     inkscape:window-y="122" />
   <metadata
-     id="metadata4">
+     id="metadata9379">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Internet Category</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Tuomas Kuosmanen</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>internet</rdf:li>
-            <rdf:li>tools</rdf:li>
-            <rdf:li>applications</rdf:li>
-            <rdf:li>category</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     id="layer1">
     <path
-       style="fill:#d0b31d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 23.854535,1.0445221 L 37.242155,18.355109 C 46.910607,29.935258 41.408532,44.012279 26.685812,45.088879 C 5.971353,45.671043 6.4202348,27.463218 11.166925,18.697769 L 23.854535,1.0445221 z "
+       style="fill:#bfba14;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891000000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 335.10794,116.43168 L 610.53935,447.76408 C 809.45408,669.41324 696.25675,938.85368 393.35753,959.46028 C -32.813273,970.60316 -9.7709676,623.52458 107.82928,464.31364 L 335.10794,116.43168 z"
        id="path2069"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
     <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
-       d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z "
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:21.67123984999999919;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022000000000"
+       d="M 337.67292,165.87552 L 585.22638,464.67366 C 773.96211,684.57988 653.37942,910.02774 383.88559,930.97978 C 4.1291863,940.68143 29.040179,639.21796 125.2355,490.1649 L 337.67292,165.87552 z"
        id="path2071"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
     <path
-       style="fill:#e1cf6f;fill-opacity:1;stroke:#000000;stroke-width:0.56882578;stroke-linecap:round;stroke-linejoin:round;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 24.821384,15.512309 C 22.21433,17.952223 19.604921,20.381297 16.997867,22.821211 C 18.304685,22.818964 19.61477,22.823457 20.921589,22.821211 C 20.921589,25.684801 20.921589,28.548391 20.921589,31.411981 C 19.61477,31.409734 18.304685,31.414228 16.997867,31.411981 C 19.604921,33.851895 22.21433,36.280969 24.821384,38.720883 C 27.457552,36.289986 30.104432,33.865368 32.740602,31.43447 C 31.322226,31.432031 29.900305,31.43691 28.481929,31.43447 C 28.481929,28.555887 28.481929,25.677306 28.481929,22.798722 C 29.900305,22.796282 31.322226,22.80116 32.740602,22.798722 C 30.104432,20.367823 27.457552,17.943206 24.821384,15.512309 z "
+       style="fill:#d6d36a;fill-opacity:1;stroke:#000000;stroke-width:12.60815144000000032;stroke-linecap:round;stroke-linejoin:round;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 356.08237,358.00767 C 298.29629,412.08893 240.45811,465.9299 182.67226,520.01115 C 211.63823,519.96135 240.67645,520.06093 269.64241,520.01115 C 269.64241,583.48327 269.64241,646.95538 269.64241,710.42751 C 240.67645,710.3777 211.63823,710.4773 182.67226,710.42751 C 240.45811,764.50876 298.29629,818.34973 356.08237,872.43098 C 414.51345,818.5496 473.18214,764.80739 531.61344,710.92598 C 500.17495,710.87193 468.65776,710.98006 437.21906,710.92598 C 437.21906,647.12155 437.21906,583.31714 437.21906,519.51267 C 468.65776,519.45859 500.17495,519.56671 531.61344,519.51267 C 473.18214,465.63124 414.51345,411.88906 356.08237,358.00767 z"
        id="rect2634" />
   </g>
 </svg>

deluge/data/pixmaps/seeding.svg

@@ -2,349 +2,89 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3440"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2527"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="/home/andrew/Projects/deluge-icons"
-   sodipodi:docname="seeding-border.png.svg"
-   inkscape:export-filename="/home/andrew/Projects/deluge-icons/seeding16.png"
-   inkscape:export-xdpi="32.603073"
-   inkscape:export-ydpi="32.603073"
+   inkscape:version="0.46"
+   inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+   inkscape:export-xdpi="1.7075963"
+   inkscape:export-ydpi="1.7075963"
+   sodipodi:docname="seeding.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2973">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2975" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop2977" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4128" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.16494845;"
-         offset="1.0000000"
-         id="stop4130" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4114">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4116" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4118" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3962">
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop3964" />
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.15517241"
-         id="stop4134" />
-      <stop
-         style="stop-color:#4074ae;stop-opacity:1.0000000;"
-         offset="0.75000000"
-         id="stop4346" />
-      <stop
-         style="stop-color:#36486c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3966" />
-    </linearGradient>
-    <radialGradient
-       r="13.994944"
-       fy="33.506763"
-       fx="-10.089286"
-       cy="33.506763"
-       cx="-10.089286"
-       gradientTransform="matrix(1,0,0,0.791446,-14.01786,-11.28667)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4019"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       r="14.057444"
-       fy="31.329016"
-       fx="-10.323107"
-       cy="31.329016"
-       cx="-10.323107"
-       gradientTransform="matrix(1,0,0,0.792374,-19.58761,2.818569)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4004"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.792374,0,6.785475)"
-       r="14.057444"
-       fy="31.329016"
-       fx="-10.323107"
-       cy="31.329016"
-       cx="-10.323107"
-       id="radialGradient3999"
-       xlink:href="#linearGradient3993"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.341185,-0.153831,1.08001,2.395374,-15.42222,-25.62103)"
-       r="13.994946"
-       fy="24.241488"
-       fx="61.662098"
-       cy="24.241488"
-       cx="61.662098"
-       id="radialGradient3943"
-       xlink:href="#linearGradient1312"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient1312">
-      <stop
-         id="stop1314"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop1316"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3993">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3995" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop3997" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2973"
-       id="radialGradient3866"
-       cx="-22.375"
-       cy="18.499998"
-       fx="-22.375"
-       fy="18.499998"
-       r="14.33462"
-       gradientTransform="matrix(1,0,0,1.140022,40.17678,1.347091)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="12.289036"
-       fy="63.965388"
-       fx="15.115514"
-       cy="63.965388"
-       cx="15.115514"
-       gradientTransform="scale(1.643990,0.608276)"
-       id="radialGradient5000"
-       xlink:href="#linearGradient4114"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4989">
-      <stop
-         id="stop4991"
-         offset="0.0000000"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4993"
-         offset="0.15517241"
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4995"
-         offset="0.75000000"
-         style="stop-color:#4074ae;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4997"
-         offset="1.0000000"
-         style="stop-color:#36486c;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4977">
-      <stop
-         id="stop4979"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4981"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.16494845;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4825"
-       inkscape:collect="always">
-      <stop
-         id="stop4827"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop4829"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4114"
-       id="radialGradient6090"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.64399,0.608276)"
-       cx="15.115514"
-       cy="63.965388"
-       fx="15.115514"
-       fy="63.965388"
-       r="12.289036" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4825"
-       id="radialGradient6098"
-       gradientUnits="userSpaceOnUse"
-       cx="12.071323"
-       cy="12.493138"
-       fx="12.071323"
-       fy="12.493138"
-       r="6.7175145" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2973"
-       id="radialGradient6103"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.25463,-0.898371,0.979785,0.277703,-18.00903,32.03312)"
-       cx="17.903898"
-       cy="40.159222"
-       fx="17.903898"
-       fy="40.159222"
-       r="14.33681" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2973"
-       id="radialGradient6106"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.583269,-0.431533,0.577146,0.78008,-5.80022,4.004109)"
-       cx="12.525543"
-       cy="38.09042"
-       fx="12.525543"
-       fy="38.09042"
-       r="14.33681" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1312"
-       id="radialGradient6109"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.768231,1.13675,-0.820972,0.554824,-3.72248,-85.07126)"
-       cx="65.800331"
-       cy="27.16758"
-       fx="65.800331"
-       fy="27.16758"
-       r="12.972491" />
+     id="defs2529">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2535" />
   </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="0.17254902"
-     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="18.75"
-     inkscape:cy="24"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="453.37202"
+     inkscape:cy="461.7376"
+     inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1278"
-     inkscape:window-height="978"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:showpageshadow="false" />
+     inkscape:window-width="640"
+     inkscape:window-height="711"
+     inkscape:window-x="1712"
+     inkscape:window-y="100" />
   <metadata
-     id="metadata4">
+     id="metadata2532">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Internet Category</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Tuomas Kuosmanen</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>internet</rdf:li>
-            <rdf:li>tools</rdf:li>
-            <rdf:li>applications</rdf:li>
-            <rdf:li>category</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     id="layer1">
     <path
        style="fill:#5599ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 23.942923,0.9561338 L 37.330543,18.266721 C 46.998995,29.84687 41.49692,43.923891 26.7742,45.000491 C 6.0597413,45.582655 6.5086231,27.37483 11.255313,18.609381 L 23.942923,0.9561338 z "
+       d="M 335.10794,116.43168 L 610.53935,447.76408 C 809.45408,669.41324 696.25675,938.85368 393.35753,959.46028 C -32.813273,970.60316 -9.7709676,623.52458 107.82928,464.31364 L 335.10794,116.43168 z"
        id="path2069"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
     <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
-       d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z "
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:21.67123985;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
+       d="M 337.67292,165.87552 L 585.22638,464.67366 C 773.96211,684.57988 653.37942,910.02774 383.88559,930.97978 C 4.1291863,940.68143 29.040179,639.21796 125.2355,490.1649 L 337.67292,165.87552 z"
        id="path2071"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
     <path
-       style="fill:#93beff;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:0.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
-       d="M 24.3125 14.9375 C 20.869248 18.315409 17.412003 21.684591 13.96875 25.0625 C 15.821373 25.065889 17.678627 25.059111 19.53125 25.0625 C 19.53125 29.0625 19.53125 33.0625 19.53125 37.0625 C 22.822917 37.0625 26.114582 37.0625 29.40625 37.0625 C 29.40625 33.072917 29.40625 29.083333 29.40625 25.09375 C 31.113161 25.096872 32.824339 25.090627 34.53125 25.09375 C 31.126025 21.703313 27.717725 18.327937 24.3125 14.9375 z "
-       id="rect2634" />
+       style="fill:#93beff;fill-opacity:1;stroke:#000000;stroke-width:14.10382843;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 359.0208,369.47132 C 289.64507,437.53055 219.98727,505.41409 150.61154,573.47313 C 187.93874,573.54143 225.35922,573.40503 262.68661,573.47313 C 262.68661,654.06643 262.68661,734.65974 262.68661,815.25304 C 329.00806,815.25304 395.32971,815.25304 461.65134,815.25304 C 461.65134,734.86969 461.65134,654.48632 461.65134,574.10276 C 496.04273,574.16582 530.52013,574.0399 564.91152,574.10276 C 496.30183,505.79126 427.63028,437.78301 359.0208,369.47132 z"
+       id="rect2634"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/seeding16.png"
+       inkscape:export-xdpi="1.7060417"
+       inkscape:export-ydpi="1.7060417" />
   </g>
 </svg>

deluge/data/pixmaps/traffic.svg

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2517"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="traffic.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/traffic16.png"
+   inkscape:export-xdpi="2.459017"
+   inkscape:export-ydpi="2.459017">
+  <defs
+     id="defs2519">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2525" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="375"
+     inkscape:cy="520"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="667"
+     inkscape:window-height="709"
+     inkscape:window-x="50"
+     inkscape:window-y="25" />
+  <metadata
+     id="metadata2522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="opacity:0.8;fill:#93beff;fill-opacity:1;stroke:#000000;stroke-width:14.10382843;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 426.97356,240.8999 C 357.59783,308.95913 287.94003,376.84267 218.5643,444.90171 C 255.8915,444.97001 293.31198,444.83361 330.63937,444.90171 C 330.63937,525.49501 330.63937,606.08832 330.63937,686.68162 C 396.96082,686.68162 463.28247,686.68162 529.6041,686.68162 C 529.6041,606.29827 529.6041,525.9149 529.6041,445.53134 C 563.99549,445.5944 598.47289,445.46848 632.86428,445.53134 C 564.25459,377.21984 495.58304,309.21159 426.97356,240.8999 z"
+       id="rect2634"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/traffic32.png"
+       inkscape:export-xdpi="4.9180341"
+       inkscape:export-ydpi="4.9180341" />
+    <path
+       style="opacity:0.8;fill:#b7e399;fill-opacity:1;stroke:#000000;stroke-width:14.10382843;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 298.40213,812.39589 C 229.0264,744.33666 159.3686,676.45312 89.992873,608.39408 C 127.32007,608.32578 164.74055,608.46218 202.06794,608.39408 C 202.06794,527.80078 202.06794,447.20747 202.06794,366.61417 C 268.38939,366.61417 334.71104,366.61417 401.03267,366.61417 C 401.03267,446.99752 401.03267,527.38089 401.03267,607.76445 C 435.42406,607.70139 469.90146,607.82731 504.29285,607.76445 C 435.68316,676.07595 367.01161,744.0842 298.40213,812.39589 z"
+       id="path2528"
+       inkscape:export-filename="/home/andrew/Projects/deluge/trunk/deluge/data/pixmaps/traffic32.png"
+       inkscape:export-xdpi="4.9180341"
+       inkscape:export-ydpi="4.9180341" />
+  </g>
+</svg>

deluge/data/share/applications/deluge.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Deluge
-GenericName=Bittorrent Client
-Comment=Transfer files using the Bittorrent protocol
-Exec=deluge
-Icon=deluge
-Terminal=false
-Type=Application
-Categories=Network;
-StartupNotify=true
-MimeType=application/x-bittorrent;

deluge/data/share/applications/deluge.desktop.in

@@ -0,0 +1,15 @@
+[Desktop Entry]
+Version=1.0
+_Name=Deluge
+_GenericName=BitTorrent Client
+_X-GNOME-FullName=Deluge BitTorrent Client
+_Comment=Download and share files over BitTorrent
+TryExec=deluge-gtk
+Exec=deluge-gtk %U
+Icon=deluge
+Terminal=false
+Type=Application
+Categories=Network;FileTransfer;P2P;GTK;
+StartupWMClass=Deluge
+StartupNotify=true
+MimeType=application/x-bittorrent;x-scheme-handler/magnet;

deluge/decorators.py

@@ -0,0 +1,51 @@
+#
+# decorators.py
+#
+# Copyright (C) 2010 John Garland <johnnybg+deluge@gmail.com>
+#
+# Deluge is free software.
+#
+# You may redistribute it and/or modify it under the terms of the
+# GNU General Public License, as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# deluge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with deluge.    If not, write to:
+# 	The Free Software Foundation, Inc.,
+# 	51 Franklin Street, Fifth Floor
+# 	Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+#
+
+from functools import wraps
+
+def proxy(proxy_func):
+    """
+    Factory class which returns a decorator that passes
+    the decorated function to a proxy function
+
+    :param proxy_func: the proxy function
+    :type proxy_func: function
+    """
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            return proxy_func(func, *args, **kwargs)
+        return wrapper
+    return decorator

deluge/error.py

@@ -1,25 +1,25 @@
 #
 # error.py
 #
-# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com>
-# 
+# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com>
+#
 # Deluge is free software.
-# 
+#
 # You may redistribute it and/or modify it under the terms of the
 # GNU General Public License, as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option)
+# Foundation; either version 3 of the License, or (at your option)
 # any later version.
-# 
+#
 # deluge is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with deluge.    If not, write to:
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
+# 	Boston, MA  02110-1301, USA.
 #
 #    In addition, as a special exception, the copyright holders give
 #    permission to link the code of portions of this program with the OpenSSL
@@ -30,13 +30,21 @@
 #    but you are not obligated to do so. If you do not wish to do so, delete
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
+#
+#
+
 
 class DelugeError(Exception):
-    def __init__(self, value):
-        self.value = value
-    def __str__(self):
-        return repr(self.value)
-        
+    pass
+
 class NoCoreError(DelugeError):
     pass
-    
+
+class DaemonRunningError(DelugeError):
+    pass
+
+class InvalidTorrentError(DelugeError):
+    pass
+
+class InvalidPathError(DelugeError):
+    pass

deluge/event.py

@@ -0,0 +1,243 @@
+#
+# event.py
+#
+# Copyright (C) 2009 Andrew Resch <andrewresch@gmail.com>
+#
+# Deluge is free software.
+#
+# You may redistribute it and/or modify it under the terms of the
+# GNU General Public License, as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# deluge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with deluge.    If not, write to:
+#   The Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor
+#   Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+#
+
+"""
+Event module.
+
+This module describes the types of events that can be generated by the daemon
+and subsequently emitted to the clients.
+
+"""
+
+known_events = {}
+
+class DelugeEventMetaClass(type):
+    """
+    This metaclass simply keeps a list of all events classes created.
+    """
+    def __init__(cls, name, bases, dct):
+        super(DelugeEventMetaClass, cls).__init__(name, bases, dct)
+        if name != "DelugeEvent":
+            known_events[name] = cls
+
+class DelugeEvent(object):
+    """
+    The base class for all events.
+
+    :prop name: this is the name of the class which is in-turn the event name
+    :prop args: a list of the attribute values
+
+    """
+    __metaclass__ = DelugeEventMetaClass
+
+    def _get_name(self):
+        return self.__class__.__name__
+
+    def _get_args(self):
+        if not hasattr(self, "_args"):
+            return []
+        return self._args
+
+    name = property(fget=_get_name)
+    args = property(fget=_get_args)
+
+class TorrentAddedEvent(DelugeEvent):
+    """
+    Emitted when a new torrent is successfully added to the session.
+    """
+    def __init__(self, torrent_id):
+        """
+        :param torrent_id: str, the torrent_id of the torrent that was added
+        """
+        self._args = [torrent_id]
+
+class TorrentRemovedEvent(DelugeEvent):
+    """
+    Emitted when a torrent has been removed from the session.
+    """
+    def __init__(self, torrent_id):
+        """
+        :param torrent_id: str, the torrent_id
+        """
+        self._args = [torrent_id]
+
+class PreTorrentRemovedEvent(DelugeEvent):
+    """
+    Emitted when a torrent is about to be removed from the session.
+    """
+    def __init__(self, torrent_id):
+        """
+        :param torrent_id: str, the torrent_id
+        """
+        self._args = [torrent_id]
+
+class TorrentStateChangedEvent(DelugeEvent):
+    """
+    Emitted when a torrent changes state.
+    """
+    def __init__(self, torrent_id, state):
+        """
+        :param torrent_id: str, the torrent_id
+        :param state: str, the new state
+        """
+        self._args = [torrent_id, state]
+
+class TorrentQueueChangedEvent(DelugeEvent):
+    """
+    Emitted when the queue order has changed.
+    """
+    pass
+
+class TorrentFolderRenamedEvent(DelugeEvent):
+    """
+    Emitted when a folder within a torrent has been renamed.
+    """
+    def __init__(self, torrent_id, old, new):
+        """
+        :param torrent_id: str, the torrent_id
+        :param old: str, the old folder name
+        :param new: str, the new folder name
+        """
+        self._args = [torrent_id, old, new]
+
+class TorrentFileRenamedEvent(DelugeEvent):
+    """
+    Emitted when a file within a torrent has been renamed.
+    """
+    def __init__(self, torrent_id, index, name):
+        """
+        :param torrent_id: str, the torrent_id
+        :param index: int, the index of the file
+        :param name: str, the new filename
+        """
+        self._args = [torrent_id, index, name]
+
+class TorrentFinishedEvent(DelugeEvent):
+    """
+    Emitted when a torrent finishes downloading.
+    """
+    def __init__(self, torrent_id):
+        """
+        :param torrent_id: str, the torrent_id
+        """
+        self._args = [torrent_id]
+
+class TorrentResumedEvent(DelugeEvent):
+    """
+    Emitted when a torrent resumes from a paused state.
+    """
+    def __init__(self, torrent_id):
+        """
+        :param torrent_id: str, the torrent_id
+        """
+        self._args = [torrent_id]
+
+class TorrentFileCompletedEvent(DelugeEvent):
+    """
+    Emitted when a file completes.
+
+    This will only work with libtorrent 0.15 or greater.
+
+    """
+    def __init__(self, torrent_id, index):
+        """
+        :param torrent_id: the torrent_id
+        :type torrent_id: string
+        :param index: the file index
+        :type index: int
+        """
+        self._args = [torrent_id, index]
+
+class NewVersionAvailableEvent(DelugeEvent):
+    """
+    Emitted when a more recent version of Deluge is available.
+    """
+    def __init__(self, new_release):
+        """
+        :param new_release: str, the new version that is available
+        """
+        self._args = [new_release]
+
+class SessionStartedEvent(DelugeEvent):
+    """
+    Emitted when a session has started.  This typically only happens once when
+    the daemon is initially started.
+    """
+    pass
+
+class SessionPausedEvent(DelugeEvent):
+    """
+    Emitted when the session has been paused.
+    """
+    pass
+
+class SessionResumedEvent(DelugeEvent):
+    """
+    Emitted when the session has been resumed.
+    """
+    pass
+
+class ConfigValueChangedEvent(DelugeEvent):
+    """
+    Emitted when a config value changes in the Core.
+    """
+    def __init__(self, key, value):
+        """
+        :param key: str, the key that changed
+        :param value: the new value of the `:param:key`
+        """
+        self._args = [key, value]
+
+class PluginEnabledEvent(DelugeEvent):
+    """
+    Emitted when a plugin is enabled in the Core.
+    """
+    def __init__(self, name):
+        """
+        :param name: the plugin name
+        :type name: string
+        """
+        self._args = [name]
+
+class PluginDisabledEvent(DelugeEvent):
+    """
+    Emitted when a plugin is disabled in the Core.
+    """
+    def __init__(self, name):
+        """
+        :param name: the plugin name
+        :type name: string
+        """
+        self._args = [name]

deluge/httpdownloader.py

@@ -0,0 +1,234 @@
+#
+# httpdownloader.py
+#
+# Copyright (C) 2009 Andrew Resch <andrewresch@gmail.com>
+#
+# Deluge is free software.
+#
+# You may redistribute it and/or modify it under the terms of the
+# GNU General Public License, as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# deluge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with deluge.    If not, write to:
+# 	The Free Software Foundation, Inc.,
+# 	51 Franklin Street, Fifth Floor
+# 	Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+
+from twisted.web import client, http
+from twisted.web.error import PageRedirect
+from twisted.python.failure import Failure
+from twisted.internet import reactor
+from deluge.log import setupLogger, LOG as log
+from common import get_version
+import os.path
+import zlib
+
+class HTTPDownloader(client.HTTPDownloader):
+    """
+    Factory class for downloading files and keeping track of progress.
+    """
+    def __init__(self, url, filename, part_callback=None, headers=None, force_filename=False, allow_compression=True):
+        """
+        :param url: the url to download from
+        :type url: string
+        :param filename: the filename to save the file as
+        :type filename: string
+        :param force_filename: forces use of the supplied filename, regardless of header content
+        :type force_filename: bool
+        :param part_callback: a function to be called when a part of data
+            is received, it's signature should be: func(data, current_length, total_length)
+        :type part_callback: function
+        :param headers: any optional headers to send
+        :type headers: dictionary
+        """
+        self.part_callback = part_callback
+        self.current_length = 0
+        self.decoder = None
+        self.value = filename
+        self.force_filename = force_filename
+        self.allow_compression = allow_compression
+        agent = "Deluge/%s (http://deluge-torrent.org)" % get_version()
+        client.HTTPDownloader.__init__(self, url, filename, headers=headers, agent=agent)
+
+    def gotStatus(self, version, status, message):
+        self.code = int(status)
+        client.HTTPDownloader.gotStatus(self, version, status, message)
+
+    def gotHeaders(self, headers):
+        if self.code == http.OK:
+            if "content-length" in headers:
+                self.total_length = int(headers["content-length"][0])
+            else:
+                self.total_length = 0
+
+            if self.allow_compression and "content-encoding" in headers and \
+               headers["content-encoding"][0] in ("gzip", "x-gzip", "deflate"):
+                # Adding 32 to the wbits enables gzip & zlib decoding (with automatic header detection)
+                # Adding 16 just enables gzip decoding (no zlib)
+                self.decoder = zlib.decompressobj(zlib.MAX_WBITS + 32)
+
+            if "content-disposition" in headers and not self.force_filename:
+                new_file_name = str(headers["content-disposition"][0]).split(";")[1].split("=")[1]
+                new_file_name = sanitise_filename(new_file_name)
+                new_file_name = os.path.join(os.path.split(self.fileName)[0], new_file_name)
+
+                count = 1
+                fileroot = os.path.splitext(new_file_name)[0]
+                fileext = os.path.splitext(new_file_name)[1]
+                while os.path.isfile(new_file_name):
+                    # Increment filename if already exists
+                    new_file_name = "%s-%s%s" % (fileroot, count, fileext)
+                    count += 1
+
+                self.fileName = new_file_name
+                self.value = new_file_name
+
+        elif self.code in (http.MOVED_PERMANENTLY, http.FOUND, http.SEE_OTHER, http.TEMPORARY_REDIRECT):
+            location = headers["location"][0]
+            error = PageRedirect(self.code, location=location)
+            self.noPage(Failure(error))
+
+        return client.HTTPDownloader.gotHeaders(self, headers)
+
+    def pagePart(self, data):
+        if self.code == http.OK:
+            self.current_length += len(data)
+            if self.decoder:
+                data = self.decoder.decompress(data)
+            if self.part_callback:
+                self.part_callback(data, self.current_length, self.total_length)
+
+        return client.HTTPDownloader.pagePart(self, data)
+
+    def pageEnd(self):
+        if self.decoder:
+            data = self.decoder.flush()
+            self.current_length -= len(data)
+            self.decoder = None
+            self.pagePart(data)
+
+        return client.HTTPDownloader.pageEnd(self)
+
+def sanitise_filename(filename):
+    """
+    Sanitises a filename to use as a download destination file.
+    Logs any filenames that could be considered malicious.
+
+    :param filename: the filename to sanitise
+    :type filename: string
+    :returns: the sanitised filename
+    :rtype: string
+    """
+
+    # Remove any quotes
+    filename = filename.strip("'\"")
+
+    if os.path.basename(filename) != filename:
+        # Dodgy server, log it
+        log.warning("Potentially malicious server: trying to write to file '%s'" % filename)
+        # Only use the basename
+        filename = os.path.basename(filename)
+
+    filename = filename.strip()
+    if filename.startswith(".") or ";" in filename or "|" in filename:
+        # Dodgy server, log it
+        log.warning("Potentially malicious server: trying to write to file '%s'" % filename)
+
+    return filename
+
+def download_file(url, filename, callback=None, headers=None, force_filename=False, allow_compression=True):
+    """
+    Downloads a file from a specific URL and returns a Deferred.  You can also
+    specify a callback function to be called as parts are received.
+
+    :param url: the url to download from
+    :type url: string
+    :param filename: the filename to save the file as
+    :type filename: string
+    :param callback: a function to be called when a part of data is received,
+         it's signature should be: func(data, current_length, total_length)
+    :type callback: function
+    :param headers: any optional headers to send
+    :type headers: dictionary
+    :param force_filename: force us to use the filename specified rather than
+                           one the server may suggest
+    :type force_filename: boolean
+    :param allow_compression: allows gzip & deflate decoding
+    :type allow_compression: boolean
+
+    :returns: the filename of the downloaded file
+    :rtype: Deferred
+
+    :raises t.w.e.PageRedirect: when server responds with a temporary redirect
+         or permanently moved.
+    :raises t.w.e.Error: for all other HTTP response errors (besides OK)
+    """
+    url = str(url)
+    filename = str(filename)
+    if headers:
+        for key, value in headers.items():
+            headers[str(key)] = str(value)
+
+    if allow_compression:
+        if not headers:
+            headers = {}
+        headers["accept-encoding"] = "deflate, gzip, x-gzip"
+
+    # In Twisted 13.1.0 _parse() function replaced by _URI class.
+    # In Twisted 15.0.0 _URI class renamed to URI.
+    if hasattr(client, "_parse"):
+        scheme, host, port, path = client._parse(url)
+    else:
+        try:
+            from twisted.web.client import _URI as URI
+        except ImportError:
+            from twisted.web.client import URI
+
+        uri = URI.fromBytes(url)
+        scheme = uri.scheme
+        host = uri.host
+        port = uri.port
+        path = uri.path
+
+    factory = HTTPDownloader(url, filename, callback, headers, force_filename, allow_compression)
+    if scheme == "https":
+        from twisted.internet import ssl
+        # ClientTLSOptions in Twisted >= 14, see ticket #2765 for details on this addition.
+        try:
+            from twisted.internet._sslverify import ClientTLSOptions
+        except ImportError:
+            ctx_factory = ssl.ClientContextFactory()
+        else:
+            class TLSSNIContextFactory(ssl.ClientContextFactory):
+                """
+                A custom context factory to add a server name for TLS connections.
+                """
+                def getContext(self, hostname=None, port=None):
+                    ctx = ssl.ClientContextFactory.getContext(self)
+                    ClientTLSOptions(host, ctx)
+                    return ctx
+            ctx_factory = TLSSNIContextFactory()
+
+        reactor.connectSSL(host, port, factory, ctx_factory)
+    else:
+        reactor.connectTCP(host, port, factory)
+
+    return factory.deferred

deluge/i18n/POTFILES.in

@@ -1,172 +0,0 @@
-deluge/scripts/wiki_docgen.py
-deluge/scripts/state_upgrade.py
-deluge/core/daemon.py
-deluge/core/signalmanager.py
-deluge/core/torrent.py
-deluge/core/core.py
-deluge/core/__init__.py
-deluge/core/torrentmanager.py
-deluge/core/pluginmanager.py
-deluge/core/autoadd.py
-deluge/core/alertmanager.py
-deluge/main.py
-deluge/component.py
-deluge/pluginmanagerbase.py
-deluge/error.py
-deluge/configmanager.py
-deluge/log.py
-deluge/config.py
-deluge/__init__.py
-deluge/ui/ui.py
-deluge/ui/webui/scripts/extract_template_strings.py
-deluge/ui/webui/scripts/template_strings.py
-deluge/ui/webui/tests/multicall_notepad.py
-deluge/ui/webui/tests/test_all.py
-deluge/ui/webui/json_api.py
-deluge/ui/webui/pages.py
-deluge/ui/webui/torrent_add.py
-deluge/ui/webui/config_tabs_deluge.py
-deluge/ui/webui/webserver_common.py
-deluge/ui/webui/config_tabs_webui.py
-deluge/ui/webui/torrent_move.py
-deluge/ui/webui/config_forms.py
-deluge/ui/webui/webui.py
-deluge/ui/webui/page_decorators.py
-deluge/ui/webui/components.py
-deluge/ui/webui/deluge_webserver.py
-deluge/ui/webui/apache.py
-deluge/ui/webui/debugerror.py
-deluge/ui/webui/torrent_options.py
-deluge/ui/webui/lib/newforms_portable/widgets.py
-deluge/ui/webui/lib/newforms_portable/django/core/exceptions.py
-deluge/ui/webui/lib/newforms_portable/django/core/__init__.py
-deluge/ui/webui/lib/newforms_portable/django/utils/safestring.py
-deluge/ui/webui/lib/newforms_portable/django/utils/translation.py
-deluge/ui/webui/lib/newforms_portable/django/utils/functional.py
-deluge/ui/webui/lib/newforms_portable/django/utils/encoding.py
-deluge/ui/webui/lib/newforms_portable/django/utils/http.py
-deluge/ui/webui/lib/newforms_portable/django/utils/__init__.py
-deluge/ui/webui/lib/newforms_portable/django/utils/datastructures.py
-deluge/ui/webui/lib/newforms_portable/django/__init__.py
-deluge/ui/webui/lib/newforms_portable/util.py
-deluge/ui/webui/lib/newforms_portable/forms.py
-deluge/ui/webui/lib/newforms_portable/models.py
-deluge/ui/webui/lib/newforms_portable/fields.py
-deluge/ui/webui/lib/newforms_portable/__init__.py
-deluge/ui/webui/lib/webpy022/request.py
-deluge/ui/webui/lib/webpy022/webapi.py
-deluge/ui/webui/lib/webpy022/wsgi.py
-deluge/ui/webui/lib/webpy022/debugerror.py
-deluge/ui/webui/lib/webpy022/cheetah.py
-deluge/ui/webui/lib/webpy022/net.py
-deluge/ui/webui/lib/webpy022/http.py
-deluge/ui/webui/lib/webpy022/__init__.py
-deluge/ui/webui/lib/webpy022/wsgiserver/__init__.py
-deluge/ui/webui/lib/webpy022/httpserver.py
-deluge/ui/webui/lib/webpy022/form.py
-deluge/ui/webui/lib/webpy022/db.py
-deluge/ui/webui/lib/web.py
-deluge/ui/webui/lib/__init__.py
-deluge/ui/webui/lib/json.py
-deluge/ui/webui/lib/static_handler.py
-deluge/ui/webui/lib/pythonize.py
-deluge/ui/webui/lib/newforms_plus.py
-deluge/ui/webui/render.py
-deluge/ui/webui/web.py
-deluge/ui/webui/__init__.py
-deluge/ui/webui/register_menu.py
-deluge/ui/null/deluge_shell.py
-deluge/ui/null/__init__.py
-deluge/ui/signalreceiver.py
-deluge/ui/client.py
-deluge/ui/__init__.py
-deluge/ui/gtkui/connectionmanager.py
-deluge/ui/gtkui/ipcinterface.py
-deluge/ui/gtkui/options_tab.py
-deluge/ui/gtkui/addtorrenturl.py
-deluge/ui/gtkui/preferences.py
-deluge/ui/gtkui/addtorrentdialog.py
-deluge/ui/gtkui/torrentdetails.py
-deluge/ui/gtkui/peers_tab.py
-deluge/ui/gtkui/mainwindow.py
-deluge/ui/gtkui/coreconfig.py
-deluge/ui/gtkui/menubar.py
-deluge/ui/gtkui/statistics_tab.py
-deluge/ui/gtkui/gtkui.py
-deluge/ui/gtkui/sidebar.py
-deluge/ui/gtkui/systemtray.py
-deluge/ui/gtkui/toolbar.py
-deluge/ui/gtkui/torrentview.py
-deluge/ui/gtkui/files_tab.py
-deluge/ui/gtkui/signals.py
-deluge/ui/gtkui/queuedtorrents.py
-deluge/ui/gtkui/__init__.py
-deluge/ui/gtkui/removetorrentdialog.py
-deluge/ui/gtkui/details_tab.py
-deluge/ui/gtkui/pluginmanager.py
-deluge/ui/gtkui/dbusinterface.py
-deluge/ui/gtkui/listview.py
-deluge/ui/gtkui/aboutdialog.py
-deluge/ui/gtkui/statusbar.py
-deluge/ui/gtkui/edittrackersdialog.py
-deluge/common.py
-deluge/plugins/testp/testp/ui.py
-deluge/plugins/testp/testp/gtkui.py
-deluge/plugins/testp/testp/core.py
-deluge/plugins/testp/testp/__init__.py
-deluge/plugins/testp/setup.py
-deluge/plugins/testp/build/lib/testp/ui.py
-deluge/plugins/testp/build/lib/testp/gtkui.py
-deluge/plugins/testp/build/lib/testp/core.py
-deluge/plugins/testp/build/lib/testp/__init__.py
-deluge/plugins/init.py
-deluge/plugins/label/label/ui.py
-deluge/plugins/label/label/gtk_sidebar.py
-deluge/plugins/label/label/test.py
-deluge/plugins/label/label/webui.py
-deluge/plugins/label/label/webui_config.py
-deluge/plugins/label/label/gtkui.py
-deluge/plugins/label/label/webui_pages.py
-deluge/plugins/label/label/core.py
-deluge/plugins/label/label/__init__.py
-deluge/plugins/label/setup.py
-deluge/plugins/label/build/lib/label/ui.py
-deluge/plugins/label/build/lib/label/gtk_sidebar.py
-deluge/plugins/label/build/lib/label/test.py
-deluge/plugins/label/build/lib/label/webui.py
-deluge/plugins/label/build/lib/label/webui_config.py
-deluge/plugins/label/build/lib/label/gtkui.py
-deluge/plugins/label/build/lib/label/sidebar.py
-deluge/plugins/label/build/lib/label/webui_pages.py
-deluge/plugins/label/build/lib/label/core.py
-deluge/plugins/label/build/lib/label/__init__.py
-deluge/plugins/__init__.py
-deluge/plugins/corepluginbase.py
-deluge/plugins/blocklist/setup.py
-deluge/plugins/blocklist/blocklist/ui.py
-deluge/plugins/blocklist/blocklist/peerguardian.py
-deluge/plugins/blocklist/blocklist/webui.py
-deluge/plugins/blocklist/blocklist/gtkui.py
-deluge/plugins/blocklist/blocklist/core.py
-deluge/plugins/blocklist/blocklist/text.py
-deluge/plugins/blocklist/blocklist/__init__.py
-deluge/plugins/blocklist/build/lib/blocklist/ui.py
-deluge/plugins/blocklist/build/lib/blocklist/peerguardian.py
-deluge/plugins/blocklist/build/lib/blocklist/webui.py
-deluge/plugins/blocklist/build/lib/blocklist/gtkui.py
-deluge/plugins/blocklist/build/lib/blocklist/core.py
-deluge/plugins/blocklist/build/lib/blocklist/text.py
-deluge/plugins/blocklist/build/lib/blocklist/__init__.py
-deluge/ui/gtkui/glade/connection_manager.glade
-deluge/ui/gtkui/glade/preferences_dialog.glade
-deluge/ui/gtkui/glade/queuedtorrents.glade
-deluge/ui/gtkui/glade/dgtkpopups.glade
-deluge/ui/gtkui/glade/remove_torrent_dialog.glade
-deluge/ui/gtkui/glade/edit_trackers.glade
-deluge/ui/gtkui/glade/add_torrent_dialog.glade
-deluge/ui/gtkui/glade/torrent_menu.glade
-deluge/ui/gtkui/glade/tray_menu.glade
-deluge/ui/gtkui/glade/file_tab_menu.glade
-deluge/ui/gtkui/glade/main_window.glade
-deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade
-deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade