pjht/buku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #275 from rachmadaniHaryono/feature/append-tag-on-import

Browse Source 
Feature/append tag on import
This commit is contained in:
Arun Prakash Jana 2018-05-16 04:42:01 +05:30 committed by GitHub
commit 421a4e993f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
buku.py
View File

@ -2272,15 +2272,16 @@ class BukuDb:
else: else:
newtag = None newtag = None
if not tacit:
append_tags_resp = input('Append tags when bookmark exist? (n/y): ')
else:
append_tags_resp = 'n'
items = []
if filepath.endswith('.md'): if filepath.endswith('.md'):
for item in import_md(filepath=filepath, newtag=newtag): items = import_md(filepath=filepath, newtag=newtag)
self.add_rec(*item)
self.conn.commit()
elif filepath.endswith('org'): elif filepath.endswith('org'):
for item in import_org(filepath=filepath, newtag=newtag): items = import_org(filepath=filepath, newtag=newtag)
self.add_rec(*item)
else: else:
try: try:
@ -2300,11 +2301,16 @@ class BukuDb:
resp = 'y' resp = 'y'
add_parent_folder_as_tag = (resp == 'y') add_parent_folder_as_tag = (resp == 'y')
for item in import_html(soup, add_parent_folder_as_tag, newtag): items = import_html(soup, add_parent_folder_as_tag, newtag)
self.add_rec(*item) infp.close()
for item in items:
add_rec_res = self.add_rec(*item)
if add_rec_res == -1 and append_tags_resp == 'y':
rec_id = self.get_rec_id(item[0])
self.append_tag_at_index(rec_id, item[2])
self.conn.commit() self.conn.commit()
infp.close()
if newtag: if newtag:
print('\nAuto-generated tag: %s' % newtag) print('\nAuto-generated tag: %s' % newtag)