ratio management

config.conf

@@ -1,4 +1,4 @@
 [General]
-maxRatio: 3
-maxRate: 120
-torrentsPath: "."
+maxRatio: 1
+maxRate: 512
+torrentsPath: .

config.py

@@ -37,10 +37,10 @@ class Config:
             return None
 
     def getMaxRatio(self):
-        return int(self.getOption('maxratio'))
+        return float(self.getOption('maxratio'))
 
     def getMaxRate(self):
-        return int(self.getOption('maxrate'))
+        return float(self.getOption('maxrate'))
 
     def getTorrentsPath(self):
         return str(self.getOption('torrentspath'))

fake-tracker.py

@@ -20,6 +20,10 @@ maxRatio = config.getMaxRatio()
 maxRate = config.getMaxRate()
 torrentsPath = config.getTorrentsPath()
 
+print("Max ratio:", maxRatio)
+print("Max rate:", maxRate, "kb/s")
+print("Torrents path:", torrentsPath)
+
 manager = torrentmanager.TorrentManager(maxRatio, maxRate)
 run = True
 while run:
@@ -48,9 +52,10 @@ while run:
     if secs > 0:
         print(torrent.getName() + ": Next update in " + str(secs) + " seconds")
         time.sleep(secs)
-    print("Updating", torrent.getName())
+    print("Updating", torrent.getName(),
+            "ratio =", (torrent.getTracker().getUploaded() / float(torrent.getSize())))
     try:
-        manager.updateTorrent(torrent)
+        manager.updateTorrent()
     except:
         warning("could not update")
 

torrentfile.py

@@ -10,7 +10,9 @@ class TorrentFile:
     data = ()
     info = ()
     tracker = None
+    filepath = ""
     def readFile(self, path):
+        self.filepath = path
         with open(path, 'rb') as f:
             bencoded = f.read()
         self.readBencoded(bencoded)
@@ -20,6 +22,9 @@ class TorrentFile:
         self.data = bencode.bdecode(data)
         self.info = self.data['info']
 
+    def getFilepath(self):
+        return self.filepath
+
     def getName(self):
         return self.info['name']
 

torrentmanager.py

@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 
+import os
 import copy
 import time
 import random
@@ -11,13 +12,16 @@ class TorrentManager:
     last_time = 0
     max_ratio = 0
     max_rate = 0
-    def __init__(self, max_ratio = 1, max_rate = 120):
+    def __init__(self, max_ratio, max_rate):
         self.max_ratio = max_ratio
         self.max_rate = max_rate * 1024
 
     def appendTorrent(self, torrent):
         self.torrents.append(torrent)
 
+    def removeTorrent(self, torrent):
+        self.torrents.remove(torrent)
+
     def getTorrents(self):
         return self.torrents
 
@@ -40,11 +44,16 @@ class TorrentManager:
         t = max(torrent.getTracker().getInterval() - (int(time.time()) - self.last_time), 0)
         return {'time': t, 'torrent': torrent}
 
-    def updateTorrent(self, torrent = None):
-        if torrent == None:
-            torrent = self.getNextTorrent()
-        uploaded = (self.max_rate / len(self.torrents)) * torrent.getTracker().getInterval()
+    def updateTorrent(self):
+        torrent = self.getNextTorrent()
+        uploaded = int(self.max_rate / len(self.torrents)) * torrent.getTracker().getInterval()
         uploaded += random.randint(-uploaded / 10, uploaded / 10)
         self.next_torrents.remove(torrent)
+        if torrent.getSize() * self.max_ratio <= torrent.getTracker().getUploaded():
+            self.torrents.remove(torrent)
+            try:
+                os.remove(torrent.getFilepath())
+            except:
+                print("WARNING: failed to remove torrent", torrent.getFilepath())
         torrent.getTracker().update(uploaded)
 

torrenttracker.py

@@ -60,3 +60,7 @@ class TorrentTracker:
         self.left -= left
         return self.request()
 
+
+    def getUploaded(self):
+        return self.uploaded
+