Commit graph

552 commits

Author SHA1 Message Date
a49113cb5f Refactor filter building into types which can be chained up
State before was to generate functions which can be used as filter()
arguments.

State now is that there are types which can be lined up and be executed
as filters. And/Or/Not-Filters are provided and so are helper functions
to initialize objects of these filter types.

The BM module is adapted for this.
2016-01-02 18:37:17 +01:00
Homu
a2037f3909 Auto merge of #45 - matthiasbeyer:bm-command-output, r=matthiasbeyer
Bm command output

Add info-output to some BM commands.
2016-01-03 00:30:10 +09:00
Homu
9a82ccd2d1 Auto merge of #44 - matthiasbeyer:bm-open-xdg, r=matthiasbeyer
Bm open xdg

Add subcommand to `BM` to open links via xdg.

Closes #28
2016-01-03 00:25:31 +09:00
bdfaac0c76 Add info output to BM-add command 2016-01-02 16:15:30 +01:00
4c95e403e9 Add information output to BM-remove 2016-01-02 16:09:44 +01:00
89101719ad Add bm-open command 2016-01-02 16:03:01 +01:00
77d2b189fb Configuration does not store verbose/debugging flag information 2016-01-02 15:39:57 +01:00
6272bfd3a9 Refactor configuration: Simplify codebase
- fetch_config() exits if the config parsing fails
- Simplified the build process of the Configuration object
2016-01-02 15:37:06 +01:00
745f57e480 ImagLogger can be configured through the CLI only now 2016-01-02 15:29:11 +01:00
Homu
bbcf0e2dba Auto merge of #40 - matthiasbeyer:cleanup, r=matthiasbeyer
Cleanup

Codebase cleanup
2016-01-02 07:51:58 +09:00
911c248c39 Store::remove(): Move function so we have a better order 2016-01-01 23:45:14 +01:00
c681b24ef4 Store::load() should load, not Store::put_in_cache()
Store::put_in_cache (not put_into_cache) is now called inside ::load()
if the key is not yet in the cache.

The Store::load() function cached its interface for this. It can also be
used by the other functions in the Store object to load content.
2016-01-01 23:45:14 +01:00
f802b00974 Rewrite Store::load_in_cache() to check cache before loading 2016-01-01 23:26:04 +01:00
d6bd011d95 Add try!() around write!() 2015-12-30 23:02:05 +01:00
37f3c90914 Remove dead code 2015-12-30 23:02:05 +01:00
a2856d8671 Remove unused imports 2015-12-30 23:02:05 +01:00
708f2bcff1 Added indent for readability 2015-12-30 18:50:09 +01:00
37588a9f3d Remove hello-world output 2015-12-30 18:48:28 +01:00
8f46056a08 BM::command_list() add filter functionality 2015-12-30 15:14:26 +01:00
7bbe1bb6d0 Refactor: Provide generic cli-to-filter-function generator
The refactors functions from the BM module into more generic functions
for all modules.

The previous state was, that there were functions in the BM module which
were used to load from the store and applying some filters.

The new state is that there are functions to generate the filter
functions which are then used to filter the loaded files from the store,
so we can apply some more functionality on the filtered list.
2015-12-30 15:06:22 +01:00
09aa7d9ec3 Add debug output to text-from-header fetcher function 2015-12-30 15:06:02 +01:00
d15d50d8a2 Refactor: Header helper code can use generic function 2015-12-30 15:05:52 +01:00
eed57af0bb module header helpers: Add function to get NAME from header 2015-12-30 15:05:47 +01:00
Homu
25045b7345 Auto merge of #34 - matthiasbeyer:doc, r=matthiasbeyer
Add some documentation

Still does not produce the documentation I want, though it basically works now.
2015-12-30 17:54:41 +09:00
c106af5618 Remove all the crap and implement temp-file editor calling 2015-12-30 09:49:15 +01:00
7248eef3be configuration fixup editor 2015-12-30 03:02:19 +01:00
bab5614247 runtime.rs: Add options to editor string 2015-12-30 02:53:41 +01:00
70fbd3914e configuration.rs: Add function to fetch editor options 2015-12-30 02:53:41 +01:00
6ff2ac3567 cli.rs: Add function to fetch editor options 2015-12-30 02:53:41 +01:00
6179c9e73f runtime.rs: Add possibility to fetch editor 2015-12-30 02:53:41 +01:00
4f8a545aac cli.rs: Add possibility to fetch editor 2015-12-30 02:53:41 +01:00
89878f7024 configuration.rs: Add possibility to fetch editor 2015-12-30 02:53:41 +01:00
1647352a13 Use modules publicly, so "cargo doc" generates documentation 2015-12-30 02:10:50 +01:00
c4a388925e Add doc to util::is_url() 2015-12-29 18:20:56 +01:00
43bf526740 Add docs to ui/file.rs 2015-12-29 18:20:56 +01:00
2334b0bc8a Add docs to FileHash 2015-12-29 18:20:56 +01:00
d25a0dd1c0 Add docs to FileIDType 2015-12-29 18:20:56 +01:00
d34143e516 Add docs to FileID 2015-12-29 18:20:56 +01:00
6bcfc0a4b2 Add docs to File 2015-12-29 18:20:56 +01:00
3a7bf9f4de Add doc to parser code 2015-12-29 18:20:56 +01:00
5791ba7b8d Add doc to Store object implementation 2015-12-29 18:20:56 +01:00
be233b8aba Add docs to BM module 2015-12-29 18:20:56 +01:00
ffcb951468 Add doc to module header helpers 2015-12-29 18:20:56 +01:00
e9cee25ac8 Add doc to module helpers 2015-12-29 18:20:56 +01:00
271c91e903 Add documentation on module helper utils 2015-12-29 18:20:56 +01:00
dc181ba8eb Add doc to Module trait 2015-12-29 18:20:56 +01:00
89cc625133 runtime.rs: Add docs to functions 2015-12-29 18:20:56 +01:00
bbc6218391 configuration.rs: Add documentation 2015-12-29 18:20:56 +01:00
0d6f2b9500 cli.rs: Add documentation to functions 2015-12-29 18:20:56 +01:00
808e44339a Implement TempFileError and traits for it 2015-12-29 16:00:08 +01:00
900ffcb7d1 Add ui submodules to talk to external programs, editor in this case 2015-12-29 16:00:08 +01:00
e3b22d488d Remove box-syntax in test 2015-12-29 15:10:09 +01:00
e21da820c4 Fix test for to use FileID::parse() 2015-12-29 15:10:09 +01:00
b5da0cb613 Fix use... in test modules 2015-12-29 15:01:35 +01:00
248b5c7574 Merge branch 'debug' 2015-12-28 21:55:08 +01:00
6ca4818302 Add File::set_header() 2015-12-28 21:51:08 +01:00
68f66ca27d Add BM::command_set_tags() 2015-12-28 21:51:08 +01:00
bcbd568311 Add BM::command_rm_tags() 2015-12-28 21:51:08 +01:00
7e401b5881 Add generic alter_tags_in_files() function 2015-12-28 21:51:08 +01:00
966e9902cb BM header helpers: Add set_tags_in_header() 2015-12-28 21:25:51 +01:00
46b7ae9384 Add BM::command_add_tags() 2015-12-28 20:53:13 +01:00
cbefa577e9 Use get_files() to filter files, remove afterwards
Change get_files() signature, so we know whether there was a filter
applied, so we can abort the action if there was no filter involved.
2015-12-28 19:46:59 +01:00
e84986680d Add functions to get files from Store by certain predicated (id, match, tags) 2015-12-28 19:42:35 +01:00
db204f3cba BM::command_add(): Add URL verification 2015-12-28 18:47:17 +01:00
16d40e9bfe Add util: is_url(String) -> bool 2015-12-28 18:47:17 +01:00
9db5ffa842 Implement BM::command_remove() 2015-12-28 18:02:32 +01:00
c2469b83ce Add debug output to Store::load_in_cache() 2015-12-28 17:39:00 +01:00
302549d194 Fixup Store::load_by_hash() 2015-12-28 17:39:00 +01:00
3a5bb3a5ce Add Store::load_by_hash() 2015-12-28 17:39:00 +01:00
5a55636c65 Implement: BM: command_list() 2015-12-28 17:38:59 +01:00
bd9abf3bc7 Add Store::load_in_cache(... FileID) 2015-12-28 17:38:59 +01:00
7170f95825 BM header helpers: Add get_url_from_header() 2015-12-28 17:38:59 +01:00
2e7621d2bd Add header helpers for BM 2015-12-28 17:38:59 +01:00
e346f56a8e Fix: BM module name 2015-12-28 17:38:59 +01:00
fda7fd56b9 Fix: Argument for BM::exec() 2015-12-28 17:38:59 +01:00
523e6f8f66 Implement: BM::command_add() 2015-12-28 17:38:59 +01:00
df27e5d2a3 BM subcommands: Pass ArgMatches 2015-12-28 17:38:59 +01:00
c432e8c2c4 Add subcommand calling code 2015-12-28 17:38:59 +01:00
81ead3c68c Add debug output to FileID::parse() 2015-12-28 17:35:55 +01:00
f24db1eb7d Add debug output to Store::remove() 2015-12-28 17:35:55 +01:00
e9ea485ed5 Add debug output to Store::load_in_cache() 2015-12-28 17:35:55 +01:00
4ea83d538f Add Store::load_by_hash() 2015-12-28 17:35:55 +01:00
62ee1d4e96 Add Store::load_for_module() 2015-12-28 17:35:20 +01:00
3a2c8b091e Add Store::load_in_cache(... FileID) 2015-12-28 17:35:13 +01:00
c6f31496ab Module helpers: header: Add get_url_from_header() 2015-12-28 17:35:07 +01:00
24e1ea2522 Fix: Debug for File implementation 2015-12-28 17:34:56 +01:00
d20ace3e80 Add Store::ensure_store_path_exists() 2015-12-28 17:34:47 +01:00
c97f4bab56 Add Store::remove(FileID) 2015-12-28 14:40:56 +01:00
bb97778fbb Rename table title 2015-12-28 14:30:45 +01:00
1fde80800b Allow the custom function to return an Vec<String> in the FilePrinter trait 2015-12-28 14:29:44 +01:00
51605e1314 Impl FilePrinter for TablePrinter ::print_files_custom() 2015-12-28 13:56:53 +01:00
6455c45630 Impl FilePrinter for SimplePrinter ::print_file_custom() 2015-12-28 13:56:38 +01:00
f0c186f33b Impl FilePrinter for DebugPrinter ::print_file_custom() 2015-12-28 13:56:20 +01:00
fc42d6b4bf FilePrinter: Add print_file_custom(), print_files_custom() 2015-12-28 13:56:01 +01:00
74aab89fbb ui: Change to take Rc<RefCell<File>> instead of File 2015-12-28 13:36:44 +01:00
c8a0c1168d Initialize store in Runtime object, pass store path directly into Store object 2015-12-28 00:39:55 +01:00
656aa69bfd Implement Store::persist() 2015-12-28 00:30:25 +01:00
8145b21404 Fix: Parser::write() can get reference tuple 2015-12-28 00:29:45 +01:00
0212fb1929 Fix: Add missing dash 2015-12-28 00:29:21 +01:00
23e4152aaa Implement Store::load() 2015-12-28 00:04:54 +01:00
f29bcc7430 Store: Put file into cache, return FileID 2015-12-27 23:51:44 +01:00
470f1b1378 Save only module name in File, not whole module 2015-12-27 23:46:08 +01:00
f774effabb File: Return inner contents as references, not cloned 2015-12-27 23:26:23 +01:00
030b5fc888 Fixup Store 2015-12-27 23:18:55 +01:00
c595f5a1e8 Move File-creation code to Store 2015-12-27 23:17:51 +01:00
cb2c512440 Add Store type 2015-12-27 23:17:51 +01:00
73c7281259 Make File members pub 2015-12-27 23:17:51 +01:00
736c3784a9 Derive: Eq, PartialEq for FileID 2015-12-27 23:17:51 +01:00
6676611f4b Derive Hash for FileIDType 2015-12-27 23:02:34 +01:00
f60c540ee5 Derive: Hash for FileID 2015-12-27 23:02:20 +01:00
4c252577f2 Derive: Hash for FileHash 2015-12-27 23:02:06 +01:00
Marcel Müller
22b57d5ad9 Implement FromStr for FileIDType 2015-12-27 18:55:27 +01:00
65aa98607e Add File::persist() 2015-12-27 18:52:25 +01:00
8029057b22 Add File::edit_contents() 2015-12-27 18:52:19 +01:00
961fb27f99 Add File::edit() 2015-12-27 18:52:02 +01:00
4cac382412 Fixup Into<str> for Path -> Impl as Into<String> for Path 2015-12-27 18:00:56 +01:00
3273e77d24 Fixup Into<str> for Path 2015-12-27 18:00:56 +01:00
312bcf9703 Fixup File::get_new_file_id() 2015-12-27 18:00:56 +01:00
003efb6296 Fixup Into<str> for Path 2015-12-27 18:00:56 +01:00
71bf650653 Fixup FileIDType::parse 2015-12-27 18:00:56 +01:00
2585472349 impl Into<String> for FileID 2015-12-27 18:00:56 +01:00
1fc1c73b4a impl Into<String> for FileIDType 2015-12-27 18:00:56 +01:00
fab2dece59 When generating a new FileID, use the FileHash type 2015-12-27 18:00:31 +01:00
62150c5a61 Add missing lifetimes 2015-12-27 18:00:31 +01:00
63bbede00f Add missing 'use ...' 2015-12-27 18:00:31 +01:00
8c2af3e931 Add Path type 2015-12-27 18:00:31 +01:00
85a199ffc8 Add module file for storage 2015-12-27 18:00:31 +01:00
00d0bbf4ae Add basic interface for BM module 2015-12-27 18:00:28 +01:00
7e77d786bb Remove old code, FileIDType::NONE does not exist, we use Option<> 2015-12-21 19:28:15 +01:00
dcec155505 Move FileIDType to new module, export publicly 2015-12-21 19:20:09 +01:00
8a7d4b8aaf Add FileHash type, custom type for an ID 2015-12-21 19:20:09 +01:00
dd7b412976 Remove code 2015-12-21 19:20:09 +01:00
3212429c9e Impl Debug for Parser 2015-12-19 11:47:24 +01:00
d5af28d98d Impl {Display,Debug} for JsonHeaderParser 2015-12-19 11:47:24 +01:00
ee78c249f0 Remove leftover file from storage backend moving 2015-12-06 13:15:07 +01:00
188aacad75 Move FileHeader{Spec,Data} to own submodules 2015-12-06 13:09:51 +01:00
3b89148cd0 Move storage/file_id.rs -> storage/file/id.rs 2015-12-06 13:02:21 +01:00
95f6f2e97e Move file.rs to subdirectory 2015-12-06 13:01:02 +01:00
6e0d0058b0 Move key generating to top-level spec helpers 2015-12-06 12:49:31 +01:00
dad856ff2a Move get_tags() from BM module to module utilities 2015-12-06 12:49:31 +01:00
7d40b68407 Rename: StorageBackend -> Storage 2015-12-06 12:49:02 +01:00
da2b482bda Move Storage Backend code imag::storage::backend -> imag::storage 2015-12-06 12:47:08 +01:00
ab3ada0914 Move header helpers from module/header/ to module/helpers/ 2015-12-05 16:03:05 +01:00
c6a2d39981 Outsource header utilities into header helper 2015-12-05 16:01:30 +01:00
3a8f2b5493 Refactor: dont use helper but StorageBackendError::new() directly 2015-12-05 15:01:46 +01:00
e6a32eafc0 Outsource StorageBackendError building into helper function 2015-12-05 14:24:58 +01:00
9f59478da0 Readability fixes 2015-12-05 11:10:54 +01:00
93393751b2 Remove uneccessary variable 2015-12-05 11:06:22 +01:00
80563cb340 Move tag filtering to sub-function 2015-12-05 11:05:50 +01:00
e8c7df4593 Remove variable, use expression directly 2015-12-05 11:03:05 +01:00