| Hash | Commit message | Author | Date | Files | + | - |
1 | commit 28aed8996d88df344d850672f8dd12711d548689 |
2 | Author: Connor Etherington <[email protected]> |
3 | Date: Mon Oct 2 08:37:00 2023 +0200 |
4 | |
5 | Auto-Commit Update - 20231002 |
6 | --- |
7 | lfp.install | 6 +++++ |
8 | usr/share/lfp/ocr/node_modules/.yarn-integrity | 16 ------------- |
9 | usr/share/lfp/ocr/ocr.js | 2 +- |
10 | usr/share/lfp/ocr/package-lock.json | 27 ++++++++++++++++++++++ |
11 | usr/share/lfp/ocr/package.json | 5 +--- |
12 | .../node-tesseract-ocr => tesseract}/LICENSE | 0 |
13 | .../node-tesseract-ocr => tesseract}/package.json | 0 |
14 | .../node-tesseract-ocr => tesseract}/readme.md | 0 |
15 | .../src/index.d.ts | 0 |
16 | .../node-tesseract-ocr => tesseract}/src/index.js | 0 |
17 | usr/share/lfp/ocr/yarn.lock | 2 +- |
18 | 11 files changed, 36 insertions(+), 22 deletions(-) |
19 | |
20 | diff --git a/lfp.install b/lfp.install |
21 | index b3b2bd1..6c915df 100644 |
22 | --- a/lfp.install |
23 | +++ b/lfp.install |
24 | @@ -1,3 +1,9 @@ |
25 | post_install() { |
26 | echo -e "\n \033[1;33m[+]\e[0;1;32m For on-exit directory changing, add the following line to your bash/zshrc\e[0m :\e[36m\n\n source '/usr/share/lfp/lfpcd'\n\n\n\e[0m" |
27 | } |
28 | + |
29 | +post_upgrade() { |
30 | + which yarn >/dev/null 2>&1 && yarn install /usr/share/lfp/ocr || |
31 | + which npm >/dev/null 2>&1 && npm install /usr/share/lfp/ocr || |
32 | + true |
33 | +} |
34 | diff --git a/usr/share/lfp/ocr/node_modules/.yarn-integrity b/usr/share/lfp/ocr/node_modules/.yarn-integrity |
35 | deleted file mode 100644 |
36 | index 1e6bd54..0000000 |
37 | --- a/usr/share/lfp/ocr/node_modules/.yarn-integrity |
38 | +++ /dev/null |
39 | @@ -1,16 +0,0 @@ |
40 | -{ |
41 | - "systemParams": "linux-x64-115", |
42 | - "modulesFolders": [ |
43 | - "node_modules" |
44 | - ], |
45 | - "flags": [], |
46 | - "linkedModules": [], |
47 | - "topLevelPatterns": [ |
48 | - "node-tesseract-ocr@^2.2.1" |
49 | - ], |
50 | - "lockfileEntries": { |
51 | - "node-tesseract-ocr@^2.2.1": "https://registry.yarnpkg.com/node-tesseract-ocr/-/node-tesseract-ocr-2.2.1.tgz#465fea1a1acd6720efb582d5f6c2bcbb82cce94d" |
52 | - }, |
53 | - "files": [], |
54 | - "artifacts": {} |
55 | -} |
56 | diff --git a/usr/share/lfp/ocr/ocr.js b/usr/share/lfp/ocr/ocr.js |
57 | index e9071d7..1760ff9 100755 |
58 | --- a/usr/share/lfp/ocr/ocr.js |
59 | +++ b/usr/share/lfp/ocr/ocr.js |
60 | @@ -3,7 +3,7 @@ |
61 | const fs = require('fs'); |
62 | const fsp = require('fs').promises; |
63 | const path = require('path'); |
64 | -const tesseract = require('./node_modules/node-tesseract-ocr'); |
65 | +const tesseract = require('/usr/share/lfp/ocr/tesseract'); |
66 | const { spawn } = require('child_process'); |
67 | |
68 | const config = { lang: 'eng', oem: 1, psm: 3 }; |
69 | diff --git a/usr/share/lfp/ocr/package-lock.json b/usr/share/lfp/ocr/package-lock.json |
70 | new file mode 100644 |
71 | index 0000000..3aaddcf |
72 | --- /dev/null |
73 | +++ b/usr/share/lfp/ocr/package-lock.json |
74 | @@ -0,0 +1,27 @@ |
75 | +{ |
76 | + "name": "lfp-ocr", |
77 | + "version": "0.1.0", |
78 | + "lockfileVersion": 3, |
79 | + "requires": true, |
80 | + "packages": { |
81 | + "": { |
82 | + "name": "lfp-ocr", |
83 | + "version": "0.1.0", |
84 | + "license": "MIT", |
85 | + "dependencies": { |
86 | + "node-tesseract-ocr": "^2.2.1" |
87 | + }, |
88 | + "bin": { |
89 | + "lfp-ocr": "ocr.js" |
90 | + } |
91 | + }, |
92 | + "node_modules/node-tesseract-ocr": { |
93 | + "version": "2.2.1", |
94 | + "resolved": "https://registry.npmjs.org/node-tesseract-ocr/-/node-tesseract-ocr-2.2.1.tgz", |
95 | + "integrity": "sha512-Q9cD79JGpPNQBxbi1fV+OAsTxYKLpx22sagsxSyKbu1u+t6UarApf5m32uVc8a5QAP1Wk7fIPN0aJFGGEE9DyQ==", |
96 | + "engines": { |
97 | + "node": ">=10" |
98 | + } |
99 | + } |
100 | + } |
101 | +} |
102 | diff --git a/usr/share/lfp/ocr/package.json b/usr/share/lfp/ocr/package.json |
103 | index 394f4c5..9ce2737 100644 |
104 | --- a/usr/share/lfp/ocr/package.json |
105 | +++ b/usr/share/lfp/ocr/package.json |
106 | @@ -15,8 +15,5 @@ |
107 | "lfpreviewer" |
108 | ], |
109 | "author": "Connor Etherington <[email protected]", |
110 | - "license": "MIT", |
111 | - "dependencies": { |
112 | - "node-tesseract-ocr": "^2.2.1" |
113 | - } |
114 | + "license": "MIT" |
115 | } |
116 | diff --git a/usr/share/lfp/ocr/node_modules/node-tesseract-ocr/LICENSE b/usr/share/lfp/ocr/tesseract/LICENSE |
117 | similarity index 100% |
118 | rename from usr/share/lfp/ocr/node_modules/node-tesseract-ocr/LICENSE |
119 | rename to usr/share/lfp/ocr/tesseract/LICENSE |
120 | diff --git a/usr/share/lfp/ocr/node_modules/node-tesseract-ocr/package.json b/usr/share/lfp/ocr/tesseract/package.json |
121 | similarity index 100% |
122 | rename from usr/share/lfp/ocr/node_modules/node-tesseract-ocr/package.json |
123 | rename to usr/share/lfp/ocr/tesseract/package.json |
124 | diff --git a/usr/share/lfp/ocr/node_modules/node-tesseract-ocr/readme.md b/usr/share/lfp/ocr/tesseract/readme.md |
125 | similarity index 100% |
126 | rename from usr/share/lfp/ocr/node_modules/node-tesseract-ocr/readme.md |
127 | rename to usr/share/lfp/ocr/tesseract/readme.md |
128 | diff --git a/usr/share/lfp/ocr/node_modules/node-tesseract-ocr/src/index.d.ts b/usr/share/lfp/ocr/tesseract/src/index.d.ts |
129 | similarity index 100% |
130 | rename from usr/share/lfp/ocr/node_modules/node-tesseract-ocr/src/index.d.ts |
131 | rename to usr/share/lfp/ocr/tesseract/src/index.d.ts |
132 | diff --git a/usr/share/lfp/ocr/node_modules/node-tesseract-ocr/src/index.js b/usr/share/lfp/ocr/tesseract/src/index.js |
133 | similarity index 100% |
134 | rename from usr/share/lfp/ocr/node_modules/node-tesseract-ocr/src/index.js |
135 | rename to usr/share/lfp/ocr/tesseract/src/index.js |
136 | diff --git a/usr/share/lfp/ocr/yarn.lock b/usr/share/lfp/ocr/yarn.lock |
137 | index a2d073d..69f4a22 100644 |
138 | --- a/usr/share/lfp/ocr/yarn.lock |
139 | +++ b/usr/share/lfp/ocr/yarn.lock |
140 | @@ -4,5 +4,5 @@ |
141 | |
142 | node-tesseract-ocr@^2.2.1: |
143 | version "2.2.1" |
144 | - resolved "https://registry.yarnpkg.com/node-tesseract-ocr/-/node-tesseract-ocr-2.2.1.tgz#465fea1a1acd6720efb582d5f6c2bcbb82cce94d" |
145 | + resolved "https://registry.npmjs.org/node-tesseract-ocr/-/node-tesseract-ocr-2.2.1.tgz" |
146 | integrity sha512-Q9cD79JGpPNQBxbi1fV+OAsTxYKLpx22sagsxSyKbu1u+t6UarApf5m32uVc8a5QAP1Wk7fIPN0aJFGGEE9DyQ== |