2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/cf58e35b3a97/ Changeset: cf58e35b3a97 User: dan Date: 2013-06-20 22:24:33 Summary: Fix for GenomeSpace Export root directory listing. Affected #: 2 files diff -r a5dd3ca6f5ef97eadf62bc4642c8d36c4ed3bce4 -r cf58e35b3a973311ab291e90b501c6f4bc31b6d3 tools/genomespace/genomespace_exporter.py --- a/tools/genomespace/genomespace_exporter.py +++ b/tools/genomespace/genomespace_exporter.py @@ -70,7 +70,7 @@ return ( dir_dict, path ) def get_default_directory( url_opener, dm_url ): - return get_directory( url_opener, dm_url, ["defaultdirectory"] )[0] + return get_directory( url_opener, dm_url, ["%s/defaultdirectory" % ( GENOMESPACE_API_VERSION_STRING ) ] )[0] def get_personal_directory( url_opener, dm_url ): return get_directory( url_opener, dm_url, [ "%s/personaldirectory" % ( GENOMESPACE_API_VERSION_STRING ) ] )[0] @@ -143,8 +143,9 @@ url_opener = get_cookie_opener( username, token ) genomespace_site_dict = get_genomespace_site_urls()[ genomespace_site ] dm_url = genomespace_site_dict['dmServer'] - #get default directory - directory_dict = get_default_directory( url_opener, dm_url ).get( 'directory', None ) + #get export root directory + #directory_dict = get_default_directory( url_opener, dm_url ).get( 'directory', None ) #This directory contains shares and other items outside of the users home + directory_dict = get_personal_directory( url_opener, dm_url ).get( 'directory', None ) #Limit export list to only user's home dir if directory_dict is None: return [] #what directory to stuff this in diff -r a5dd3ca6f5ef97eadf62bc4642c8d36c4ed3bce4 -r cf58e35b3a973311ab291e90b501c6f4bc31b6d3 tools/genomespace/genomespace_exporter.xml --- a/tools/genomespace/genomespace_exporter.xml +++ b/tools/genomespace/genomespace_exporter.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tool name="GenomeSpace Exporter" id="genomespace_exporter" require_login="True" version="0.0.1"> +<tool name="GenomeSpace Exporter" id="genomespace_exporter" require_login="True" version="0.0.2"><description> - send data to GenomeSpace</description><command interpreter="python">genomespace_exporter.py --genomespace_site "prod" https://bitbucket.org/galaxy/galaxy-central/commits/5a8069419967/ Changeset: 5a8069419967 Branch: stable User: dan Date: 2013-06-20 22:24:33 Summary: Fix for GenomeSpace Export root directory listing. Affected #: 2 files diff -r adee6fc31991ee4291a28e4e209ef9583ba811ab -r 5a8069419967cfdb2157482ad239f75624354b78 tools/genomespace/genomespace_exporter.py --- a/tools/genomespace/genomespace_exporter.py +++ b/tools/genomespace/genomespace_exporter.py @@ -70,7 +70,7 @@ return ( dir_dict, path ) def get_default_directory( url_opener, dm_url ): - return get_directory( url_opener, dm_url, ["defaultdirectory"] )[0] + return get_directory( url_opener, dm_url, ["%s/defaultdirectory" % ( GENOMESPACE_API_VERSION_STRING ) ] )[0] def get_personal_directory( url_opener, dm_url ): return get_directory( url_opener, dm_url, [ "%s/personaldirectory" % ( GENOMESPACE_API_VERSION_STRING ) ] )[0] @@ -143,8 +143,9 @@ url_opener = get_cookie_opener( username, token ) genomespace_site_dict = get_genomespace_site_urls()[ genomespace_site ] dm_url = genomespace_site_dict['dmServer'] - #get default directory - directory_dict = get_default_directory( url_opener, dm_url ).get( 'directory', None ) + #get export root directory + #directory_dict = get_default_directory( url_opener, dm_url ).get( 'directory', None ) #This directory contains shares and other items outside of the users home + directory_dict = get_personal_directory( url_opener, dm_url ).get( 'directory', None ) #Limit export list to only user's home dir if directory_dict is None: return [] #what directory to stuff this in diff -r adee6fc31991ee4291a28e4e209ef9583ba811ab -r 5a8069419967cfdb2157482ad239f75624354b78 tools/genomespace/genomespace_exporter.xml --- a/tools/genomespace/genomespace_exporter.xml +++ b/tools/genomespace/genomespace_exporter.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tool name="GenomeSpace Exporter" id="genomespace_exporter" require_login="True" version="0.0.1"> +<tool name="GenomeSpace Exporter" id="genomespace_exporter" require_login="True" version="0.0.2"><description> - send data to GenomeSpace</description><command interpreter="python">genomespace_exporter.py --genomespace_site "prod" Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.