From c0b2e4fc54d6a4046fab3f23bc807acc1e2ef36b Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Sun, 22 Mar 2020 21:32:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=BE=D0=B5=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20=D1=84?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=B0=20=D0=BD=D0=B0=20=D0=B0=D0=B2=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D0=B2=20=D0=B8=20=D0=B7=D0=B0=D0=B3=D0=BE?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- press-n-post | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/press-n-post b/press-n-post index 3cb006e..e0504ba 100755 --- a/press-n-post +++ b/press-n-post @@ -3,6 +3,7 @@ package require Tk package require Img package require fileutil +package require textutil package require platform #---------------------------------------------------------------------- @@ -160,7 +161,12 @@ namespace eval pdf { # # Фамилия_1 И.О., Фамилия_2 И.О. - Название работы.pdf # - if {![regexp {(.*) - (.*)} $file_basename {} authors title]} { + set authors_title [::textutil::splitx $file_basename " - "] + + if {[llength $authors_title] >= 2} { + set authors [lindex $authors_title 0] + set title [join [lrange $authors_title 1 end] " - "] + } else { set authors {} set title $file_basename } @@ -326,12 +332,19 @@ namespace eval cover { # Создание webp-вариантов изображений proc make_webp {} { catch {exec cwebp "${::pdf::file_rootname}.jpg" -o "${::pdf::file_rootname}.webp" >/dev/null} - catch {exec cwebp "${::pdf::file_rootname}.th.jpg" -o "${::pdf::file_rootname}.th.webp" >/dev/null} + + if {[file exists ${::pdf::file_rootname}.th.jpg]} { + catch {exec cwebp "${::pdf::file_rootname}.th.jpg" -o "${::pdf::file_rootname}.th.webp" >/dev/null} + } } # Оптимизация изображений proc optimize {} { - exec resmushit-cli --preserve-filename "${::pdf::file_rootname}.jpg" + exec resmushit-cli --preserve-filename "${::pdf::file_rootname}.jpg" >/dev/null + + if {[file exists ${::pdf::file_rootname}.th.jpg]} { + exec resmushit-cli --preserve-filename "${::pdf::file_rootname}.th.jpg" + } } # TODO: Обрезка изображения