From 5826e80d354945b23aa06c32f4be3acdd637d69e Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sun, 9 Oct 2011 17:17:46 +0200 Subject: [PATCH] using webseed torrents, no need for transmission integration anymore --- pandora/settings.py | 1 - pandora/torrent/__init__.py | 0 pandora/torrent/management/__init__.py | 0 .../torrent/management/commands/__init__.py | 0 .../torrent/management/commands/seeding.py | 22 ------ pandora/torrent/models.py | 3 - pandora/torrent/tests.py | 23 ------ pandora/torrent/transmission.py | 78 ------------------- pandora/torrent/views.py | 1 - requirements.txt | 1 - 10 files changed, 129 deletions(-) delete mode 100644 pandora/torrent/__init__.py delete mode 100644 pandora/torrent/management/__init__.py delete mode 100644 pandora/torrent/management/commands/__init__.py delete mode 100644 pandora/torrent/management/commands/seeding.py delete mode 100644 pandora/torrent/models.py delete mode 100644 pandora/torrent/tests.py delete mode 100644 pandora/torrent/transmission.py delete mode 100644 pandora/torrent/views.py diff --git a/pandora/settings.py b/pandora/settings.py index a297b07f0..540a0a10f 100644 --- a/pandora/settings.py +++ b/pandora/settings.py @@ -132,7 +132,6 @@ INSTALLED_APPS = ( 'person', 'place', 'text', - 'torrent', 'edit', 'news', 'user', diff --git a/pandora/torrent/__init__.py b/pandora/torrent/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/pandora/torrent/management/__init__.py b/pandora/torrent/management/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/pandora/torrent/management/commands/__init__.py b/pandora/torrent/management/commands/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/pandora/torrent/management/commands/seeding.py b/pandora/torrent/management/commands/seeding.py deleted file mode 100644 index 7f1cb753c..000000000 --- a/pandora/torrent/management/commands/seeding.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 - -import os -from os.path import join, dirname, basename, splitext, exists - -from django.core.management.base import BaseCommand, CommandError -from django.conf import settings - -from ... import daemon - - -class Command(BaseCommand): - """ - listen to rabbitmq and execute encoding tasks. - """ - help = 'listen to rabbitmq and execute encoding tasks.' - args = '' - - def handle(self, **options): - transmission.startDaemon() - diff --git a/pandora/torrent/models.py b/pandora/torrent/models.py deleted file mode 100644 index 71a836239..000000000 --- a/pandora/torrent/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/pandora/torrent/tests.py b/pandora/torrent/tests.py deleted file mode 100644 index 2247054b3..000000000 --- a/pandora/torrent/tests.py +++ /dev/null @@ -1,23 +0,0 @@ -""" -This file demonstrates two different styles of tests (one doctest and one -unittest). These will both pass when you run "manage.py test". - -Replace these with more appropriate tests for your application. -""" - -from django.test import TestCase - -class SimpleTest(TestCase): - def test_basic_addition(self): - """ - Tests that 1 + 1 always equals 2. - """ - self.failUnlessEqual(1 + 1, 2) - -__test__ = {"doctest": """ -Another way to test that 1 + 1 is equal to 2. - ->>> 1 + 1 == 2 -True -"""} - diff --git a/pandora/torrent/transmission.py b/pandora/torrent/transmission.py deleted file mode 100644 index af5b339ec..000000000 --- a/pandora/torrent/transmission.py +++ /dev/null @@ -1,78 +0,0 @@ -# -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 -from __future__ import with_statement -import os -import time -import base64 -from subprocess import Popen - -from django.conf import settings -import ox.torrent -import transmissionrpc - - -def connect(): - return transmissionrpc.Client(settings.TRANSMISSON_HOST, - port=settings.TRANSMISSON_PORT, - user=settings.TRANSMISSON_USER, - password=settings.TRANSMISSON_PASSWORD) - - -def remove(info_hash): - if settings.DEBUG: - print 'remove', info_hash - if info_hash: - try: - tc = connect() - tc.remove(info_hash.lower()) - except: - if settings.DEBUG: - import traceback - traceback.print_exc() - - -def add(torrent_file): - download_dir = os.path.dirname(torrent_file) - with open(torrent_file) as f: - torrent_data = base64.b64encode(f.read()) - info_hash = ox.torrent.getInfoHash(torrent_file) - try: - tc = connect() - if not is_seeding(info_hash): - tc.add(torrent_data, download_dir=download_dir) - except: - if settings.DEBUG: - import traceback - traceback.print_exc() - - -def is_seeding(info_hash): - info_hash = info_hash.lower() - try: - tc = connect() - torrents = tc.info(info_hash) - except: - torrents = False - if settings.DEBUG: - import traceback - traceback.print_exc() - if torrents: - return True - return False - - -def start_daemon(): - try: - tc = connect() - except: - Popen(['transmission-daemon', - '-M', - '-a', '127.0.0.1', - '-r', '127.0.0.1', - '-p', str(settings.TRANSMISSON_PORT), - '--auth', - '-u', settings.TRANSMISSON_USER, - '-v', settings.TRANSMISSON_PASSWORD, - '-w', settings.MEDIA_ROOT, - ]) - time.sleep(1) diff --git a/pandora/torrent/views.py b/pandora/torrent/views.py deleted file mode 100644 index 60f00ef0e..000000000 --- a/pandora/torrent/views.py +++ /dev/null @@ -1 +0,0 @@ -# Create your views here. diff --git a/requirements.txt b/requirements.txt index 11804de67..71ee76bbf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,5 +13,4 @@ django-celery>2.1.1 -e git://github.com/bit/django-extensions.git#egg=django_extensions -e bzr+http://firefogg.org/dev/python-firefogg/#egg=python-firefogg -e git+git://github.com/dcramer/django-devserver#egg=django_devserver -transmissionrpc gunicorn