Commit Graph

326 Commits

Author SHA1 Message Date
Matthias Beyer e31239b02b Fix wording in debug message 2015-12-04 21:56:33 +01:00
Matthias Beyer 915cbd24ef Impl From<PathBuf> for FileID, using From<String> for FileID 2015-12-04 21:56:33 +01:00
Matthias Beyer db9c4e48ba ui/TablePrinter: Add debug output 2015-12-04 21:56:33 +01:00
Matthias Beyer 3484858c3d Remove unused code 2015-12-04 21:56:33 +01:00
Matthias Beyer 2ab025a4eb Add test: match_header_spec() testing 2015-12-04 17:52:30 +01:00
Matthias Beyer e025cf8835 Add missing Clone for FileHeaderSpec 2015-12-04 17:52:30 +01:00
Matthias Beyer 04443b34bf Add test: serialize-deserialize-compare 2015-12-04 17:52:30 +01:00
Matthias Beyer 3e75117d69 Add test: Deserialization without Specification should match as well 2015-12-04 17:52:30 +01:00
Matthias Beyer 74a9523f45 Use box_patterns, so we can unbox in the tests 2015-12-04 17:52:30 +01:00
Matthias Beyer 2dce3151bd Remove default impl for Error for ParserError 2015-12-04 17:52:30 +01:00
Matthias Beyer 84e7100229 Add test for deserialization 2015-12-04 17:52:30 +01:00
Matthias Beyer d9019e408e Remove static livetime in ParserError::short() 2015-12-04 17:51:22 +01:00
Matthias Beyer 03856cd3a1 Reimplement StorageBackendError::{new,build} with Into<String> 2015-12-04 15:18:52 +01:00
Matthias Beyer c1d497fa6a Add URL check before adding the "url" to the store 2015-12-04 15:09:03 +01:00
Matthias Beyer 04df3fdf3c Rewrite BMModule::get_filtered_files_from_backend() with the backend speaking Result<> now instead of Option<> 2015-12-04 14:17:32 +01:00
Matthias Beyer 40ae26d0f2 BMModule::list_command() - we get back an Result<> here 2015-12-04 14:17:03 +01:00
Matthias Beyer be094dcfae StorageBackend::iter_files() return Result<> with StorageBackendError on error 2015-12-04 14:04:20 +01:00
Matthias Beyer 3df106ce8b StorageBackend::iter_ids() return Result<> with StorageBackendError on error 2015-12-04 14:02:30 +01:00
Matthias Beyer 1b0f4894ac Use FileIDType::from() and remove select_id_type_from_str() 2015-12-03 17:37:13 +01:00
Matthias Beyer ce4d99384b Impl From<&str> for FileIDType, use implementation in From<String> for FileIDType 2015-12-03 17:36:52 +01:00
Matthias Beyer f25e3683a1 Add hash type to filepath 2015-12-03 17:33:48 +01:00
Matthias Beyer 5c3d0ecce7 Impl Into<FileIDType> for FileID 2015-12-03 17:33:29 +01:00
Matthias Beyer 445f543159 Impl From<String> for FileIDType 2015-12-03 17:33:16 +01:00
Matthias Beyer 02da675b3f Impl Into<String> for FileIDType 2015-12-03 17:33:03 +01:00
Matthias Beyer dbf9ada732 Implement: FileID::from(&String), FileID::from(String) 2015-12-02 22:36:27 +01:00
Matthias Beyer 2c3dd521b8 Add test: file_id_from_string() 2015-12-02 22:35:41 +01:00
Matthias Beyer bcc9771f28 module/bm/commands: Use FileID::into() 2015-12-02 13:43:09 +01:00
Matthias Beyer 557187fbd7 storage/file: Call FileID::new() to build FileID object 2015-12-02 13:43:09 +01:00
Matthias Beyer 8ddfb090b4 ui/file: use FileID::into() 2015-12-02 13:43:09 +01:00
Matthias Beyer 292e29a5f1 Backend: Use FileID::from() 2015-12-02 13:43:09 +01:00
Matthias Beyer d3bdb39468 Reimplement FileID as abstract type, use Into, From traits for conversion 2015-12-02 13:43:09 +01:00
Matthias Beyer e93aa4ceae Refactor uses of file-id-parsing functions to ensure we honnor the Result type 2015-12-02 13:06:08 +01:00
Matthias Beyer 3e94e1612f Add FileIDResult<FileID, FileIDError> 2015-12-02 13:05:48 +01:00
Matthias Beyer 05a9803c05 Fixup: Member name 2015-12-02 12:29:04 +01:00
Matthias Beyer 9231049e30 Remove StorageBackend::build() 2015-12-02 12:28:41 +01:00
Matthias Beyer 731d13e0ba Create store path on storage backend creation 2015-12-02 12:24:05 +01:00
Matthias Beyer abee4d4904 Implement StorageBackend::remove_file() 2015-12-02 12:24:05 +01:00
Matthias Beyer 4675f79aae remove_command(): Be able to run in "checked" mode 2015-12-02 12:24:05 +01:00
Matthias Beyer c81d0bf0a8 Implement remove_command() 2015-12-02 12:24:05 +01:00
Matthias Beyer 484b1fb865 Outsource file retrieving from list_command() into helper function 2015-12-02 12:24:05 +01:00
Matthias Beyer 6fcccc8297 Implement list_command 2015-12-02 12:24:05 +01:00
Matthias Beyer 42181afde5 Add tags_of_file() to extract tags from a File 2015-12-02 12:24:05 +01:00
Matthias Beyer a6ed8e1080 Pass id as &FileID in StorageBackend::get_file_by_id() 2015-12-02 12:24:05 +01:00
Matthias Beyer 103cba0c27 Add File::matches_with(&Regex) 2015-12-02 12:24:05 +01:00
Matthias Beyer e598a475e5 Use prettytable to implement TablePrinter 2015-12-02 12:24:05 +01:00
Matthias Beyer 965779fcaf Impl Debug for BMModule 2015-12-02 12:24:05 +01:00
Matthias Beyer e515a70ec2 Rewrite Debug for Module 2015-12-02 12:24:05 +01:00
Matthias Beyer 043e607765 Implement StorageBackendError::cause() 2015-12-02 12:24:05 +01:00
Matthias Beyer f060c89751 Add helper for building file prefix
This helper builds the file prefix for the files of a module.
2015-12-02 12:24:05 +01:00
Matthias Beyer 144398a2ad Remove explanation member of StorageBackendError to reduce complexibility 2015-12-02 12:24:05 +01:00
Matthias Beyer 83aa5afcbe Build ModuleError out of StorageBackendError if any 2015-12-02 12:24:05 +01:00
Matthias Beyer c3019528cf ModuleError needs a cause as well 2015-12-02 12:24:05 +01:00
Matthias Beyer 4a6d1a74c0 Retry fixing the StorageBackend::cause() 2015-12-02 12:24:05 +01:00
Matthias Beyer 366121b6ed Reimplement StorageBackend::update_file() 2015-12-02 12:24:05 +01:00
Matthias Beyer eabf726846 Outsource file to string parsing 2015-12-02 12:24:05 +01:00
Matthias Beyer e0fefc3da4 Reimplement StorageBackend::put_file() 2015-12-02 12:24:05 +01:00
Matthias Beyer 21d889e1e2 Add caused_by field in StorageBackend 2015-12-02 12:24:05 +01:00
Matthias Beyer 455d6e88ed Use real array instead of text array to save tags 2015-12-02 12:24:05 +01:00
Matthias Beyer cf1687e8ba Convention: module names are lowercase 2015-12-02 12:24:05 +01:00
Matthias Beyer 1038880de9 Save storepath in extra variable 2015-12-02 12:24:05 +01:00
Matthias Beyer 8a2c41ea22 Fix: Build StorageBackend with runtime 2015-12-02 12:24:05 +01:00
Matthias Beyer e78bde72c1 Implement add_command() with backend 2015-12-02 12:24:05 +01:00
Matthias Beyer c9ebe3b7a1 Pass owner to file path builder helper function 2015-12-02 12:24:05 +01:00
Matthias Beyer 98ec735ea3 Add File::owner() - a getter for the owner of a file 2015-12-02 12:24:05 +01:00
Matthias Beyer 593e98ac5d A File is bound to a Module
A File object must be bound to a Module, as one Module owns the File.

This way we can use the Module internally to build the file path later.
2015-12-02 12:24:05 +01:00
Matthias Beyer 0d751f9ffd Add some debug output in StorageBackend::build_filepath_with_id() 2015-12-02 12:24:05 +01:00
Matthias Beyer 7531b5a6d7 Pass module to subcommand.
We need the module in the subcommand for building file paths and so on.

To be able to pass it, we must remove the ::new() function from the
trait, so we can make the parameter a trait object.

This is no object, as the module gets build non-generically from the
main(), so everything is fine with this.
2015-12-02 12:24:05 +01:00
Matthias Beyer ff873c8fe3 Transfer old code to new structure 2015-12-02 12:24:05 +01:00
Matthias Beyer 08d6e8da13 We need to unwrap here (and it is save) 2015-12-02 12:24:05 +01:00
Matthias Beyer fda2c4feea Add CommandEnv building in command calling code in main() 2015-12-02 12:24:05 +01:00
Matthias Beyer 0a026002b0 Pass CommandEnv struct to command exec function
So we can add parameters rather easily.
Also define CommandResult as result type.
2015-12-02 12:24:05 +01:00
Matthias Beyer 9bf9f96ab1 Fix: ModuleError::mk() -> pub ModuleError::new() 2015-12-02 12:24:05 +01:00
Matthias Beyer 18ea01b854 Pass StorageBackend to subcommand function 2015-12-02 12:24:05 +01:00
Matthias Beyer 3f19aba7b2 Add subcommand calling code in main() 2015-12-02 12:24:05 +01:00
Matthias Beyer 4a73a317d4 Move submodule commands/mod.rs to commands.rs 2015-12-02 12:24:05 +01:00
Matthias Beyer e10d1bcb65 Reimplement commands for bm 2015-12-02 12:24:05 +01:00
Matthias Beyer 24a6e961af Change get_commands() for latest trait change 2015-12-02 12:24:05 +01:00
Matthias Beyer 8af9ba48c0 We dont need the command traits anymore 2015-12-02 12:24:05 +01:00
Matthias Beyer 84571bef0a get_commands() can return a HashMap<str, fn()>, which is command name -> command function 2015-12-02 12:24:05 +01:00
Matthias Beyer a24d3175dd We do not have Module::execute() anymore 2015-12-02 12:24:05 +01:00
Matthias Beyer 8404303dbd Remove BMModule::execute() which is not required by the trait anymore 2015-12-02 12:24:05 +01:00
Matthias Beyer 168852714a Add modules for commands of BM module 2015-12-02 12:24:05 +01:00
Matthias Beyer 55361f71fe Add struct for passing environment of command to command execute function 2015-12-02 12:24:05 +01:00
Matthias Beyer a9a33321f7 Make command submodule public 2015-12-02 12:24:05 +01:00
Matthias Beyer f94f8870e9 The exec() function of an ExecutableCommand should get the CLI matches as well 2015-12-02 12:24:05 +01:00
Matthias Beyer 4af971a5d0 Make these types public 2015-12-02 12:24:05 +01:00
Matthias Beyer cbd85b3d8e Module should only provide functionality to get a list of commands it can execute
These commands can then be executed.
2015-12-02 12:24:05 +01:00
Matthias Beyer 86286cce1b Remove livetimes 2015-12-02 12:24:05 +01:00
Matthias Beyer bfccbc32c5 Add BMModule::add() implementation 2015-12-02 12:24:05 +01:00
Matthias Beyer 0896f2093b Fixed inverted logic in get_tags() 2015-12-02 12:24:05 +01:00
Matthias Beyer 006724a184 Refactor get_tags to return no Option 2015-12-02 12:24:05 +01:00
Matthias Beyer 51f6af6346 We should really use String here 2015-12-02 12:24:05 +01:00
Matthias Beyer cd72295c1a Add function to build header content 2015-12-02 12:24:05 +01:00
Matthias Beyer 9f29f0e1b7 Reject tasks if they contain spaces 2015-12-02 12:24:05 +01:00
Matthias Beyer 8cffdddab2 Split header spec into smaller functions 2015-12-02 12:24:05 +01:00
Matthias Beyer b76d38f4c6 Rewrite Bookmark FileHeaderSpec
One file is one bookmark, so we should have the appropriate header spec
for this.
2015-12-02 12:24:05 +01:00
Matthias Beyer 07f223bb8a Add header module with spec 2015-12-02 12:24:05 +01:00
Matthias Beyer de843541f1 Add some debugging output in bm module 2015-12-02 12:24:05 +01:00
Matthias Beyer 15a2480604 Add information on what gets done 2015-12-02 12:24:05 +01:00
Matthias Beyer 750f4cd31c Start adding the BM submodule 2015-12-02 12:24:05 +01:00