Changeset 3138 for trunk

Timestamp:

03/05/19 20:52:06 (5 years ago)

Author:

VincentMcIntyre

Message:

Manpage for asap_update_data

Location:

trunk

Files:

• bin/asap_update_data (modified) (3 diffs)
• debian/README.Debian (modified) (1 diff)
• debian/asap_update_data.1 (added)

trunk/bin/asap_update_data

@@ -1 +1 @@
 #!/usr/bin/env python
+from __future__ import print_function
 import os
+import sys
+import tempfile
+import urllib
+import errno
+import shutil
 import tarfile
-import shutil
-from ftplib import FTP
+
+def errormsg(args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
+
+def isWritable(path):
+    try:
+        testfile = tempfile.TemporaryFile(dir = path)
+        testfile.close()
+    except OSError as e:
+        if e.errno == errno.EACCES:  # 13
+            return False
+        e.filename = path
+        raise
+    return True
+
+def cleanup(inlist):
+    for item in inlist:
+        if os.path.isfile(item):
+            os.remove(item)
+        if os.path.isdir(item):
+            os.rmdir(item)
 
 # 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
-
-ftp = FTP(dataurl)   # connect to host, default port
-ftp.login()               # user anonymous, passwd anonymous@
-ftp.cwd(datadir)
-print "Checking if an update is required."
-ftp.retrbinary('RETR %s' % name+md5suff, open(tmpmd5, 'wb').write)
-md5file = file(tmpmd5)
-md5new = md5file.readlines()[0].split()[0]
+md5suff  = '.md5sum'
+name     = 'asap_data.tar.bz2'
+dataurl  = "ftp://ftp.atnf.csiro.au"
+datadir  = 'pub/software/asap/data'
 
 # use ASAPDATA if set - allows non-root update
@@ -28 +43 @@
     # get asap module path
     asapbase = asap.__path__[0]
+
+print('asapbase is ' + asapbase)
+# check we have write permission to asapbase before continuing
+if not isWritable(asapbase):
+    errormsg(['No write access to %s, aborting ' % asapbase])
+    exit()
+
+# Ensure the file is read/write by the creator only
+saved_umask = os.umask(0077)
+
+tmpdir  = tempfile.mkdtemp()
+md5path = os.path.join(tmpdir, name + md5suff)
+
+print("Checking if an update is required.")
+url = dataurl + '/' + datadir + '/' + name + md5suff
+try:
+    urllib.urlretrieve (url, md5path)
+    md5file = file(md5path)
+    md5new = md5file.readlines()[0].split()[0]
+except IOError as e:
+    errormsg(['Download failed\n','IOError %s' % e.errno])
+    cleanup([md5path,tmpdir])
+    exit()
+else:
+    print('Downloaded checksum file to ' + md5path)
+
 try:
     fl = os.path.join(asapbase, name+md5suff)
@@ -37 +78 @@
     md5old =''
 
-if md5new != md5old:
-    print "Update required. Downloading asap data archive...."
-    ftp.retrbinary('RETR %s' % name, open(tmpdata, 'wb').write)
-    os.chdir(asapbase)
-    tf = tarfile.TarFile.bz2open(tmpdata)
-    print "Extracting data archive in %s.." % asapbase
-    for member in tf.getmembers():
-        tf.extract(member)
-    shutil.copy(tmpmd5, asapbase)
-    os.remove(tmpdata)
-    os.remove(tmpmd5)
+if md5new == md5old:
+    print("""Data already at latest available version.
+If you still get errors running asap, please report this.""")
+    cleanup([md5path,tmpdir])
+    exit()
+
+print("Update required. Downloading asap data archive....")
+url = dataurl + '/' + datadir + '/' + name
+tarpath = os.path.join(tmpdir, name)
+urllib.urlcleanup()
+try:
+     urllib.urlretrieve (url, tarpath)
+except IOError as e:
+    errormsg(['Download failed\n','IOError %s' % e.errno])
+    cleanup([tarpath,md5path,tmpdir])
+    exit()
 else:
-    print """Data already at latest available version.
-If you still get errors running asap, please report this."""
-ftp.quit()
+    print('Downloaded tar file to ' + tarpath)
+
+print("Extracting data archive in %s.." % asapbase)
+os.umask(saved_umask)
+shutil.copy(md5path, fl)
+shutil.copy(tarpath, os.path.join(asapbase, name))
+os.chdir(asapbase)
+tf = tarfile.TarFile.bz2open(name)
+for member in tf.getmembers():
+    tf.extract(member)
+
+cleanup([tarpath,md5path,tmpdir])
+exit()
+

trunk/debian/README.Debian

@@ -1 +1 @@
 asap for Debian
----------------
+===============
 
-<possible notes regarding this package - if none, delete this file>
+Data Tables
+-----------
+ASAP needs access to astronomical data tables that need to be updated regularly.
+This task is done by the /etc/cron.weekly/python-asap cron job.
+The casacore packages that ASAP is built on top of expect the data to be
+unpacked into this directory:
+
+   /var/lib/casacore/data
+
+Environment variables
+---------------------
+
+You can override the data tables location by setting the ASAPDATA environment
+variable. You should set ASAPDATA so that the path $ASAPDATA/ephemerides exists.
+The data files are published by the U.S. National Radio Astronomy Observatory
+(NRAO), as part of the Common Astronomical Software Applications (CASA) data
+processing package, but can be downloaded separately.
+
+If you also set the CASAPATH environment variable, so that it points to a
+different data area than ASAPDATA, you may get unexpected behaviour.
+
+Per-user config files
+---------------------
+
+ASAP allows you to customise your settings in $HOME/.asap.
+It will also check in your $HOME/.ipython directory.
 
  -- Malte Marquarding <Malte.Marquarding@csiro.au>  Wed, 11 May 2011 16:00:56 +1000