Changeset 4 for trunk/src/server/views.py

Timestamp:

11/06/07 18:53:41 (5 years ago)

Author:

francois

Message:

Ajout affichage valeur download et upload

Files:

• trunk/src/server/views.py (modified) (7 diffs)

trunk/src/server/views.py

@@ -4 +4 @@
 from django.http import HttpResponse, Http404
 from bittorrent import Bittorrent
+
+PREFIX_TEMPLATES = "dev"
 
 def error_page(titre = "Erreur générale", 
@@ -46 +48 @@
         # Mise en forme humaine
         torrents = bittorrent.liste()
+        uploadRate = 0
+        downloadRate = 0
         for torrent in torrents:
+                uploadRate += torrent['upload_speed']
+                downloadRate += torrent['download_speed']
                 torrent['taille'] = bytes2human(torrent['taille'])
                 torrent['total_envoi'] = bytes2human(torrent['total_envoi'])
@@ -54 +60 @@
                 'nb_torrent': len(torrents),
                 'torrents' : torrents,
+                'upload_speed' : bytes2human(uploadRate) + "s",
+                'download_speed' : bytes2human(downloadRate) + "s",
                 'download_limit' : bittorrent.download_limit,
                 'upload_limit' : bittorrent.upload_limit,
@@ -63 +71 @@
                                                            bittorrent.upload_limit),
         })
-        template = loader.get_template("index.html")
+        template = loader.get_template(PREFIX_TEMPLATES + "/index.html")
         return HttpResponse(template.render(c))
                 
@@ -95 +103 @@
         else:
                 state = "NOPOST"
-        c = Context({
-                'etat' : state,
-                'form' : form.as_p(),
-                })
-        template = loader.get_template("add.html")
+        c = Context({'etat' : state,
+                     'form' : form.as_p(),
+                     })
+        template = loader.get_template(PREFIX_TEMPLATES + "/add.html")
         return HttpResponse(template.render(c))
 
@@ -126 +133 @@
         else:
                 form = MoveTorrentForm()
-        template = loader.get_template("move.html")
-        c = Context({
-                        'destination' : destination,
-                        'resultat' : resultat,
-                        'torrent' : info,
-                        'form' : form.as_p(),
-        })
+        template = loader.get_template(PREFIX_TEMPLATES + "/move.html")
+        c = Context({'destination' : destination,
+                     'resultat' : resultat,
+                     'torrent' : info,
+                     'form' : form.as_p(),
+                     })
         return HttpResponse(template.render(c))
 
@@ -159 +165 @@
                 else:
                         confirmation = True
-
         else:
                 return HttpResponse("Erreur inconnue ....")
-        template = loader.get_template("delete.html")
-        c = Context({
-                        'confirmation' : confirmation,
-                        'idtorrent' : idtorrent,
-                        'torrent' : info,
-                        })
+        template = loader.get_template(PREFIX_TEMPLATES + "/delete.html")
+        c = Context({'confirmation' : confirmation,
+                     'idtorrent' : idtorrent,
+                     'torrent' : info,
+                     })
         
         return HttpResponse(template.render(c))