centered columns, added tracker column

README.md

@@ -11,6 +11,3 @@ Python packages: `flask gunicorn`
 
 ## Usage  
 `gunicorn -b localhost:5250 -e SCRIPT_NAME=/aberrant aberrant:app`  
-
-## What's with the name?  
-Picked a random word from the dictionary desu.  

rtorrent.py

@@ -31,6 +31,8 @@ class Torrent:
 		self.uprate = raw[5]
 		self.uprate_str = speedrate(self.uprate)
 
+		self.tracker = get_tracker(raw[6])
+
 
 class Watch(threading.Thread):
 	"""A thread class that continously queries the rTorrent instances."""
@@ -66,6 +68,14 @@ def speedrate(rate):
 	rate = round(rate, 1)
 	return str(rate) + unit
 
+def get_tracker(path):
+	"""
+	At present I don't have an efficient way to get the tracker url
+	with the d.multicall2() function, so we parse it from the
+	directory path.
+	"""
+	return path.split('/')[4]
+
 def all_torrents():
 	"""Helper that returns a list of all torrents."""
 	res = []
@@ -89,6 +99,7 @@ def get_all(n):
 		'd.complete=',
 		'd.down.rate=',
 		'd.up.rate=',
+		'd.directory=',
 	)
 	return [Torrent(raw) for raw in res]
 

static/aberrant.css

@@ -1,3 +1,9 @@
+body {
+	background-color: #FAFAFA;
+	color: #111111;
+	font-family: Tahoma, Helvetica, sans-serif;
+}
+
 #torrents {
 	width: 100%;
 	border-collapse: collapse;
@@ -8,21 +14,11 @@ tr {
 	border: 1px solid #ccc;
 }
 
-.name {
+#name {
 	padding-left: 1em;
 }
 
-.state {
-	text-align: center;
-	width: 10%;
-}
-
-.downrate {
-	text-align: center;
-	width: 10%;
-}
-
-.uprate {
+.state, .downrate, .uprate, .tracker {
 	text-align: center;
 	width: 10%;
 }

templates/index.html

@@ -8,10 +8,11 @@
 	<table id="torrents">
 		<thead>
 			<tr>
-				<th>Name</th>
-				<th>State</th>
-				<th>DL</th>
-				<th>UL</th>
+				<th class="name">Name</th>
+				<th class="state">State</th>
+				<th class="downrate">DL</th>
+				<th class="uprate">UL</th>
+				<th class="tracker">Tracker</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -21,6 +22,7 @@
 				<td class="state">{{ torrent.state }}</td>
 				<td class="downrate">{{ torrent.downrate_str }}</td>
 				<td class="uprate">{{ torrent.uprate_str }}</td>
+				<td class="tracker">{{ torrent.tracker }}</td>
 			</tr>
 			{% endfor %}
 		</tbody>