Changeset 1363

Timestamp:

05/02/07 09:39:11 (17 years ago)

Author:

mar637

Message:

ATNF doesn't allow http acces to ftp server anymore. Use ftp directly

File:

• trunk/bin/asap_update_data (modified) (4 diffs)

trunk/bin/asap_update_data

@@ -1 +1 @@
 #!/usr/bin/env python
-import urllib2
 import os
 import tarfile
+import shutil
+from ftplib import FTP
 
-import shutil
+# globals
+md5suff = '.md5sum'
+name = 'asap_data.tar.bz2'
+dataurl  = "ftp.atnf.csiro.au"
+tmpdata = '/tmp/asap_data.tar.bz2'
+datadir = 'pub/software/asap/data'
+tmpmd5 = tmpdata+md5suff
 
-name = 'asap_data.tar.bz2'
-dataurl  = "http://www.atnf.csiro.au/pub/software/asap/data/"
-tmpdata = '/tmp/asap_data.tar.bz2'
-tmpmd5 = tmpdata+'.md5sum'
-
+ftp = FTP(dataurl)   # connect to host, default port
+ftp.login()               # user anonymous, passwd anonymous@
+ftp.cwd(datadir)
 print "Checking if an update is required."
-md5req = urllib2.Request(dataurl+name+'.md5sum')
-response = urllib2.urlopen(md5req)
-md5file = file(tmpmd5,'w')
-md5file.write(response.read())
-md5file.close()
+ftp.retrbinary('RETR %s' % name+md5suff, open(tmpmd5, 'wb').write)
 md5file = file(tmpmd5)
 md5new = md5file.readlines()[0].split()[0]
@@ -28 +29 @@
     asapbase = asap.__path__[0]
 try:
-    fl = os.path.join(asapbase, name+".md5sum")
+    fl = os.path.join(asapbase, name+md5suff)
     data_md5 = file(fl)
     ls = data_md5.readlines()[0]
@@ -37 +38 @@
 
 if md5new != md5old:
-    dreq = urllib2.Request(dataurl+name)
-    src = urllib2.urlopen(dreq)
     print "Update required. Downloading asap data archive...."
-    dst = open(tmpdata, 'w')
-    dst.write(src.read())
-    dst.close()
+    ftp.retrbinary('RETR %s' % name, open(tmpdata, 'wb').write)
     os.chdir(asapbase)
     tf = tarfile.TarFile.bz2open(tmpdata)
@@ -52 +49 @@
     print """Data already at latest available version.
 If you still get errors running asap, please report this."""
+ftp.quit()