Commit 6af73512 authored by Gao, Shang's avatar Gao, Shang
Browse files

updated list comprehensions to remove Nones

parent 84405c1a

crossbow/crossbow.py

+8 −8
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ class crossbowBase(object): 
            names of available resources in package

        '''

        metadata = self.ckan.action.package_show(id=package)

        resources = [resource['name'] if resource['url'][-4:]==".dcd" else None for resource in metadata['resources']]

        resources = [resource['name'] for resource in metadata['resources'] if resource['url'][-4:]==".dcd"]

        return resources



    def list_non_dcd_resources(self,package):
@@ -153,7 +153,7 @@ class crossbowBase(object): 
            names of available resources in package

        '''

        metadata = self.ckan.action.package_show(id=package)

        resources = [resource['name'] if resource['url'][-4:]!=".dcd" else None for resource in metadata['resources']]

        resources = [resource['name'] for resource in metadata['resources'] if resource['url'][-4:]!=".dcd"]

        return resources



    def get_resource_details(self,package,resource):
@@ -170,7 +170,7 @@ class crossbowBase(object): 
            metadata for specific resource

        '''

        pkg_metadata = self.ckan.action.package_show(id=package)

        rsc_metadata = [metadata if metadata['name']==resource else None for metadata in pkg_metadata['resources']][0]

        rsc_metadata = [metadata for metadata in pkg_metadata['resources'] if metadata['name']==resource][0]

        print "package name: %s" % package

        print "resource name: %s" % resource

        print "resource description: %s" % rsc_metadata['description']
@@ -328,7 +328,7 @@ class crossbowMount(crossbowBase): 
        '''

        #get current metadata

        pkg_metadata = self.ckan.action.package_show(id=package)

        rsc_metadata = [metadata if metadata['name']==resource else None for metadata in pkg_metadata['resources']][0]

        rsc_metadata = [metadata for metadata in pkg_metadata['resources'] if metadata['name']==resource][0]



        #update metadata with new edits

        if new_name:
@@ -350,7 +350,7 @@ class crossbowMount(crossbowBase): 
             NFS file URI path to resource (e.g. "/data/file.csv")

         '''

         pkg_metadata = self.ckan.action.package_show(id=package)

         resource_path = [metadata['url'] if metadata['name']==resource else None for metadata in pkg_metadata['resources']][0]

         resource_path = [metadata['url'] for metadata in pkg_metadata['resources'] if metadata['name']==resource][0]

         resource_path = resource_path.replace("file://CROSSBOW_NFS/", self.NFS_path)

         return resource_path
@@ -367,7 +367,7 @@ class crossbowMount(crossbowBase): 
            directory to copy resource into

        '''

        pkg_metadata = self.ckan.action.package_show(id=package)

        resource_path = [metadata['url'] if metadata['name']==resource else None for metadata in pkg_metadata['resources']][0]

        resource_path = [metadata['url'] for metadata in pkg_metadata['resources'] if metadata['name']==resource][0]

        resource_path = resource_path.replace("file://CROSSBOW_NFS/", self.NFS_path)

        dest_path = destination + os.path.basename(resource_path)
@@ -390,13 +390,13 @@ class crossbowMount(crossbowBase): 
            if True, also delete the resource file from NFS

        '''

        pkg_metadata = self.ckan.action.package_show(id=package)

        resource_id = [metadata['id'] if metadata['name']==resource else None for metadata in pkg_metadata['resources']][0]

        resource_id = [metadata['id'] for metadata in pkg_metadata['resources'] if metadata['name']==resource][0]



        #delete from ckan

        self.ckan.action.resource_delete(id=resource_id)



        #delete from nfs

        resource_path = [metadata['url'] if metadata['name']==resource else None for metadata in pkg_metadata['resources']][0]

        resource_path = [metadata['url'] for metadata in pkg_metadata['resources'] if metadata['name']==resource][0]

        resource_path = resource_path.replace("file://CROSSBOW_NFS/", self.NFS_path)

        os.remove(resource_path)