sascha/vlfi
1
0
Fork 0
mirror of https://github.com/m00natic/vlfi.git synced 2025-04-18 16:50:19 +01:00
Code Issues Releases Wiki Activity

Add progress reporters for the optimized part of line search.

Browse Source
This commit is contained in:
Andrey Kotlarski 2014-01-23 02:10:52 +02:00
parent 5c604c48a4
commit 1a1ce27d37
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vlf-search.el
View File

@ -198,28 +198,38 @@ Search is performed chunk by chunk in `vlf-batch-size' memory."
(vlf-verify-size) (vlf-verify-size)
(setq start end (setq start end
end (min vlf-file-size end (min vlf-file-size
(+ start vlf-batch-size)))) (+ start vlf-batch-size)))
(progress-reporter-update reporter start))
(progress-reporter-done reporter)
(when (< n (- vlf-file-size end)) (when (< n (- vlf-file-size end))
(vlf-move-to-chunk-2 start end) (vlf-move-to-chunk-2 start end)
(goto-char (point-min)) (goto-char (point-min))
(setq success (vlf-re-search "[\n\C-m]" n nil 0))))) (setq success (vlf-re-search "[\n\C-m]" n nil 0)))))
(let ((start (max 0 (- vlf-file-size vlf-batch-size))) (let ((start (max 0 (- vlf-file-size vlf-batch-size)))
(end vlf-file-size) (end vlf-file-size)
(reporter (make-progress-reporter
(concat "Searching for line -"
(number-to-string n) "...")
0 vlf-file-size))
(inhibit-read-only t)) (inhibit-read-only t))
(setq n (- n))
(vlf-with-undo-disabled (vlf-with-undo-disabled
(while (and (< (- end) n) (< n (- start end))) (while (and (< (- end start) n) (< n end))
(erase-buffer) (erase-buffer)
(insert-file-contents-literally buffer-file-name nil (insert-file-contents-literally buffer-file-name nil
start end) start end)
(goto-char (point-max)) (goto-char (point-max))
(while (re-search-backward "[\n\C-m]" nil t) (while (re-search-backward "[\n\C-m]" nil t)
(setq n (1+ n))) (setq n (1- n)))
(setq end start (setq end start
start (max 0 (- end vlf-batch-size)))) start (max 0 (- end vlf-batch-size)))
(when (< (- end) n) (progress-reporter-update reporter
(- vlf-file-size end)))
(progress-reporter-done reporter)
(when (< n end)
(vlf-move-to-chunk-2 start end) (vlf-move-to-chunk-2 start end)
(goto-char (point-max)) (goto-char (point-max))
(setq success (vlf-re-search "[\n\C-m]" (- n) t 0)))))) (setq success (vlf-re-search "[\n\C-m]" n t 0))))))
(unless success (unless success
(vlf-move-to-chunk-2 start-pos end-pos) (vlf-move-to-chunk-2 start-pos end-pos)
(goto-char pos))))) (goto-char pos)))))