yizhi-js-lib/opencv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

下载时增加版本判断

Browse Source
This commit is contained in:
yizhi
2025-03-17 16:12:49 +08:00
parent b86366e244
commit f7d8926443
5 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -37,6 +37,19 @@ if(CMAKE_JS_RESULT EQUAL 0)
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
endif() endif()
# ReleaseVersion
if(CMAKE_JS_RESULT EQUAL 0)
execute_process(
COMMAND node ${CMAKE_SOURCE_DIR}/thirdpart/cmake-js-util.js --release
RESULT_VARIABLE CMAKE_JS_RESULT
OUTPUT_VARIABLE RELEASE_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(CMAKE_JS_RESULT EQUAL 0)
message(STATUS "RELEASE_VERSION: ${RELEASE_VERSION}")
add_compile_definitions(RELEASE_VERSION="${RELEASE_VERSION}")
endif()
endif()
# NAPI # NAPI
if(CMAKE_JS_RESULT EQUAL 0) if(CMAKE_JS_RESULT EQUAL 0)

4
cxx/node.cc
View File

@ -4,6 +4,10 @@
static Napi::Object Init(Napi::Env env, Napi::Object exports) static Napi::Object Init(Napi::Env env, Napi::Object exports)
{ {
#ifdef RELEASE_VERSION
exports.Set("__release__", Napi::String::New(env, RELEASE_VERSION));
#endif
InitMatAPI(env, exports); InitMatAPI(env, exports);
InitVideoCaptureAPI(env, exports); InitVideoCaptureAPI(env, exports);
InitUtilAPI(env, exports); InitUtilAPI(env, exports);

15
src/cv/download.ts
View File

@ -3,13 +3,17 @@ import fs from "fs";
import path from "path"; import path from "path";
import { C } from "./common"; import { C } from "./common";
const URLS = { const URLS = {
GITHUB: `https://github.com/kangkang520/node-addons/releases/download/cv{{version}}/cv_{{platform}}_{{arch}}.node`, GITHUB: `https://github.com/kangkang520/node-addons/releases/download/cv{{version}}/cv_{{platform}}_{{arch}}.node`,
URNAS: `http://git.urnas.cn:5200/yizhi-js-lib/opencv/releases/download/{{version}}/cv_{{platform}}_{{arch}}.node`, URNAS: `http://git.urnas.cn:5200/yizhi-js-lib/opencv/releases/download/{{version}}/cv_{{platform}}_{{arch}}.node`,
} }
function releaseVersion() { return require("../../package.json").releaseVersion }
function getURL(template: string) { function getURL(template: string) {
const version = require("../../package.json").releaseVersion;
let platform = ""; let platform = "";
let arch = ""; let arch = "";
switch (os.platform()) { switch (os.platform()) {
@ -30,7 +34,7 @@ function getURL(template: string) {
throw new Error(`Unsupported architecture: ${os.arch()}, Please compile the addon yourself.`); throw new Error(`Unsupported architecture: ${os.arch()}, Please compile the addon yourself.`);
} }
return template.replaceAll("{{version}}", version).replaceAll("{{platform}}", platform).replaceAll("{{arch}}", arch); return template.replaceAll("{{version}}", releaseVersion()).replaceAll("{{platform}}", platform).replaceAll("{{arch}}", arch);
} }
async function getStream() { async function getStream() {
@ -48,7 +52,12 @@ async function getStream() {
export async function downloadAddon(savename?: string) { export async function downloadAddon(savename?: string) {
const defaultAddon = path.resolve(process.cwd(), C("ADDON_PATH")); const defaultAddon = path.resolve(process.cwd(), C("ADDON_PATH"));
const saveName = savename ? path.resolve(path.dirname(defaultAddon), savename) : defaultAddon; const saveName = savename ? path.resolve(path.dirname(defaultAddon), savename) : defaultAddon;
if (fs.existsSync(saveName)) return saveName; if (fs.existsSync(saveName)) {
try {
const addon = require(saveName);
if (addon.__release__ === releaseVersion()) return saveName;
} catch (err) { }
}
await fs.promises.mkdir(path.dirname(saveName), { recursive: true }); await fs.promises.mkdir(path.dirname(saveName), { recursive: true });

3
src/test.ts
View File

@ -33,8 +33,9 @@ async function testImage() {
} }
async function testMovie() { async function testMovie() {
await cv.downloadAddon();
const cap = new cv.VideoCapture("test_data/movie.mp4"); const cap = new cv.VideoCapture("test_data/movie.mp4");
if(cap.grab()){ if (cap.grab()) {
const im = cap.retrieve(); const im = cap.retrieve();
debugger; debugger;
} }

3
thirdpart/cmake-js-util.js
View File

@ -15,4 +15,5 @@ function runCmakeJS(args) {
if (args.includes("--include")) runCmakeJS(["print-cmakejs-include"]); if (args.includes("--include")) runCmakeJS(["print-cmakejs-include"]);
else if (args.includes("--src")) runCmakeJS(["print-cmakejs-src"]); else if (args.includes("--src")) runCmakeJS(["print-cmakejs-src"]);
else if (args.includes("--lib")) runCmakeJS(["print-cmakejs-lib"]); else if (args.includes("--lib")) runCmakeJS(["print-cmakejs-lib"]);
else if (args.includes("--napi")) console.log(require("node-addon-api").include.replace(/^"/, "").replace(/"$/, "")); else if (args.includes("--napi")) console.log(require("node-addon-api").include.replace(/^"/, "").replace(/"$/, ""));
else if (args.includes("--release")) console.log(require("../package.json").releaseVersion);