Skip to content

Enhanced the separator mechanism so style like tagspace can be taken #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hekinami wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enhanced the separator mechanism so style like tagspace can be taken #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 33 additions & 13 deletions filetags.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@
(defgroup filetags nil "A helper for managing filetags directly in the filename"
:group 'applications)

(defcustom filetags-delimiter-between-filename-and-tags " -- " "Delimiter between filename and tags."
:type 'string)
(defcustom filetags-delimiter-between-filename-and-tags " -- "
"Delimiter between filename and tags.
Could be a string (in left of the tags string) or a cons (both left and right).
"
:type 'string)

(defcustom filetags-delimiter-between-tags " " "Delimiter between individual tags."
:type 'string)
Expand All @@ -63,14 +66,25 @@ if the variable `filetags-load-controlled-vocabulary-from-file' is t
or is set in the variable `filetags-controlled-vocabulary'."
:type 'bool)

(defun filetags--generate-tags-regexp nil
(if (consp filetags-delimiter-between-filename-and-tags)
(format "%s\\(.*\\)%s$"
(regexp-quote (car filetags-delimiter-between-filename-and-tags))
(regexp-quote (cdr filetags-delimiter-between-filename-and-tags)))
(format "%s\\(.*\\)$" (regexp-quote filetags-delimiter-between-filename-and-tags)))
)

(defun filetags-extract-filetags (filename)
"Extract the tags from FILENAME and return them as a sorted, unique list."
(if (string-match-p (regexp-quote filetags-delimiter-between-filename-and-tags)
(file-name-sans-extension filename))
(filetags-sort-and-uniq-tags (split-string (car (last (split-string (file-name-sans-extension filename)
filetags-delimiter-between-filename-and-tags)))
(regexp-quote filetags-delimiter-between-tags) t split-string-default-separators))
nil))
(let* ((regexp (filetags--generate-tags-regexp))
(filename-noext (file-name-sans-extension filename))
(tags-string (if (string-match regexp
filename-noext)
(match-string 1 filename-noext) nil)))
(if tags-string
(filetags-sort-and-uniq-tags (split-string tags-string
(regexp-quote filetags-delimiter-between-tags)))
()))
)

(defun filetags-sort-and-uniq-tags (tags)
"Take a list of strings TAGS, remove duplicates and sort them."
Expand All @@ -81,8 +95,10 @@ or is set in the variable `filetags-controlled-vocabulary'."
"Return the FILENAME but remove the tags.
Tags are separated from the rest of the filename
using the delimiter set in the variable `filetags-delimiter-between-filename-and-tags'."
(car (split-string (file-name-sans-extension filename)
filetags-delimiter-between-filename-and-tags)))
(let ((filename-noext (file-name-sans-extension filename))
(regexp (filetags--generate-tags-regexp)))
(replace-regexp-in-string regexp "" filename-noext)
))

(defun filetags-generate-new-filename (filename tags)
"Generate filename with list of strings TAGS from FILENAME.
Expand All @@ -92,8 +108,12 @@ using the delimiter set in the variable `filetags-delimiter-between-filename-and
(extension (file-name-extension filename)))
(concat new_filename
(when tags
(concat filetags-delimiter-between-filename-and-tags
(mapconcat #'identity (filetags-sort-and-uniq-tags tags) filetags-delimiter-between-tags)))
(let ((tags-string (mapconcat #'identity (filetags-sort-and-uniq-tags tags) filetags-delimiter-between-tags)))
(if (consp filetags-delimiter-between-filename-and-tags)
(concat (car filetags-delimiter-between-filename-and-tags)
tags-string
(cdr filetags-delimiter-between-filename-and-tags))
(concat filetags-delimiter-between-filename-and-tags tags-string))))
(when extension ".") extension)))

(defun filetags-add-tags-to-filename (fullname tags)
Expand Down