Made pydash a django app.

example/example/settings.py

@@ -0,0 +1,135 @@
+"""
+Django settings for pydash project.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.6/topics/settings/
+
+For the full list of settings and their values, see
+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
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = '1)$crmowu-23tz@i2-d=7tb3t+1u&(pm!lnjyuarki^72h!3af'
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+TEMPLATE_DEBUG = True
+
+ADMINS = (
+)
+
+MANAGERS = ADMINS
+
+
+ALLOWED_HOSTS = ['*']
+
+# Application definition
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    # Add pydash here
+    'pydash'
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+)
+
+ROOT_URLCONF = 'example.urls'
+
+WSGI_APPLICATION = 'example.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3')
+    }
+}
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.6/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+    # 'django.template.loaders.eggs.Loader',
+)
+
+TEMPLATE_DIRS = (os.path.join(BASE_DIR, 'templates'),)
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.6/howto/static-files/
+
+STATIC_ROOT = os.path.join(os.path.dirname(__file__), '..', 'static')
+STATIC_URL = '/static/'
+
+STATICFILES_DIRS = (
+)
+
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    #'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'filters': {
+        'require_debug_false': {
+            '()': 'django.utils.log.RequireDebugFalse'
+        }
+    },
+    'handlers': {
+        'mail_admins': {
+            'level': 'ERROR',
+            'filters': ['require_debug_false'],
+            'class': 'django.utils.log.AdminEmailHandler'
+        }
+    },
+    'loggers': {
+        'django.request': {
+            'handlers': ['mail_admins'],
+            'level': 'ERROR',
+            'propagate': True,
+        },
+    }
+}
+
+try:
+    from local_settings import *
+except ImportError:
+    pass

example/example/urls.py

@@ -0,0 +1,4 @@
+from django.conf.urls import patterns, include, url
+
+urlpatterns = patterns('',
+                       url(r'^pydash/', include('pydash.urls')))

example/pydash

@@ -0,0 +1 @@
+../pydash

pydash/settings.py

@@ -1,143 +1,8 @@
-"""
-Django settings for pydash project.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.6/topics/settings/
-
-For the full list of settings and their values, see
-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
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '1)$crmowu-23tz@i2-d=7tb3t+1u&(pm!lnjyuarki^72h!3af'
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
-
-TEMPLATE_DEBUG = False
-
-ADMINS = (
-)
-
-MANAGERS = ADMINS
-
-#All refresh values are in miliseconds, 1 second = 1000 miliseconds
-#Adjust accordingly as you wish
-TIME_JS_REFRESH = 30000
-TIME_JS_REFRESH_LONG = 120000
-TIME_JS_REFRESH_NET = 2000
-
-VERSION = "1.4.4"
-
-ALLOWED_HOSTS = ['*']
-
-
-# Application definition
-
-INSTALLED_APPS = (
-    #'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    #'django.contrib.sites',
-    'django.contrib.staticfiles',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
-
-ROOT_URLCONF = 'pydash.urls'
-
-WSGI_APPLICATION = 'pydash.wsgi.application'
-
-
-# Database
-# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3')
-    }
-}
-
-# Internationalization
-# https://docs.djangoproject.com/en/1.6/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-TIME_ZONE = 'UTC'
-
-USE_I18N = True
-
-USE_L10N = True
-
-USE_TZ = True
-
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-    # 'django.template.loaders.eggs.Loader',
-)
-
-TEMPLATE_DIRS = (os.path.join(BASE_DIR, 'templates'),)
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.6/howto/static-files/
-
-STATIC_ROOT = os.path.join(os.path.dirname(__file__), '..', 'static')
-STATIC_URL = '/static/'
-
-STATICFILES_DIRS = (
-)
-
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    #'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'filters': {
-        'require_debug_false': {
-            '()': 'django.utils.log.RequireDebugFalse'
-        }
-    },
-    'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'filters': ['require_debug_false'],
-            'class': 'django.utils.log.AdminEmailHandler'
-        }
-    },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-    }
-}
-
-try:
-    from local_settings import *
-except ImportError:
-    pass
+from django.conf import settings
+
+# All of the refresh values are in miliseconds, 1 second = 1000 miliseconds
+# Adjust accordingly as you wish, preferably in your application's settings.py.
+TIME_JS_REFRESH = getattr(settings, 'TIME_JS_REFRESH', 30000)
+TIME_JS_REFRESH_LONG = getattr(settings, 'TIME_JS_REFRESH_LONG', 120000)
+TIME_JS_REFRESH_NET = getattr(settings, 'TIME_JS_REFRESH_NET', 2000)
+_VERSION = '1.4.4'

pydash/urls.py

@@ -1,35 +1,21 @@
 from django.conf.urls import patterns, url
-from django.conf import settings
-
-# from django.contrib import admin
-# admin.autodiscover()
 
 urlpatterns = patterns('',
-                       # Examples:
-                       # url(r'^$', 'pydash.views.home', name='home'),
-                       # url(r'^blog/', include('blog.urls')),
-
-                       # 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'},
+                       url(r'^$', 'pydash.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'},
+                       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'),
-                       url(r'^info/cpuusage/$', 'usage.views.cpuusage', name='cpuusage'),
-                       url(r'^info/getdisk/$', 'usage.views.getdisk', name='getdisk'),
-                       url(r'^info/getusers/$', 'usage.views.getusers', name='getusers'),
-                       url(r'^info/getips/$', 'usage.views.getips', name='getips'),
-                       url(r'^info/gettraffic/$', 'usage.views.gettraffic', name='gettraffic'),
-                       url(r'^info/proc/$', 'usage.views.getproc', name='getproc'),
-                       url(r'^info/getdiskio/$', 'usage.views.getdiskio', name='getdiskio'),
-                       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'))
-
-urlpatterns += patterns('',
-                        (r'^static/(?P<path>.*)$', 'django.views.static.serve',
-                         {'document_root': settings.STATIC_ROOT}))
+                       url(r'info/uptime/$', 'pydash.views.uptime', name='uptime'),
+                       url(r'info/memory/$', 'pydash.views.memusage', name='memusage'),
+                       url(r'info/cpuusage/$', 'pydash.views.cpuusage', name='cpuusage'),
+                       url(r'info/getdisk/$', 'pydash.views.getdisk', name='getdisk'),
+                       url(r'info/getusers/$', 'pydash.views.getusers', name='getusers'),
+                       url(r'info/getips/$', 'pydash.views.getips', name='getips'),
+                       url(r'info/gettraffic/$', 'pydash.views.gettraffic', name='gettraffic'),
+                       url(r'info/proc/$', 'pydash.views.getproc', name='getproc'),
+                       url(r'info/getdiskio/$', 'pydash.views.getdiskio', name='getdiskio'),
+                       url(r'info/loadaverage/$', 'pydash.views.loadaverage', name='loadaverage'),
+                       url(r'info/platform/([\w\-\.]+)/$', 'pydash.views.platform', name='platform'),
+                       url(r'info/getcpus/([\w\-\.]+)/$', 'pydash.views.getcpus', name='getcpus'),
+                       url(r'info/getnetstat/$', 'pydash.views.getnetstat', name='getnetstat'))