Browse Source

Be more pythonic and PEP 8 compatible

windows
Alex Butum 12 years ago
parent
commit
87f1dd9fc7
  1. 31
      main/views.py
  2. 1
      pydash/settings.py
  3. 13
      pydash/urls.py
  4. 34
      usage/views.py

31
main/views.py

@ -20,16 +20,16 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
import platform, os, multiprocessing, json
import platform
import os
import multiprocessing
from datetime import timedelta
from django.contrib.auth.decorators import login_required
from django.core import serializers
from django.shortcuts import render_to_response
from django.http import HttpResponseRedirect, HttpResponse
from django.http import HttpResponseRedirect
from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _
from pydash.settings import TIME_JS_REFRESH, TIME_JS_REFRESH_LONG, TIME_JS_REFRESH_NET, VERSION
time_refresh = TIME_JS_REFRESH
@ -37,6 +37,7 @@ time_refresh_long = TIME_JS_REFRESH_LONG
time_refresh_net = TIME_JS_REFRESH_NET
version = VERSION
@login_required(login_url='/login/')
def index(request):
"""
@ -50,6 +51,7 @@ def index(request):
def chunks(get, n):
return [get[i:i + n] for i in range(0, len(get), n)]
def get_uptime():
"""
Get uptime
@ -82,7 +84,7 @@ def get_ipaddress():
data1 = pipe.read().strip().split('\n')
pipe.close()
if len(data1) == 2:
data1.append('unavailable', 'unavailable')
data1.append('unavailable')
if len(data1) == 3:
data1.append('unavailable')
data1[0] = i
@ -97,6 +99,7 @@ def get_ipaddress():
return data
def get_cpus():
"""
Get the number of CPUs and model/type
@ -120,6 +123,7 @@ def get_cpus():
return data
def get_users():
"""
Get the current logged in users
@ -139,6 +143,7 @@ def get_users():
return data
def get_traffic(request):
"""
Get the traffic for the specified interface
@ -167,6 +172,7 @@ def get_traffic(request):
return data
def get_platform():
"""
Get the OS name, hostname and kernel
@ -185,6 +191,7 @@ def get_platform():
return data
def get_disk():
"""
Get disk usage
@ -201,6 +208,7 @@ def get_disk():
return data
def get_disk_rw():
"""
Get the disk reads and writes
@ -233,6 +241,7 @@ def get_disk_rw():
return data
def get_mem():
"""
Get memory usage
@ -257,6 +266,7 @@ def get_mem():
return data
def get_cpu_usage():
"""
Get the CPU usage and running processes
@ -300,12 +310,15 @@ def get_load():
return data
def get_netstat():
"""
Get ports and applications
"""
try:
pipe = os.popen("ss -tnp | grep ESTAB | awk '{print $4, $5}'| sed 's/::ffff://g' | awk -F: '{print $1, $2}' | awk 'NF > 0' | sort -n | uniq -c")
pipe = os.popen(
"ss -tnp | grep ESTAB | awk '{print $4, $5}'| sed 's/::ffff://g' | awk -F: '{print $1, $2}' "
"| awk 'NF > 0' | sort -n | uniq -c")
data = pipe.read().strip().split('\n')
pipe.close()
@ -319,9 +332,7 @@ def get_netstat():
@login_required(login_url='/login/')
def getall(request):
return render_to_response('main.html', {'time_refresh': time_refresh,
'time_refresh_long': time_refresh_long,
'time_refresh_net': time_refresh_net,
'version': version
}, context_instance=RequestContext(request))
'version': version}, context_instance=RequestContext(request))

1
pydash/settings.py

@ -10,6 +10,7 @@ https://docs.djangoproject.com/en/1.6/ref/settings/
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
# SITE_ID = 1

13
pydash/urls.py

@ -11,8 +11,10 @@ urlpatterns = patterns('',
# url(r'^admin/', include(admin.site.urls)),
url(r'^$', 'main.views.index', name='index'),
url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}, name='login'),
url(r'^logout/$', 'django.contrib.auth.views.logout', {'template_name': 'logout.html'}, name='logout'),
url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'},
name='login'),
url(r'^logout/$', 'django.contrib.auth.views.logout', {'template_name': 'logout.html'},
name='logout'),
url(r'^main/$', 'main.views.getall', name='main'),
url(r'^info/uptime/$', 'usage.views.uptime', name='uptime'),
url(r'^info/memory/$', 'usage.views.memusage', name='memusage'),
@ -26,9 +28,8 @@ urlpatterns = patterns('',
url(r'^info/loadaverage/$', 'usage.views.loadaverage', name='loadaverage'),
url(r'^info/platform/([\w\-\.]+)/$', 'usage.views.platform', name='platform'),
url(r'^info/getcpus/([\w\-\.]+)/$', 'usage.views.getcpus', name='getcpus'),
url(r'^info/getnetstat/$', 'usage.views.getnetstat', name='getnetstat')
)
url(r'^info/getnetstat/$', 'usage.views.getnetstat', name='getnetstat'))
urlpatterns += patterns('',
(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
)
(r'^static/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.STATIC_ROOT}))

34
usage/views.py

@ -21,14 +21,13 @@
# SOFTWARE.
import json
from django.shortcuts import render_to_response
from django.http import HttpResponse, HttpResponseRedirect
from django.template import RequestContext
from django.contrib.auth.decorators import login_required
from django.http import HttpResponse
from main.views import *
from pydash.settings import TIME_JS_REFRESH, TIME_JS_REFRESH_LONG, TIME_JS_REFRESH_NET
time_refresh = TIME_JS_REFRESH
time_refresh_long = TIME_JS_REFRESH_LONG
time_refresh_net = TIME_JS_REFRESH_NET
@ -50,6 +49,7 @@ def getnetstat(request):
response.write(data)
return response
@login_required(login_url='/login/')
def platform(request, name):
"""
@ -60,6 +60,8 @@ def platform(request, name):
osname = getplatform['osname']
kernel = getplatform['kernel']
data = {}
if name == 'hostname':
try:
data = hostname
@ -84,14 +86,16 @@ def platform(request, name):
response.write(data)
return response
@login_required(login_url='/login/')
def getcpus(request, name):
"""
Return the CPU number and type/model
"""
getcpus = get_cpus()
cputype = getcpus['type']
cpucount = getcpus['cpus']
cpus = get_cpus()
cputype = cpus['type']
cpucount = cpus['cpus']
data = {}
if name == 'type':
try:
@ -135,16 +139,17 @@ def getdisk(request):
Return the disk usage
"""
try:
getdisk = get_disk()
diskusage = get_disk()
except Exception:
getdisk = None
diskusage = None
data = json.dumps(getdisk)
data = json.dumps(diskusage)
response = HttpResponse()
response['Content-Type'] = "text/javascript"
response.write(data)
return response
@login_required(login_url='/login/')
def getips(request):
"""
@ -196,6 +201,7 @@ def getproc(request):
response.write(data)
return response
@login_required(login_url='/login/')
def cpuusage(request):
"""
@ -224,6 +230,7 @@ def cpuusage(request):
response.write(data)
return response
@login_required(login_url='/login/')
def memusage(request):
"""
@ -231,7 +238,6 @@ def memusage(request):
"""
datasets_free = []
datasets_used = []
cookie_memory = {}
try:
mem_usage = get_mem()
@ -307,6 +313,7 @@ def memusage(request):
response.write(data)
return response
@login_required(login_url='/login/')
def loadaverage(request):
"""
@ -376,8 +383,6 @@ def gettraffic(request):
datasets_in_i = []
datasets_out = []
datasets_out_o = []
json_traffic = []
cookie_traffic = {}
label = "KBps"
try:
@ -501,13 +506,10 @@ def getdiskio(request):
datasets_in_i = []
datasets_out = []
datasets_out_o = []
json_diskrw = []
cookie_diskrw = {}
try:
diskrw = get_disk_rw()
diskrw = diskrw[0]
except Exception:
diskrw = 0

Loading…
Cancel
Save