Changeset 4346 for trunk

Timestamp:

Mar 6, 2020 5:17:15 PM (4 years ago)

Author:

toby

Message:

implement additional proxy access (documented in ​https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/ProxyInfo)

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIpath.py (modified) (5 diffs)

trunk/GSASIIdataGUI.py

@@ -2123 +2123 @@
         '''Edit the proxy information used by subversion
         '''
-        h,p = host,port = GSASIIpath.getsvnProxy()
+        h,p,e = host,port,etc = GSASIIpath.getsvnProxy()
+        if e:
+            proxyinfo = os.path.join(GSASIIpath.path2GSAS2,"proxyinfo.txt")
+            G2G.G2MessageBox(self,'File {} has manually-'.format(proxyinfo)+
+                'entered information. Please edit this by hand',
+                                 'Unable to edit')
+            return
         dlg = G2G.MultiStringDialog(self,'Enter proxy values',
                                         ['Proxy address','proxy port'],
                                         [host,port],size=300)
-        #dlg.SetSize((300,-1))
         if dlg.Show():
             h,p = dlg.GetValues()

trunk/GSASIIpath.py

@@ -170 +170 @@
         fp = open(proxyinfo,'r')
         host = fp.readline().strip()
+        # allow file to begin with comments
+        while host.startswith('#'):
+            host = fp.readline().strip()
         port = fp.readline().strip()
+        etc = []
+        line = fp.readline()
+        while line:
+            etc.append(line.strip())
+            line = fp.readline()
         fp.close()
-        setsvnProxy(host,port)
+        setsvnProxy(host,port,etc)
         if not host.strip(): return '',''
-        return host,port
-    return '',''
-
-def setsvnProxy(host,port):
+        return host,port,etc
+    return '','',''
+
+def setsvnProxy(host,port,etc=[]):
     '''Sets the svn commands needed to use a proxy
     '''
@@ -184 +192 @@
     host = host.strip()
     port = port.strip()
-    if not host: return
-    proxycmds.append('--config-option')
-    proxycmds.append('servers:global:http-proxy-host='+host)
+    if host: 
+        proxycmds.append('--config-option')
+        proxycmds.append('servers:global:http-proxy-host='+host)
     if port:
         proxycmds.append('--config-option')
         proxycmds.append('servers:global:http-proxy-port='+port)
+    for item in etc:
+        proxycmds.append(item)
         
 def whichsvn():
@@ -206 +216 @@
     svnprog = 'svn'
     if sys.platform.startswith('win'): svnprog += '.exe'
-    host,port = getsvnProxy()
+    host,port,etc = getsvnProxy()
     if GetConfigValue('debug') and host:
         print('DBG_Using proxy host {} port {}'.format(host,port))
@@ -333 +343 @@
         cmd += ['--non-interactive', '--trust-server-cert']
     if proxycmds: cmd += proxycmds
+    # if GetConfigValue('debug'):
+    #     s = 'subversion command:\n  '
+    #     for i in cmd: s += i + ' '
+    #     print(s)
     s = subprocess.Popen(cmd, stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     out,err = MakeByte2str(s.communicate())
@@ -429 +443 @@
         cmd += ['--trust-server-cert']
     if proxycmds: cmd += proxycmds
+    #if verbose or GetConfigValue('debug'):
     if verbose:
         s = 'subversion command:\n  '