From: Utkarsh Singh <utkarsh190601@gmail.com> To: Bastien <bzg@gnu.org> Cc: Maxim Nikulin <manikulin@gmail.com>, emacs-orgmode@gnu.org, mail@nicolasgoaziou.fr Subject: Re: bug#47885: [PATCH] org-table-import: Make it more smarter for interactive use Date: Sat, 15 May 2021 16:39:54 +0530 [thread overview] Message-ID: <87im3kdzi5.fsf@gmail.com> (raw) In-Reply-To: <87k0o0jnm5.fsf@gnu.org> [-- Attachment #1: Type: text/plain, Size: 473 bytes --] 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. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: patch1 --] [-- Type: text/x-patch, Size: 3563 bytes --] 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 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #3: patch2 --] [-- Type: text/x-patch, Size: 1060 bytes --] 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 [-- Attachment #4: Type: text/plain, Size: 43 bytes --] -- Utkarsh Singh http://utkarshsingh.xyz
next prev parent reply other threads:[~2021-05-15 11:10 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-19 4:43 Utkarsh Singh 2021-04-19 8:19 ` Nicolas Goaziou 2021-04-19 14:23 ` Utkarsh Singh 2021-04-20 13:40 ` Nicolas Goaziou 2021-04-20 17:15 ` Utkarsh Singh 2021-04-23 4:58 ` Utkarsh Singh 2021-04-27 20:21 ` bug#47885: " Nicolas Goaziou 2021-04-28 8:37 ` Utkarsh Singh 2021-04-28 16:38 ` Maxim Nikulin 2021-05-10 18:36 ` Utkarsh Singh 2021-05-12 17:08 ` Maxim Nikulin 2021-05-14 14:54 ` Utkarsh Singh 2021-05-15 9:13 ` Bastien 2021-05-15 10:10 ` Utkarsh Singh 2021-05-15 10:30 ` Bastien 2021-05-15 11:09 ` Utkarsh Singh [this message] 2021-05-17 5:29 ` Bastien 2021-05-17 16:27 ` Utkarsh Singh 2021-06-01 16:23 ` Maxim Nikulin 2021-06-01 17:46 ` Utkarsh Singh 2021-06-02 12:06 ` Maxim Nikulin 2021-06-02 15:08 ` Utkarsh Singh 2021-06-02 16:44 ` Maxim Nikulin 2021-06-04 4:04 ` Utkarsh Singh 2021-06-05 12:40 ` Maxim Nikulin 2021-06-05 17:50 ` Utkarsh Singh 2021-06-09 12:15 ` Maxim Nikulin 2021-09-26 8:40 ` Bastien 2021-05-16 16:24 ` Maxim Nikulin 2021-05-17 16:30 ` Utkarsh Singh 2021-05-18 10:24 ` Utkarsh Singh 2021-05-18 12:31 ` Maxim Nikulin 2021-05-18 15:05 ` Utkarsh Singh
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://www.orgmode.org/ * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=87im3kdzi5.fsf@gmail.com \ --to=utkarsh190601@gmail.com \ --cc=bzg@gnu.org \ --cc=emacs-orgmode@gnu.org \ --cc=mail@nicolasgoaziou.fr \ --cc=manikulin@gmail.com \ --subject='Re: bug#47885: [PATCH] org-table-import: Make it more smarter for interactive use' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://git.savannah.gnu.org/cgit/emacs/org-mode.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).