Changeset 212 for trunk/LocationDo/LocationDo.py

Timestamp:

01/30/06 19:19:27 (18 years ago)

Author:

Nicholas Riley

Message:

LocationDo.py: in 4111, open NX, move windows around (very brittle,
but seems to work OK), and don't SSH to yt until we can wait for
Kerberos tickets to be valid; at home, ensure Kerberos ticket
validity; add a bunch more locations

action.py: handle both "Expired" and "Expired (IP Address Changed)"
messages from Kerberos; open app with name action needed because NX
Client has no bundle ID or creator; move window action (very rough)

File:

• trunk/LocationDo/LocationDo.py (modified) (4 diffs)

trunk/LocationDo/LocationDo.py

@@ -78 +78 @@
     if '4111 SC' in location:
         action.openInBackground('~/Documents/Research/Research progress.oo3')
-        # XXX wait for yt to be accessible
-        # XXX start NX
-        # XXX move windows
-        action.terminalDo('kswitch -p njriley@ACM.UIUC.EDU;(sleep 10;kswitch -p njriley@AD.UIUC.EDU)&! ;clear;ssh yt')
+        # XXX complain that NX has no creator nor bundle ID
+        action.openApplicationWithName('NX Client for OSX')
+        # XXX make these changes dependent on screen resolution
+        action.moveWindow('iTunes', 'iTunes', (2123, 1534), ifSizeMatches=(129, 65))
+        action.moveWindow('Adium', 'Contacts', (1280, 1553))
+        action.moveWindow('Adium', 'AOL System Msg', (1448, 1320))
+        # XXX need better way to do this
+        action.moveWindow('OmniOutliner Pro', 'Research progress', (1634, 847))
+        action.moveWindow('OmniOutliner Pro', '◇ Research progress', (1634, 847))
+        # XXX wait for yt to be accessible and Kerberos, then open the terminal window
+        # action.terminalDo('kswitch -p njriley@ACM.UIUC.EDU;(sleep 10;kswitch -p njriley@AD.UIUC.EDU)&! ;clear;ssh yt')
         action.setDisplayBrightnessPercent(0.9)
         action.setAdiumStatus('Working in 4111 SC')
@@ -89 +96 @@
         action.setAdiumStatus('At ACM')
     if 'Champaign' in location:
+        action.ensureKerberosPrincipalsValid(['njriley@ACM.UIUC.EDU',
+                                              'njriley@AD.UIUC.EDU'])
         action.openInBackground('~/Documents/To do.oo3')
         action.setDisplayBrightnessPercent(0.2)
@@ -158 +167 @@
                     elif bssid == '00:13:c4:ce:66:a0':
                         location.add('13[12]0 DCL')
+                    elif bssid in ['00:0e:83:05:78:02', '00:0e:83:05:77:42']:
+                        location.add('1304 SC')
+                    elif bssid == '00:0e:83:05:78:a2':
+                        location.add('3124 SC')
+                    elif bssid == '00:0e:83:05:76:b2':
+                        location.add('Siebel 2nd floor atrium')
                     elif bssid in ['00:14:1c:ad:5c:80', '00:14:1c:ad:64:50']:
                         location.add('MEB')
                     elif bssid == '00:02:2d:2c:cb:34':
                         location.add('B02 CSL')
+                    elif bssid == '00:11:5c:fe:31:00':
+                        location.add('CAB')
                     elif bssid == '00:13:c4:78:e1:a0':
                         location.add('Engineering Hall')
+                    elif bssid in ['00:0c:30:d4:b7:2d', '00:0c:30:d4:b6:70']:
+                        location.add('Illini Union')
                     elif bssid == '00:0d:93:ed:e0:bc':
                         location.add('340 Marlborough St.')
                     elif bssid == '00:40:96:5a:5e:0f':
                         location.add('BMI baggage claim')
+                    elif bssid == '00:12:0e:10:1f:83':
+                        location.add('Waterville Valley')
                     elif bssid == '44:44:44:44:44:44':
                         location.add('No AirPort network')
@@ -192 +213 @@
                     elif ssid == 'Wackyland':
                         location.add('340 Marlborough St.')
+                    elif ssid == '05B408706826':
+                        location.add('Waterville Valley')
                     elif ssid == 'CIRA':
                         location.add('BMI')