|
@@ -6,6 +6,7 @@ import sys
|
|
import tempfile
|
|
import tempfile
|
|
|
|
|
|
import marxbook
|
|
import marxbook
|
|
|
|
+import marxbook.extract
|
|
|
|
|
|
|
|
|
|
def get_parser():
|
|
def get_parser():
|
|
@@ -16,6 +17,7 @@ def get_parser():
|
|
p.set_defaults(func=None)
|
|
p.set_defaults(func=None)
|
|
subcommands = p.add_subparsers(help="Sub-commands")
|
|
subcommands = p.add_subparsers(help="Sub-commands")
|
|
list_p = subcommands.add_parser("list")
|
|
list_p = subcommands.add_parser("list")
|
|
|
|
+ list_p.add_argument("--format", default="{Path}\t{Tag}\t{Title}\t{Url}", dest='fmt')
|
|
list_p.add_argument("folder", nargs="?", default="")
|
|
list_p.add_argument("folder", nargs="?", default="")
|
|
list_p.set_defaults(func=main_list)
|
|
list_p.set_defaults(func=main_list)
|
|
|
|
|
|
@@ -44,9 +46,10 @@ def main():
|
|
|
|
|
|
def main_list(store, args):
|
|
def main_list(store, args):
|
|
for mark in store.folder(args.folder):
|
|
for mark in store.folder(args.folder):
|
|
- tag = ",".join(mark["Tag"])
|
|
|
|
- line = [mark["Path"], tag, mark["Title"], mark["Url"]]
|
|
|
|
- print("\t".join(line))
|
|
|
|
|
|
+ markdata = {"Folder": os.path.dirname(mark['Path'])}
|
|
|
|
+ markdata.update(mark)
|
|
|
|
+ markdata['Tag'] = ','.join(mark['Tag'])
|
|
|
|
+ print(args.fmt.replace(r'\t', '\t').format(**markdata))
|
|
|
|
|
|
|
|
|
|
def edit_before_add(data: dict, args) -> dict:
|
|
def edit_before_add(data: dict, args) -> dict:
|