lfp

commit f3c10e13202cd2d445bf6e9878b4b1b5eb42c430

Author: Connor Etherington <[email protected]>

Date:   Tue Apr 16 10:32:40 2024 +0200

    Auto-Commit Update - 20240416

---

 PKGBUILD                                           |   2 +-

 README.md                                          |   2 +-

 lfp-4.2.1-1-x86_64.deb                             | Bin 71028 -> 0 bytes

 lfp-4.2.1-1-x86_64/usr/share/lfp/lfp-functions     |  15 ------

 lfp-4.2.2-1-x86_64.deb                             | Bin 0 -> 71216 bytes

 .../DEBIAN/control                                 |   2 +-

 .../postinst                                       |   0

 .../usr/bin/lfp                                    |   0

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

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

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

 .../usr/share/lfp/lfp-icons                        |   3 +-

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

 .../usr/share/lfp/lfprc                            |  20 +++++++-

 ...-manylinux_2_17_x86_64.manylinux2014_x86_64.whl | Bin

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

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

 .../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

 .../lfpreviewer-1.0.1-cp311-cp311-linux_x86_64.whl | Bin 0 -> 53330 bytes

 ...-manylinux_2_17_x86_64.manylinux2014_x86_64.whl | Bin 0 -> 59525 bytes

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

 usr/share/lfp/lfprc                                |   1 +

 25 files changed, 72 insertions(+), 32 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index f4d0e80..81418a3 100644

--- a/PKGBUILD

+++ b/PKGBUILD

@@ -1,7 +1,7 @@

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=lfp

-pkgver=4.2.1

+pkgver=4.2.2

 pkgrel=1

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

 license=('MIT')

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

index 0a0f4f6..32f2f84 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.2.1**

+**Version: 4.2.2**

 ***

diff --git a/lfp-4.2.1-1-x86_64.deb b/lfp-4.2.1-1-x86_64.deb

deleted file mode 100644

index 1cb87e8..0000000

Binary files a/lfp-4.2.1-1-x86_64.deb and /dev/null differ

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

deleted file mode 100755

index abbb0c2..0000000

--- a/lfp-4.2.1-1-x86_64/usr/share/lfp/lfp-functions

+++ /dev/null

@@ -1,15 +0,0 @@

-#!/usr/bin/env bash

-

-lfp-newPyEnv(){

-  which mamba >/dev/null 2>&1 && tool=mamba || tool=conda

-  $tool create -p ./.🐍 -y -c conda-forge python=3.10 pynvim && notify-send "Conda Environment Created at ./.🐍" || {

-    notify-send "🐍 Environment Creation Failed"

-    return 1

-  }

-

-  conda activate ./.🐍 && {

-    notify-send "🐍 Environment Activation Failed"

-    return 1

-   }

-}

-

diff --git a/lfp-4.2.2-1-x86_64.deb b/lfp-4.2.2-1-x86_64.deb

new file mode 100644

index 0000000..1d59eeb

Binary files /dev/null and b/lfp-4.2.2-1-x86_64.deb differ

diff --git a/lfp-4.2.1-1-x86_64/DEBIAN/control b/lfp-4.2.2-1-x86_64/DEBIAN/control

similarity index 97%

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

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

index e1ea395..597094d 100644

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

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

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

 Package: lfp

-Version: 4.2.1

+Version: 4.2.2

 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.2.1-1-x86_64/postinst b/lfp-4.2.2-1-x86_64/postinst

similarity index 100%

rename from lfp-4.2.1-1-x86_64/postinst

rename to lfp-4.2.2-1-x86_64/postinst

diff --git a/lfp-4.2.1-1-x86_64/usr/bin/lfp b/lfp-4.2.2-1-x86_64/usr/bin/lfp

similarity index 100%

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

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

diff --git a/lfp-4.2.1-1-x86_64/usr/share/doc/lfp/README.md b/lfp-4.2.2-1-x86_64/usr/share/doc/lfp/README.md

similarity index 99%

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

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

index ea36087..da97348 100644

--- a/lfp-4.2.1-1-x86_64/usr/share/doc/lfp/README.md

+++ b/lfp-4.2.2-1-x86_64/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.2**

 ***

diff --git a/lfp-4.2.1-1-x86_64/usr/share/lfp/cleaner b/lfp-4.2.2-1-x86_64/usr/share/lfp/cleaner

similarity index 100%

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

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

diff --git a/lfp-4.2.1-1-x86_64/usr/share/lfp/lfp b/lfp-4.2.2-1-x86_64/usr/share/lfp/lfp

similarity index 100%

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

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

diff --git a/lfp-4.2.1-1-x86_64/usr/share/lfp/lfp-icons b/lfp-4.2.2-1-x86_64/usr/share/lfp/lfp-icons

similarity index 98%

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

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

index a562be0..0d574ae 100644

--- a/lfp-4.2.1-1-x86_64/usr/share/lfp/lfp-icons

+++ b/lfp-4.2.2-1-x86_64/usr/share/lfp/lfp-icons

@@ -7,7 +7,7 @@ tw=🤝:\

 ow=📂:\

 ln=⛓:\

 or=❌:\

-ex=󰜫:\

+ex=⌬:\

 *.gitkeep=:\

 *.gitignore=:\

 *.col=🔰:\

@@ -23,6 +23,7 @@ ex=󰜫:\

 *.scss=:\

 *.less=:\

 *.vim=:\

+*.deb=:\

 *.c=🅒:\

 *.h=🅗:\

 *.cpp=🅒:\

diff --git a/lfp-4.2.1-1-x86_64/usr/share/lfp/lfpcd b/lfp-4.2.2-1-x86_64/usr/share/lfp/lfpcd

similarity index 100%

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

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

diff --git a/lfp-4.2.1-1-x86_64/usr/share/lfp/lfprc b/lfp-4.2.2-1-x86_64/usr/share/lfp/lfprc

old mode 100644

new mode 100755

similarity index 98%

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

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

index 1b36152..27f8a07

--- a/lfp-4.2.1-1-x86_64/usr/share/lfp/lfprc

+++ b/lfp-4.2.2-1-x86_64/usr/share/lfp/lfprc

@@ -7,7 +7,7 @@ set period 1

 set shell bash

 set scrolloff 10

 set drawbox true

-set hiddenfiles ".*:*.aux:*.bbl:*.bcf:*.blg:*.run.xml:yarn.lock:package-lock.json"

+set hiddenfiles ".*:*.aux:*.bbl:*.bcf:*.blg:*.run.xml:yarn.lock:package-lock.json:pnpm-lock.yaml:node_modules"

 set shellopts '-eu'

 set ifs "\n"

@@ -482,6 +482,7 @@ cmd ext ${{

       *.gz)        gunzip  ${ARG} && SUCC || FAIL ;;

       *.tgz)       tar xzf ${ARG} && SUCC || FAIL ;;

       *.zip)       unzip ${ARG} && SUCC || FAIL ;;

+      *.whl)       unzip ${ARG} && SUCC || FAIL ;;

       *.Z)         uncompress ${ARG} && SUCC || FAIL ;;

       *.7z)        7z x ${ARG} && SUCC || FAIL ;;

       *.deb)       ar x ${ARG} && SUCC || FAIL ;;

@@ -499,8 +500,23 @@ 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 | xsel -bi

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

 }}

diff --git a/lfp-4.2.1-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.2-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.2.1-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.2-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.2.1-1-x86_64/usr/share/lfp/ocr/ocr.js b/lfp-4.2.2-1-x86_64/usr/share/lfp/ocr/ocr.js

similarity index 61%

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

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

index 4604522..bef2825 100755

--- a/lfp-4.2.1-1-x86_64/usr/share/lfp/ocr/ocr.js

+++ b/lfp-4.2.2-1-x86_64/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/lfp-4.2.1-1-x86_64/usr/share/lfp/ocr/package.json b/lfp-4.2.2-1-x86_64/usr/share/lfp/ocr/package.json

similarity index 85%

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

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

index 0b24c3c..bbbb8cd 100644

--- a/lfp-4.2.1-1-x86_64/usr/share/lfp/ocr/package.json

+++ b/lfp-4.2.2-1-x86_64/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/lfp-4.2.1-1-x86_64/usr/share/lfp/ocr/tesseract.js b/lfp-4.2.2-1-x86_64/usr/share/lfp/ocr/tesseract.js

similarity index 100%

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

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

diff --git a/lfp-4.2.1-1-x86_64/usr/share/lfp/scope b/lfp-4.2.2-1-x86_64/usr/share/lfp/scope

similarity index 100%

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

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

diff --git a/lfp-4.2.1-1-x86_64/usr/share/licenses/lfp/LICENSE b/lfp-4.2.2-1-x86_64/usr/share/licenses/lfp/LICENSE

similarity index 100%

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

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

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

similarity index 100%

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

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

diff --git a/lfpreviewer/dist/lfpreviewer-1.0.1-cp311-cp311-linux_x86_64.whl b/lfpreviewer/dist/lfpreviewer-1.0.1-cp311-cp311-linux_x86_64.whl

new file mode 100644

index 0000000..92e4cd2

Binary files /dev/null and b/lfpreviewer/dist/lfpreviewer-1.0.1-cp311-cp311-linux_x86_64.whl differ

diff --git a/lfpreviewer/dist/lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/lfpreviewer/dist/lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl

new file mode 100644

index 0000000..7408f51

Binary files /dev/null and b/lfpreviewer/dist/lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl differ

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

index 0c3dae2..da97348 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.2.1**

+**Version: 4.2.2**

 ***

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

index e98b236..27f8a07 100755

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

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

@@ -515,6 +515,7 @@ EOF

     )"

   done

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

+  [[ -n $result ]] && echo -e "$result" | awk '/./,EOF' | tac | awk '/./,EOF' | tac | xsel -bi

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

 }}