[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: bug#47885: [PATCH] org-table-import: Make it more smarter for intera
From: |
Utkarsh Singh |
Subject: |
Re: bug#47885: [PATCH] org-table-import: Make it more smarter for interactive use |
Date: |
Sat, 15 May 2021 16:39:54 +0530 |
On 2021-05-15, 12:30 +0200, Bastien <bzg@gnu.org> wrote:
> Hi Utkarsh,
>
> Utkarsh Singh <utkarsh190601@gmail.com> writes:
>
>> For now can you review the patches I proposed earlier in this
>> thread?
>
> Do these patches provide a complete and predictable solution?
> If so, can you merge them into a single patch against master?
>
Here are the patches:
I have separated out 'adding of prompt' to patch2 as it doesn't
have to do anything with separator guessing part.
>From 659e5e95bd8e024ac4730cf410a565b9e975b669 Mon Sep 17 00:00:00 2001
From: Utkarsh Singh <utkarsh190601@gmail.com>
Date: Sat, 15 May 2021 16:30:36 +0530
Subject: [PATCH 1/2] org-table-convert-region: move out separator-guessing
1. Move separator guessing code to org-table-guess-separator (new
function).
2. Add semicolon, colon and SPACE to the list of know separator
(separator which we can guess).
---
lisp/org-table.el | 49 ++++++++++++++++++++++++++++++++++++-----------
1 file changed, 38 insertions(+), 11 deletions(-)
diff --git a/lisp/org-table.el b/lisp/org-table.el
index cc69542..d3242da 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -837,6 +837,39 @@ SIZE is a string Columns x Rows like for example \"3x2\"."
(goto-char pos))
(org-table-align)))
+(defun org-table-guess-separator (beg0 end0)
+ "Guess separator for region BEG0 to END0.
+
+List of preferred separator (in order of preference):
+comma, TAB, semicolon, colon or SPACE.
+
+Search for a line which doesn't contain a separator if found
+search again using next preferred separator or else return
+separator as string."
+ (let* ((beg (save-excursion
+ (goto-char (min beg0 end0))
+ (skip-chars-forward " \t\n")
+ (if (eobp) (point) (line-beginning-position))))
+ (end (save-excursion
+ (goto-char (max beg0 end0))
+ (skip-chars-backward " \t\n" beg)
+ (if (= beg (point)) (point) (line-end-position))))
+ (sep-regexp
+ (list (list "," (rx bol (1+ (not (or ?\n ?,))) eol))
+ (list "\t" (rx bol (1+ (not (or ?\n ?\t))) eol))
+ (list ";" (rx bol (1+ (not (or ?\n ?\;))) eol))
+ (list ":" (rx bol (1+ (not (or ?\n ?:))) eol))
+ (list " " (rx bol (1+ (not (or ?\n ?\s))) eol)))))
+ (unless (= beg end)
+ (save-excursion
+ (goto-char beg)
+ (catch :found
+ (pcase-dolist (`(,sep ,regexp) sep-regexp)
+ (save-excursion
+ (unless (re-search-forward regexp end t)
+ (throw :found sep))))
+ nil)))))
+
;;;###autoload
(defun org-table-convert-region (beg0 end0 &optional separator)
"Convert region to a table.
@@ -853,10 +886,7 @@ following values:
integer When a number, use that many spaces, or a TAB, as field separator
regexp When a regular expression, use it to match the separator
nil When nil, the command tries to be smart and figure out the
- separator in the following way:
- - when each line contains a TAB, assume TAB-separated material
- - when each line contains a comma, assume CSV material
- - else, assume one or more SPACE characters as separator."
+ separator using `org-table-guess-seperator'."
(interactive "r\nP")
(let* ((beg (min beg0 end0))
(end (max beg0 end0))
@@ -873,13 +903,10 @@ nil When nil, the command tries to be smart and
figure out the
(if (bolp) (backward-char 1) (end-of-line 1))
(setq end (point-marker))
;; Get the right field separator
- (unless separator
- (goto-char beg)
- (setq separator
- (cond
- ((not (re-search-forward "^[^\n\t]+$" end t)) '(16))
- ((not (re-search-forward "^[^\n,]+$" end t)) '(4))
- (t 1))))
+ (when (and (not separator)
+ (not (setq separator
+ (org-table-guess-separator beg end))))
+ (user-error "Failed to guess separator"))
(goto-char beg)
(if (equal separator '(4))
(while (< (point) end)
--
2.31.1
>From 328d59dd2d2fc797e5819f43b40c96ffa45cd62f Mon Sep 17 00:00:00 2001
From: Utkarsh Singh <utkarsh190601@gmail.com>
Date: Sat, 15 May 2021 16:32:32 +0530
Subject: [PATCH 2/2] org-table-import: add file prompt
---
lisp/org-table.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/org-table.el b/lisp/org-table.el
index d3242da..20144c9 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -954,7 +954,8 @@ lines. It can have the following values:
- (64) Prompt for a regular expression as field separator.
- integer When a number, use that many spaces, or a TAB, as field separator.
- regexp When a regular expression, use it to match the separator."
- (interactive "f\nP")
+ (interactive (list (read-file-name "Import file: ")
+ (prefix-numeric-value current-prefix-arg)))
(when (and (called-interactively-p 'any)
(not (string-match-p (rx "." (or "txt" "tsv" "csv") eos) file))
(not (yes-or-no-p "The file's extension is not .txt, .tsv or
.csv. Import? ")))
--
2.31.1
--
Utkarsh Singh
http://utkarshsingh.xyz
- Re: bug#47885: [PATCH] org-table-import: Make it more smarter for interactive use, Utkarsh Singh, 2021/05/10
- Re: bug#47885: [PATCH] org-table-import: Make it more smarter for interactive use, Maxim Nikulin, 2021/05/16
- Re: bug#47885: [PATCH] org-table-import: Make it more smarter for interactive use, Utkarsh Singh, 2021/05/17
- Re: bug#47885: [PATCH] org-table-import: Make it more smarter for interactive use, Utkarsh Singh, 2021/05/18
- Re: bug#47885: [PATCH] org-table-import: Make it more smarter for interactive use, Maxim Nikulin, 2021/05/18
- Re: bug#47885: [PATCH] org-table-import: Make it more smarter for interactive use, Utkarsh Singh, 2021/05/18