lfp

commit d1b7bbcebb7f7b9b36a0712fe82b0050e4fa1c55

Author: Connor Etherington <[email protected]>

Date:   Sat Feb 17 05:07:33 2024 +0200

    Auto-Commit Update - 20240217

---

 PKGBUILD                                           |   4 +-

 README.md                                          |   2 +-

 .../DEBIAN/control                                 |   2 +-

 .../postinst                                       |   0

 .../usr/bin/lfp                                    |   0

 .../usr/share/doc/lfp/README.md                    |   0

 .../usr/share/lfp/cleaner                          |   0

 .../usr/share/lfp/lfp                              |   0

 .../usr/share/lfp/lfp-functions                    |   0

 .../usr/share/lfp/lfp-icons                        |   0

 .../usr/share/lfp/lfpcd                            |   0

 .../usr/share/lfp/lfprc                            |   0

 ...-manylinux_2_17_x86_64.manylinux2014_x86_64.whl | Bin

 .../usr/share/lfp/ocr/ocr.js                       |   0

 .../usr/share/lfp/ocr/package.json                 |   0

 .../usr/share/lfp/ocr/tesseract.js                 |   0

 .../usr/share/lfp/scope                            |   0

 .../usr/share/licenses/lfp/LICENSE                 |   0

 .../usr/share/man/man1/lfp.1.gz                    | Bin

 usr/share/doc/lfp/README.md                        |   2 +-

 usr/share/lfp/lfprc                                |  16 ++++++-

 usr/share/lfp/ocr/ocr.js                           |  52 +++++++++++++++++----

 usr/share/lfp/ocr/package.json                     |   3 +-

 usr/share/man/man1/lfp.1.gz                        | Bin 1916 -> 1916 bytes

 24 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index a880d47..d7c4810 100644

--- a/PKGBUILD

+++ b/PKGBUILD

@@ -1,14 +1,14 @@

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=lfp

-pkgver=4.1.7

+pkgver=4.2.0

 pkgrel=1

 pkgdesc='A wrapper for the lf file manager with in-terminal media previews, on-exit directory changing and much more'

 license=('MIT')

 arch=('x86_64')

 install="lfp.install"

 url="https://gitlab.com/a4to/lfp"

-depends=(lf zsh ffmpeg graphicsmagick openslide ghostscript bat fzf dunst dialog xsel lolcat python3 python-docopt python-pillow python-attrs libxres python-setuptools python-pip)

+depends=(lf zsh ffmpeg graphicsmagick openslide ghostscript bat fzf dunst dialog xsel lolcat python3 python-docopt python-pillow python-attrs libxres python-setuptools python-pip tesseract tesseract-data-eng)

 conflicts=(lfp-git)

 optdepends=(

   'nodejs: to make use of lfps built in node actions manager'

diff --git a/README.md b/README.md

index c3ebb2f..86acf22 100644

--- a/README.md

+++ b/README.md

@@ -4,7 +4,7 @@

 ### `lfp` is a simple wrapper for the `lf` file manager, with built-in file, image, and video previews, as well as on-exit directory changing.

 ### The program makes use of `ueberzug` to preview images, documents, and video thumbnails. Preview behavior can be altered by editing the *scope* file.

-**Version: 4.1.7**

+**Version: 4.2.0**

 ***

diff --git a/lfp-4.1.7-1-x86_64/DEBIAN/control b/lfp-4.2.0-1-x86_64/DEBIAN/control

similarity index 97%

rename from lfp-4.1.7-1-x86_64/DEBIAN/control

rename to lfp-4.2.0-1-x86_64/DEBIAN/control

index 38ac2e5..0246bb7 100644

--- a/lfp-4.1.7-1-x86_64/DEBIAN/control

+++ b/lfp-4.2.0-1-x86_64/DEBIAN/control

@@ -1,5 +1,5 @@

 Package: lfp

-Version: 4.1.7

+Version: 4.2.0

 Maintainer: © Connor Etherington <[email protected]>

 Depends: lf, zsh, ffmpeg, graphicsmagick, openslide-tools, ghostscript, bat, fzf, dunst, dialog, xsel, lolcat, python3, python3-docopt, python3-pillow, python3-attr, libxres-dev, python3-setuptools, python3-pip, nodejs

 Architecture: amd64

diff --git a/lfp-4.1.7-1-x86_64/postinst b/lfp-4.2.0-1-x86_64/postinst

similarity index 100%

rename from lfp-4.1.7-1-x86_64/postinst

rename to lfp-4.2.0-1-x86_64/postinst

diff --git a/lfp-4.1.7-1-x86_64/usr/bin/lfp b/lfp-4.2.0-1-x86_64/usr/bin/lfp

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/bin/lfp

rename to lfp-4.2.0-1-x86_64/usr/bin/lfp

diff --git a/lfp-4.1.7-1-x86_64/usr/share/doc/lfp/README.md b/lfp-4.2.0-1-x86_64/usr/share/doc/lfp/README.md

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/doc/lfp/README.md

rename to lfp-4.2.0-1-x86_64/usr/share/doc/lfp/README.md

diff --git a/lfp-4.1.7-1-x86_64/usr/share/lfp/cleaner b/lfp-4.2.0-1-x86_64/usr/share/lfp/cleaner

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/lfp/cleaner

rename to lfp-4.2.0-1-x86_64/usr/share/lfp/cleaner

diff --git a/lfp-4.1.7-1-x86_64/usr/share/lfp/lfp b/lfp-4.2.0-1-x86_64/usr/share/lfp/lfp

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/lfp/lfp

rename to lfp-4.2.0-1-x86_64/usr/share/lfp/lfp

diff --git a/lfp-4.1.7-1-x86_64/usr/share/lfp/lfp-functions b/lfp-4.2.0-1-x86_64/usr/share/lfp/lfp-functions

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/lfp/lfp-functions

rename to lfp-4.2.0-1-x86_64/usr/share/lfp/lfp-functions

diff --git a/lfp-4.1.7-1-x86_64/usr/share/lfp/lfp-icons b/lfp-4.2.0-1-x86_64/usr/share/lfp/lfp-icons

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/lfp/lfp-icons

rename to lfp-4.2.0-1-x86_64/usr/share/lfp/lfp-icons

diff --git a/lfp-4.1.7-1-x86_64/usr/share/lfp/lfpcd b/lfp-4.2.0-1-x86_64/usr/share/lfp/lfpcd

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/lfp/lfpcd

rename to lfp-4.2.0-1-x86_64/usr/share/lfp/lfpcd

diff --git a/lfp-4.1.7-1-x86_64/usr/share/lfp/lfprc b/lfp-4.2.0-1-x86_64/usr/share/lfp/lfprc

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/lfp/lfprc

rename to lfp-4.2.0-1-x86_64/usr/share/lfp/lfprc

diff --git a/lfp-4.1.7-1-x86_64/usr/share/lfp/lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/lfp-4.2.0-1-x86_64/usr/share/lfp/lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/lfp/lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl

rename to lfp-4.2.0-1-x86_64/usr/share/lfp/lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl

diff --git a/lfp-4.1.7-1-x86_64/usr/share/lfp/ocr/ocr.js b/lfp-4.2.0-1-x86_64/usr/share/lfp/ocr/ocr.js

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/lfp/ocr/ocr.js

rename to lfp-4.2.0-1-x86_64/usr/share/lfp/ocr/ocr.js

diff --git a/lfp-4.1.7-1-x86_64/usr/share/lfp/ocr/package.json b/lfp-4.2.0-1-x86_64/usr/share/lfp/ocr/package.json

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/lfp/ocr/package.json

rename to lfp-4.2.0-1-x86_64/usr/share/lfp/ocr/package.json

diff --git a/lfp-4.1.7-1-x86_64/usr/share/lfp/ocr/tesseract.js b/lfp-4.2.0-1-x86_64/usr/share/lfp/ocr/tesseract.js

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/lfp/ocr/tesseract.js

rename to lfp-4.2.0-1-x86_64/usr/share/lfp/ocr/tesseract.js

diff --git a/lfp-4.1.7-1-x86_64/usr/share/lfp/scope b/lfp-4.2.0-1-x86_64/usr/share/lfp/scope

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/lfp/scope

rename to lfp-4.2.0-1-x86_64/usr/share/lfp/scope

diff --git a/lfp-4.1.7-1-x86_64/usr/share/licenses/lfp/LICENSE b/lfp-4.2.0-1-x86_64/usr/share/licenses/lfp/LICENSE

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/licenses/lfp/LICENSE

rename to lfp-4.2.0-1-x86_64/usr/share/licenses/lfp/LICENSE

diff --git a/lfp-4.1.7-1-x86_64/usr/share/man/man1/lfp.1.gz b/lfp-4.2.0-1-x86_64/usr/share/man/man1/lfp.1.gz

similarity index 100%

rename from lfp-4.1.7-1-x86_64/usr/share/man/man1/lfp.1.gz

rename to lfp-4.2.0-1-x86_64/usr/share/man/man1/lfp.1.gz

diff --git a/usr/share/doc/lfp/README.md b/usr/share/doc/lfp/README.md

index ea36087..2aa1340 100644

--- a/usr/share/doc/lfp/README.md

+++ b/usr/share/doc/lfp/README.md

@@ -4,7 +4,7 @@

 ### `lfp` is a simple wrapper for the `lf` file manager, with built-in file, image, and video previews, as well as on-exit directory changing.

 ### The program makes use of `ueberzug` to preview images, documents, and video thumbnails. Preview behavior can be altered by editing the *scope* file.

-**Version: 4.1.7**

+**Version: 4.2.0**

 ***

diff --git a/usr/share/lfp/lfprc b/usr/share/lfp/lfprc

index 1b36152..ea488c3 100755

--- a/usr/share/lfp/lfprc

+++ b/usr/share/lfp/lfprc

@@ -499,8 +499,22 @@ cmd setbg "$1"

 cmd bulkrename $vidir

 cmd ocr ${{

-  node /usr/share/lfp/ocr/ocr.js $fx

+  result=${result:-}

+  for x in ${fx[@]}; do

+    node /usr/share/lfp/ocr/ocr.js $x

+    result="$(cat << EOF

+$result

+

+

+

+$(basename $x):

+----------------

+$(xsel -bo)

+EOF

+    )"

+  done

   notify-send "🔧 OCR Complete" "Text copied to clipboard."

+  [[ -n $result ]] && echo -e "$result" | awk '/./,EOF' | tac | awk '/./,EOF' | tac | less --use-color +%

 }}

diff --git a/usr/share/lfp/ocr/ocr.js b/usr/share/lfp/ocr/ocr.js

index 4604522..bef2825 100755

--- a/usr/share/lfp/ocr/ocr.js

+++ b/usr/share/lfp/ocr/ocr.js

@@ -3,7 +3,8 @@

 const fs = require('fs');

 const fsp = require('fs').promises;

 const path = require('path');

-const tesseract = require('./tesseract');

+const scriptDir = path.dirname(require.main.filename);

+const tesseract = require(path.join(scriptDir, 'tesseract.js'));

 const { spawn } = require('child_process');

 const green = '\x1b[32m';

@@ -26,19 +27,54 @@ let fail = false;

 const ocr = async (imagePath) => {

   const Type = await sh(`file -b --mime-type ${imagePath}`);

-  if (await sh(`file -bL --mime-encoding ${imagePath}`) === 'utf-8') {

-    return await fsp.readFile(imagePath, 'utf8');

+  if(Type === 'PNG image data' || Type === 'JPEG image data' || Type === 'TIFF image data' || Type === 'image/x-portable-bitmap' || Type === 'image/png' || Type === 'image/jpeg' || Type === 'image/tiff' || Type === 'PC bitmap') {

+

+    let binary = require('child_process').exec('which tesseract', (err, stdout, stderr) => {

+      if (err) {

+        console.error('\n\x1b[31m[-]\x1b[0m Fatal Error: Tesseract not found...');

+        process.exit(1);

+      }

+      if (stdout === '') {

+        console.error('\n\x1b[31m[-]\x1b[0m Fatal Error: Tesseract not found...');

+        process.exit(1);

+      }

+      if (stderr) {

+        console.error(stderr);

+        process.exit(1);

+      }

+    });

+

+    const image = await fsp.readFile(imagePath);

+    return await tesseract.recognize(image, config);

+

   } else if (Type === 'PDF document') {

+

+    let binary = require('child_process').exec('which tesseract', (err, stdout, stderr) => {

+      if (err) {

+        console.error('\n\x1b[31m[-]\x1b[0m Fatal Error: Tesseract not found...');

+        process.exit(1);

+      }

+      if (stdout === '') {

+        console.error('\n\x1b[31m[-]\x1b[0m Fatal Error: Tesseract not found...');

+        process.exit(1);

+      }

+      if (stderr) {

+        console.error(stderr);

+        process.exit(1);

+      }

+    });

+

     await sh(`convert ${imagePath} -background white ${imagePath}.png`);

     const res = await tesseract.recognize(`${imagePath}.png`, config);

     await fs.unlinkSync(`${imagePath}.png`);

     return res;

-  } else if(Type === 'PNG image data' || Type === 'JPEG image data' || Type === 'TIFF image data' || Type === 'image/x-portable-bitmap' || Type === 'image/png' || Type === 'image/jpeg' || Type === 'image/tiff' || Type === 'PC bitmap') {

-    const image = await fsp.readFile(imagePath);

-    return await tesseract.recognize(image, config);

   } else {

-    fail = true;

-    throw new Error('Unknown image type');

+    try {

+      return await fsp.readFile(imagePath, 'utf8');

+    } catch (err) {

+      fail = true;

+      throw new Error('Unknown image type');

+    }

   }

 }

diff --git a/usr/share/lfp/ocr/package.json b/usr/share/lfp/ocr/package.json

index 0b24c3c..bbbb8cd 100644

--- a/usr/share/lfp/ocr/package.json

+++ b/usr/share/lfp/ocr/package.json

@@ -1,6 +1,6 @@

 {

   "name": "lfp-ocr",

-  "version": "0.2.0",

+  "version": "0.2.1",

   "description": "",

   "main": "ocr.js",

   "scripts": {

@@ -17,6 +17,7 @@

   "author": "Connor Etherington <[email protected]",

   "license": "MIT",

   "dependencies": {

+    "node-tesseract-ocr": "^2.2.1",

     "shx": "^0.3.4"

   }

 }

diff --git a/usr/share/man/man1/lfp.1.gz b/usr/share/man/man1/lfp.1.gz

index 9ccffdc..b180e48 100644

Binary files a/usr/share/man/man1/lfp.1.gz and b/usr/share/man/man1/lfp.1.gz differ