<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14106] CalendarServer/trunk/calendarserver/tools/dashboard.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14106">14106</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-10-27 07:46:37 -0700 (Mon, 27 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean-up.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsdashboardpy">CalendarServer/trunk/calendarserver/tools/dashboard.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsdashboardpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dashboard.py (14105 => 14106)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dashboard.py 2014-10-27 14:39:17 UTC (rev 14105)
+++ CalendarServer/trunk/calendarserver/tools/dashboard.py 2014-10-27 14:46:37 UTC (rev 14106)
</span><span class="lines">@@ -21,18 +21,21 @@
</span><span class="cx">
</span><span class="cx"> from getopt import getopt, GetoptError
</span><span class="cx">
</span><del>-import curses
</del><span class="cx"> import curses.panel
</span><ins>+import errno
+import fcntl
</ins><span class="cx"> import json
</span><ins>+import logging
</ins><span class="cx"> import os
</span><span class="cx"> import sched
</span><ins>+import socket
+import struct
</ins><span class="cx"> import sys
</span><ins>+import termios
</ins><span class="cx"> import time
</span><del>-import socket
-import errno
-import logging
</del><ins>+
</ins><span class="cx"> LOG_FILENAME = 'db.log'
</span><del>-#logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG)
</del><ins>+# logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -115,6 +118,18 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+def terminal_size():
+ h, w, _ignore_hp, _ignore_wp = struct.unpack(
+ 'HHHH',
+ fcntl.ioctl(
+ 0, termios.TIOCGWINSZ,
+ struct.pack('HHHH', 0, 0, 0, 0)
+ )
+ )
+ return w, h
+
+
+
</ins><span class="cx"> class Dashboard(object):
</span><span class="cx"> """
</span><span class="cx"> Main dashboard controller. Use Python's L{sched} feature to schedule
</span><span class="lines">@@ -156,12 +171,6 @@
</span><span class="cx"> self.sched.enter(self.seconds, 0, self.updateDisplay, ())
</span><span class="cx"> self.sched.run()
</span><span class="cx">
</span><del>- def terminal_size(self):
- import fcntl, termios, struct
- h, w, hp, wp = struct.unpack('HHHH',
- fcntl.ioctl(0, termios.TIOCGWINSZ,
- struct.pack('HHHH', 0, 0, 0, 0)))
- return w, h
</del><span class="cx">
</span><span class="cx"> def displayWindow(self, wtype):
</span><span class="cx"> """
</span><span class="lines">@@ -192,12 +201,12 @@
</span><span class="cx"> ordered_windows = [self.registered_windows[i] for i in self.registered_order]
</span><span class="cx"> for wtype in filter(lambda x: x.all, ordered_windows):
</span><span class="cx"> new_win = wtype(self.usesCurses, self.client).makeWindow(top=top)
</span><del>- logging.debug('created %r at panel level %r' % (new_win,new_win.z_order))
</del><ins>+ logging.debug('created %r at panel level %r' % (new_win, new_win.z_order))
</ins><span class="cx"> self.windows.append(wtype(self.usesCurses, self.client).makeWindow(top=top))
</span><span class="cx"> self.windows[-1].activate()
</span><span class="cx"> top += self.windows[-1].nlines + 1
</span><span class="cx"> # Don't display help panel if the window is too narrow
</span><del>- term_w, term_h = self.terminal_size()
</del><ins>+ term_w, term_h = terminal_size()
</ins><span class="cx"> logging.debug("logger displayWindow: rows: %s cols: %s" % (term_h, term_w))
</span><span class="cx"> if int(term_w) > 100:
</span><span class="cx"> logging.debug('term_w > 100, making window with top at %d' % (top))
</span><span class="lines">@@ -376,14 +385,6 @@
</span><span class="cx"> self.z_order = 'bottom'
</span><span class="cx">
</span><span class="cx">
</span><del>- def terminal_size(self):
- import fcntl, termios, struct
- h, w, hp, wp = struct.unpack('HHHH',
- fcntl.ioctl(0, termios.TIOCGWINSZ,
- struct.pack('HHHH', 0, 0, 0, 0)))
- return w, h
-
-
</del><span class="cx"> def makeWindow(self, top=0, left=0):
</span><span class="cx"> raise NotImplementedError()
</span><span class="cx">
</span><span class="lines">@@ -478,12 +479,12 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> def makeWindow(self, top=0, left=0):
</span><del>- term_w, term_h = self.terminal_size()
</del><ins>+ term_w, _ignore_term_h = terminal_size()
</ins><span class="cx"> help_x_offset = term_w - BOX_WIDTH + 4
</span><span class="cx"> self._createWindow(
</span><span class="cx"> "Help",
</span><span class="cx"> len(self.helpItems) + len(Dashboard.registered_windows) + 2,
</span><del>- ncols=BOX_WIDTH-4,
</del><ins>+ ncols=BOX_WIDTH - 4,
</ins><span class="cx"> begin_y=0,
</span><span class="cx"> begin_x=help_x_offset,
</span><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>