455d6e88ed
Use real array instead of text array to save tags
2015-12-02 12:24:05 +01:00
cf1687e8ba
Convention: module names are lowercase
2015-12-02 12:24:05 +01:00
1038880de9
Save storepath in extra variable
2015-12-02 12:24:05 +01:00
8a2c41ea22
Fix: Build StorageBackend with runtime
2015-12-02 12:24:05 +01:00
e78bde72c1
Implement add_command() with backend
2015-12-02 12:24:05 +01:00
c9ebe3b7a1
Pass owner to file path builder helper function
2015-12-02 12:24:05 +01:00
98ec735ea3
Add File::owner() - a getter for the owner of a file
2015-12-02 12:24:05 +01:00
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
0d751f9ffd
Add some debug output in StorageBackend::build_filepath_with_id()
2015-12-02 12:24:05 +01:00
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
ff873c8fe3
Transfer old code to new structure
2015-12-02 12:24:05 +01:00
08d6e8da13
We need to unwrap here (and it is save)
2015-12-02 12:24:05 +01:00
fda2c4feea
Add CommandEnv building in command calling code in main()
2015-12-02 12:24:05 +01:00
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
9bf9f96ab1
Fix: ModuleError::mk() -> pub ModuleError::new()
2015-12-02 12:24:05 +01:00
18ea01b854
Pass StorageBackend to subcommand function
2015-12-02 12:24:05 +01:00
3f19aba7b2
Add subcommand calling code in main()
2015-12-02 12:24:05 +01:00
4a73a317d4
Move submodule commands/mod.rs to commands.rs
2015-12-02 12:24:05 +01:00
e10d1bcb65
Reimplement commands for bm
2015-12-02 12:24:05 +01:00
24a6e961af
Change get_commands() for latest trait change
2015-12-02 12:24:05 +01:00
8af9ba48c0
We dont need the command traits anymore
2015-12-02 12:24:05 +01:00
84571bef0a
get_commands() can return a HashMap<str, fn()>, which is command name -> command function
2015-12-02 12:24:05 +01:00
a24d3175dd
We do not have Module::execute() anymore
2015-12-02 12:24:05 +01:00
8404303dbd
Remove BMModule::execute() which is not required by the trait anymore
2015-12-02 12:24:05 +01:00
168852714a
Add modules for commands of BM module
2015-12-02 12:24:05 +01:00
55361f71fe
Add struct for passing environment of command to command execute function
2015-12-02 12:24:05 +01:00
a9a33321f7
Make command submodule public
2015-12-02 12:24:05 +01:00
f94f8870e9
The exec() function of an ExecutableCommand should get the CLI matches as well
2015-12-02 12:24:05 +01:00
4af971a5d0
Make these types public
2015-12-02 12:24:05 +01:00
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
86286cce1b
Remove livetimes
2015-12-02 12:24:05 +01:00
bfccbc32c5
Add BMModule::add() implementation
2015-12-02 12:24:05 +01:00
0896f2093b
Fixed inverted logic in get_tags()
2015-12-02 12:24:05 +01:00
006724a184
Refactor get_tags to return no Option
2015-12-02 12:24:05 +01:00
51f6af6346
We should really use String here
2015-12-02 12:24:05 +01:00
cd72295c1a
Add function to build header content
2015-12-02 12:24:05 +01:00
9f29f0e1b7
Reject tasks if they contain spaces
2015-12-02 12:24:05 +01:00
8cffdddab2
Split header spec into smaller functions
2015-12-02 12:24:05 +01:00
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
07f223bb8a
Add header module with spec
2015-12-02 12:24:05 +01:00
de843541f1
Add some debugging output in bm module
2015-12-02 12:24:05 +01:00
15a2480604
Add information on what gets done
2015-12-02 12:24:05 +01:00
750f4cd31c
Start adding the BM submodule
2015-12-02 12:24:05 +01:00
efe1577f02
TablePrinter should be pub
2015-12-02 12:20:54 +01:00
c3397d5238
Use prettytable to implement TablePrinter
2015-12-02 12:20:52 +01:00
918016368e
Add file printer helpers
2015-12-02 12:20:23 +01:00
2bab3d48e6
Fix JsonHeaderParser::serialize()
2015-12-02 12:00:20 +01:00
7549db4ffc
Fix JsonHeaderParser::visit_json()
2015-12-02 12:00:20 +01:00
500fb281a0
JsonHeaderParser: Make spec optional
2015-12-02 12:00:20 +01:00
34cf5076f9
Reimplement JsonHeaderParser::write()
2015-12-02 12:00:19 +01:00
df18071d9a
Move JsonHeaderParser::new() out of trait implementation
2015-12-02 12:00:19 +01:00
cf196b2492
Fixup: get_file_ids() - use prefix_of_files_for_module()
2015-12-02 12:00:19 +01:00
0e4a56fe68
Reimplement StorageBackend::new(), create directory if not existing, store storepath in extra variable
2015-12-02 12:00:19 +01:00
1e5c50bc0b
Fixup: Import remove_file()
2015-12-02 12:00:19 +01:00
0796d0ab36
Fixup: File::from_parser_result() gets module now as well
2015-12-02 12:00:19 +01:00
9a0cc75c6f
BackendOperationResult: Add optional type parameter
2015-12-02 12:00:19 +01:00
d35e89f27c
Fixup: get_file_by_id() gets &Module as well, so it can use build_filepath_with_id()
2015-12-02 12:00:19 +01:00
c81800d985
Implement helpers: build_filepath_with_id(), prefix_of_files_for_module()
2015-12-02 12:00:19 +01:00
0363075f9c
Implement StorageBackend::remove_file()
2015-12-02 12:00:19 +01:00
c23a1e22ab
Implement helper write_with_parser()
2015-12-02 12:00:19 +01:00
25b26b03a6
Reimplement StorageBackend::update_file()
2015-12-02 12:00:19 +01:00
8bd782c1a7
Reimplement StorageBackend::put_file()
2015-12-02 12:00:19 +01:00
d141a3670f
Add StorageBackend::iter_files()
2015-12-02 12:00:19 +01:00
1b6711fe10
Add StorageBackend::iter_ids()
2015-12-02 12:00:19 +01:00
d22b991da0
Implement StorageBackendError::build() helper
2015-12-02 12:00:19 +01:00
8ff5dcc9e8
Add StorageBackendError::caused_by member
2015-12-02 12:00:19 +01:00
c73cb88df4
Remove StorageBackendError::explanation member
2015-12-02 12:00:19 +01:00
9493c79104
Reimplement Debug for File
2015-12-02 12:00:12 +01:00
535952c2a5
Implement Display for File
2015-12-02 11:58:07 +01:00
6eb7bee355
Reimplement File::contents() with File::{header(),data()}
2015-12-02 11:58:07 +01:00
09940f3228
Each file must have an owning module
2015-12-02 11:58:07 +01:00
90f08cc1f2
Implement File::{header(),data()} as header/data getters
2015-12-02 11:32:59 +01:00
d89977a09e
Implement File::matches_with(&Regex)
2015-12-02 11:32:14 +01:00
58bd36599f
Implement FileHeaderData::matches_with(&Regex)
2015-12-02 11:30:50 +01:00
8f8badebb3
Fix: FileHeaderData::Key::name must be a &'static str
2015-12-02 11:30:14 +01:00
2a468059aa
parser: Remove livetimes
2015-12-02 11:28:21 +01:00
a5dabe55a9
Provide getter for store path in Runtime object
2015-12-01 18:37:44 +01:00
5942877c43
Add possibility to override store name in CLI
2015-12-01 18:37:29 +01:00
da85c3ffe7
Rename function: store_path_str() -> store_path()
2015-12-01 18:36:04 +01:00
5f4718a2e5
Add debug output for Configuration::new()
2015-12-01 18:32:00 +01:00
56cd6dc4ae
Configuration::new() should use default values
...
if the configuration can not be loaded.
2015-12-01 18:25:29 +01:00
9edad2800f
Add debugging output in storage parser code
2015-11-27 22:18:26 +01:00
53a14ea1dc
Add debug output in storage backend code
2015-11-27 22:14:02 +01:00
20dc562dee
Do debug output when creating a file object
2015-11-27 19:37:20 +01:00
c82f9ea6ae
Implement Debug for File
2015-11-27 19:37:08 +01:00
55d6de627a
Add debug output in match_header_spec()
2015-11-27 19:31:46 +01:00
beee7b20b4
Add debug output in main
2015-11-27 19:24:58 +01:00
beccb7ab3d
Implement Debug for Configuration
2015-11-27 19:22:21 +01:00
a487fbcaf4
Implement Debug for CliConfig
2015-11-27 19:22:09 +01:00
990252e4e4
Implement Debug for Runtime
2015-11-27 19:22:09 +01:00
469ff607eb
Fix: unused import
2015-11-27 17:00:45 +01:00
06ea949e65
Fix: unused import
2015-11-27 17:00:34 +01:00
869cc5e5ab
Fix: unused import
2015-11-27 16:59:51 +01:00
56612cf1a0
Fix: unused import
2015-11-27 16:59:44 +01:00
7786eed7f0
Fix: unused import
2015-11-27 16:59:05 +01:00
82e346e89b
Fix: unused import
2015-11-27 16:58:38 +01:00
5bd40d208a
Fix: unused import
2015-11-27 16:58:19 +01:00
e8af265c0c
Fix: unused import
2015-11-27 16:57:52 +01:00
6926363f70
Fix: use unimplemented instead of false implementation
2015-11-27 16:55:18 +01:00
8a546dfb26
Fix Bug: Pass iterator value, not currently parsed value
2015-11-27 16:52:09 +01:00
3ed431ad5f
Fix: unnecessary parentheses around if condition
2015-11-27 16:50:54 +01:00
930a7ecc3f
Fix: structure field dataDump should have a snake case name such as data_dump
2015-11-27 16:50:12 +01:00
c8231e5c31
Fix: variable does not need to be mutable
2015-11-27 16:49:25 +01:00
c597f6d1f0
Fix compiletime errors
2015-11-24 19:37:22 +01:00
a6054d2223
StorageBackendError: Use String instead of str in params
2015-11-24 19:31:22 +01:00
f694feacf9
Clone these values when returning them
2015-11-24 19:28:26 +01:00
a8bc7ecc47
Make FileHeaderData cloneable
2015-11-24 19:27:57 +01:00
2ed2b17b85
Refactor get_file_by_id() into smaller functions
2015-11-24 16:47:01 +01:00
1b1f0678cb
Refactor: File::from_parser_result() shouldnt do error handling, do this in calling code
2015-11-24 16:34:03 +01:00
b6af948c0e
Implement Storage::get_file_by_id()
2015-11-24 10:59:30 +01:00
176183e718
Refactor helpers for more fine-grained possibilities
2015-11-24 10:59:16 +01:00
4464c32b98
Add helper to build file from Parser return value
2015-11-24 10:58:54 +01:00
8808e911c8
Implement Storage::update_file()
2015-11-24 10:48:30 +01:00
14ae6d623b
Refactor: Outsource filepath building
2015-11-24 10:30:52 +01:00
f498ffa54c
Implement Storage::put_file()
2015-11-24 10:27:42 +01:00
616e0b789b
Make Parser::write() public
2015-11-24 10:27:34 +01:00
c2135b5c6c
Add getter methods for File object contents
2015-11-24 10:27:20 +01:00
da792694c5
Add StorageBackend builder
2015-11-23 19:54:08 +01:00
e1faad7a28
Add runtime rtp getter (and in cli and configuration types)
2015-11-23 19:48:37 +01:00
14d92d8b2f
Add some functions to File, so we can generate file instances with content
2015-11-23 19:27:54 +01:00
91de245836
Rename function to match naming scheme
2015-11-23 19:26:02 +01:00
b8fa7c5696
Reset and restart implementation
2015-11-23 19:25:27 +01:00
e623b74139
Implement: Storage::createFile()
2015-11-23 19:17:46 +01:00
263a3b7780
Store the file handle in our internal File type
2015-11-23 19:17:46 +01:00
7faa693d5c
Move implementation to get a new file on the FS
...
Now we have a function which creates a new file on the FS and returns
the handle and the FileID object.
2015-11-23 19:17:46 +01:00
48fd3e66f5
Add implementation for Storage::createEmpty()
2015-11-23 19:17:46 +01:00
25de1c6c2a
We should use the FileID type in the File
2015-11-23 18:46:09 +01:00
bff2bf68c6
We dont need to pass the module here
2015-11-23 18:45:31 +01:00
9aced858ac
Outsource file id parsing
2015-11-23 18:42:55 +01:00
b0e5f28528
Implement getFileList()
2015-11-23 18:28:24 +01:00
68c6c35f54
Add getFileList(self) to list files from basepath
2015-11-20 15:34:40 +01:00
2af5f404f4
Fix typo in StorageBackend::new()
2015-11-20 15:34:06 +01:00
7e86394b3c
add dep: glob
2015-11-20 15:33:40 +01:00
e59fbd52c3
Add fn to extract id from path string
2015-11-20 15:33:24 +01:00
42ac04c1a8
Implement StorageBackend::new()
2015-11-10 20:53:35 +01:00
9cff6772c8
Implement StorageBackendError
2015-11-10 20:43:55 +01:00
99a2670803
Add module/command trait
2015-11-10 20:43:53 +01:00
ba91e7ee26
The module itself has to be populate the Command instance
...
This will be done by the module returning a lambda to build the
command instance.
2015-11-10 20:43:35 +01:00
f4dbec72ee
Add storage/backend setup
2015-11-10 20:43:30 +01:00
e73701ace4
Remove old todo module code
2015-11-10 20:33:47 +01:00
159b363d58
Remove the concept of DataParser and Abstract Data types
...
We use String as type for Data, so we don't have problems with parsing
things and the whole templating foo in the parser gets a lot simpler.
2015-11-10 20:31:05 +01:00
e3afb3c0f3
Implement Serialization for FileHeaderData
2015-11-09 18:35:07 +01:00
9167fde4fb
Add dependency: serde
2015-11-09 18:35:07 +01:00
e8e82f6844
Make functions public
2015-11-09 18:35:07 +01:00
fd35a00381
Implement JSON to FileHeaderData parser
2015-11-09 18:35:07 +01:00
b211862602
Add json deserializer
2015-11-09 18:35:02 +01:00
aa94852e84
Add unimplemented macro in match_header_spec()
2015-11-07 23:40:03 +01:00
d260ef20e3
Minify Parser.write()
2015-11-07 23:39:53 +01:00
44994487c6
Minify Parser.read()
2015-11-07 23:39:47 +01:00
2c940d0ca8
Add missing "pub"
2015-11-07 23:39:39 +01:00
850b4579a8
Add type "File" to load a file from disk
2015-11-07 23:39:30 +01:00
111a990b99
Add debugging output in main.rs
2015-11-07 23:38:49 +01:00
1ecb13a8fe
Remove early logging, doesnt work
2015-11-07 23:38:40 +01:00
b123144202
Fix types
...
* We can use a str for the key name
* We don't need a box if we have a vec
2015-10-30 18:26:42 +01:00
d0af1a493b
Make storage modules public
2015-10-30 18:26:42 +01:00
1c2c52fa37
Add "Map" type to FileHeaderSpec and FileHeaderData
2015-10-30 18:09:01 +01:00
9dde3e4f72
Remove path member from MatchError
...
At this point, this is too complicated to implement for me.
2015-10-30 17:46:25 +01:00
10697feb8a
Add error generating
...
Which required adding of lifetimes
2015-10-30 17:35:21 +01:00
caee02c333
Add algorithm to match spec on data
2015-10-30 16:52:02 +01:00
f9cc0e41ce
Implement Display for FileHeaderSpec
2015-10-30 16:50:02 +01:00
96ca9637d1
Add type MatchError
2015-10-30 16:48:48 +01:00
e6fb2f232d
FileHeaderSpec, FileHeaderData can derive Debug
2015-10-30 16:47:04 +01:00
d54825de6b
Move divide_text() into scope of impl Parser
2015-10-30 15:23:29 +01:00
b6d52b2616
Implement: Error, Debug, Display for ParserError
2015-10-30 15:22:11 +01:00
e426f384f4
Remove old code
2015-10-30 14:48:45 +01:00
589844102d
Move parser code out of file.rs
2015-10-30 14:48:45 +01:00
4b8d7b0c4f
Add module file
2015-10-30 14:32:22 +01:00
2989cb803d
Move module/file to storage/file
2015-10-30 14:31:45 +01:00
52579a3e7c
Move: src/storage.rs -> src/storage/mod.rs
2015-10-30 14:31:26 +01:00
50f140edef
Implement Parser.write()
2015-10-30 01:05:44 +01:00
11c2fe1260
Implement Abstract Parser which uses Header- and Data-Parser internally
2015-10-30 00:50:35 +01:00
1a4b3f9747
FileDataParser::read() should return Result<>
2015-10-28 21:28:43 +01:00
bbefacd0a2
FileHeaderParser::read() should get the string, not a ref to it
2015-10-28 21:28:43 +01:00
380d58a3c0
Move header types/traits outside own module
2015-10-28 21:28:43 +01:00
647d5611c7
Out Traits here must implement the Sized trait
2015-10-28 21:28:43 +01:00
6fa42204cb
FileParser -> FileDataParser
...
Let the FileParser be a FileDataParser, so we have uncoupled the header
parsers from the data parsers.
This way we can make the parsing process multithreaded.
2015-10-28 21:28:43 +01:00
1166f313a3
Add divide_text() function
2015-10-28 17:43:19 +01:00
bdb0792040
Add extern crate regex
2015-10-28 17:39:53 +01:00
6ec4a701d3
Implement ParserError
2015-10-28 17:39:51 +01:00
ec1df06b24
Add file header types
...
for specifying header structure and parsing it from "raw" text.
2015-10-28 17:03:52 +01:00
b98dea3946
Rename "Config" to "CliConfig"
2015-10-27 00:02:42 +01:00
904d3fa8c0
Pass configuration from cfg file to Runtime as well
2015-10-27 00:01:11 +01:00
497cdde581
Logger should respect configuration
2015-10-26 23:59:24 +01:00
754ad0c6cb
Add store path configuration
2015-10-26 23:56:54 +01:00
099d63f13a
Implement simple configuration module
2015-10-26 23:52:01 +01:00
32e585e7eb
Add configuration module
2015-10-26 22:30:15 +01:00
04567f594d
Fix: Runtime.is_{verbose,debugging}
2015-10-26 21:27:04 +01:00
7f224e8f58
Replace all output with macros from logging library
2015-10-26 20:58:52 +01:00
127c99f16f
Remove old logging functions
2015-10-26 20:53:49 +01:00
c41ec1d85c
Add logger with logging library
2015-10-26 20:53:12 +01:00
f7421cf252
Runtime print helpers should get a &'static str
2015-10-25 20:10:49 +01:00
c39d43fbd3
Runtime publishes config
2015-10-25 20:10:49 +01:00
9fb50dac68
Fix type for ModuleError::mk()
2015-10-25 19:54:54 +01:00
3556e5adc6
Refactor complete CLI code
2015-10-25 19:52:31 +01:00
e19f7117e6
Add ApplicationError type
2015-10-25 18:43:47 +01:00
4d83b7c63f
Implement Module for TodoModule
2015-10-25 18:43:47 +01:00
911384331b
Add ModuleError
2015-10-25 18:43:47 +01:00
7036f93936
Fixup TodoModule::new()
2015-10-25 18:43:47 +01:00
c50d097831
Cleanup module confusion
2015-10-25 18:43:47 +01:00
63daf452dc
Add todo module
2015-10-25 18:43:47 +01:00
02029b9b26
Export cli::Config here
2015-10-25 18:43:47 +01:00
034d71b21d
Rewrite
2015-10-25 18:43:46 +01:00
1cea0e48e0
cleanup
2015-10-25 18:43:46 +01:00
bff720018c
Module trait cleanups
2015-10-25 18:43:46 +01:00
1d98cf7634
Fix: Module functions should get &self, not self
2015-10-19 17:38:39 +02:00
170d57cbdf
Add Module::shutdown() in trait
2015-10-19 17:36:24 +02:00
19ab3d425f
Remove error foo from module
2015-10-19 17:36:24 +02:00
18ebf8ad83
Remove error foo from storage
2015-10-19 17:36:24 +02:00
3df9343412
Revert "Add error module for error handling"
...
This reverts commit e9b122f612
2015-10-19 17:31:13 +02:00
f1a67dba10
Revert "Add: impl ImagError for ModuleError"
...
This reverts commit 7b1f9cfbac
2015-10-19 17:31:07 +02:00
b3508f5dc3
Add trait Storage
2015-10-18 21:59:23 +02:00
7b1f9cfbac
Add: impl ImagError for ModuleError
2015-10-18 21:49:31 +02:00
e9b122f612
Add error module for error handling
2015-10-18 21:42:44 +02:00
e3ca30d4b1
Add module trait
2015-10-18 21:15:17 +02:00
98c782212c
We should use references here
2015-10-18 21:15:05 +02:00
bd6df27aec
Add runtime module
2015-10-18 20:52:52 +02:00
8d4a1fa45e
cli: export data and add helper functions for accessing data
2015-10-18 20:52:35 +02:00
8fc4a4653b
Minify function
2015-10-18 20:36:58 +02:00
186a4e8b73
Initial import
2015-10-18 20:22:23 +02:00
