Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More documentation and flexibility for FTP imports. #2168

Merged
merged 4 commits into from Apr 14, 2016

Conversation

Projects
None yet
6 participants
@jmchilton
Copy link
Member

commented Apr 14, 2016

  • Add missing documentation for the ftp_upload_dir_identifier option. f95cbf8
  • Add ftp_upload_dir_template option to configure how to combine identifier and base directory to generate an ftp upload directory. f95cbf8
  • Add option to prevent FTP uploads from being deleted on import (ftp_upload_purge). 997b53f
  • Refactoring to use centralized logic for determining a user's FTP upload directory 5417380.

jmchilton added some commits Apr 14, 2016

More documentation and flexibility for configuring FTP imports.
 - Add missing documentation for the ftp_upload_dir_identifier option.
 - Add ftp_upload_dir_template option to configure how to combine identifier and base directory to generate an ftp upload directory.
@erasche

This comment has been minimized.

Copy link
Member

commented Apr 14, 2016

Add option to prevent FTP uploads from being deleted on import (ftp_upload_purge). 997b53f

well that's everything I've wanted to see fixed and more. Thanks @jmchilton :D

@@ -1013,13 +1013,27 @@ use_interactive = True
# database for authentication) and set the following two options.

# This should point to a directory containing subdirectories matching users'
# email addresses, where Galaxy will look for files.
# identifer (defaults to e-mail), where Galaxy will look for files.

This comment has been minimized.

Copy link
@nsoranzo

nsoranzo Apr 14, 2016

Member

s/identifer/identifier/

# username though.
#ftp_upload_dir_identifier = email

# Python string tempalte used to determine an FTP upload directory for a

This comment has been minimized.

Copy link
@nsoranzo

nsoranzo Apr 14, 2016

Member

s/tempalte/template/

@nsoranzo

This comment has been minimized.

Copy link
Member

commented Apr 14, 2016

@jmchilton LGTM, thanks for adding the documentation!

@nsoranzo

This comment has been minimized.

Copy link
Member

commented Apr 14, 2016

👍

@dannon dannon merged commit fbf894e into galaxyproject:dev Apr 14, 2016

4 checks passed

api test Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished.
Details
toolshed test Build finished.
Details
@guerler

This comment has been minimized.

Copy link
Contributor

commented on lib/galaxy/managers/context.py in f95cbf8 Apr 29, 2016

Should this be: ftp_upload_dir_identifier=getattr( self.user, identifier )

This comment has been minimized.

Copy link
Member Author

replied Apr 29, 2016

Yeah - this was definitely botched. Thanks for the catch.

This comment has been minimized.

Copy link
Member Author

replied Apr 29, 2016

Fix here #2271 - I tested with both username and email as identifier. The new integration test framework would make it really easy to test these configuration parameters - I'll write a test next time I touch upload.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.