diff --git a/README.md b/README.md index c011348..2e3fb96 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,9 @@ Please consider sponsoring me if you enjoy the results of my work, code or docum ## UPDATES +**2025/03/02** @1.0.2: +* adjusted js import paths + **2025/03/01** @1.0.1: * pywinctl for monitor capture diff --git a/core/node_monitor.py b/core/node_monitor.py index 4a8cc14..eb09917 100644 --- a/core/node_monitor.py +++ b/core/node_monitor.py @@ -75,9 +75,13 @@ Capture frames from a desktop monitor. Supports batch processing, allowing multi d = super().INPUT_TYPES() return deep_merge({ "optional": { - "MONITOR": (cls.MONITOR, {"default": cls.MONITOR[0], "choice": "list of system monitor devices", "tooltip": "list of system monitor devices"}), - "XY": ("VEC2INT", {"default": (0, 0), "mij": 0, "label": ["TOP", "LEFT"], "tooltip": "Top, Left position"}), - "WH": ("VEC2INT", {"default": (0, 0), "mij": 0, "label": ["WIDTH", "HEIGHT"], "tooltip": "Width and Height"}) + "MONITOR": (cls.MONITOR, {"default": cls.MONITOR[0], + "choice": "list of system monitor devices", + "tooltip": "list of system monitor devices"}), + "XY": ("VEC2INT", {"default": (0, 0), "mij": 0, "label": ["TOP", "LEFT"], + "tooltip": "Top, Left position"}), + "WH": ("VEC2INT", {"default": (0, 0), "mij": 0, "label": ["WIDTH", "HEIGHT"], + "tooltip": "Width and Height"}) } }, d) diff --git a/core/node_remote.py b/core/node_remote.py index 813abc1..52e0f12 100644 --- a/core/node_remote.py +++ b/core/node_remote.py @@ -36,12 +36,14 @@ Capture frames from a URL. Supports batch processing, allowing multiple frames t return deep_merge({ "optional": { - "URL": ("STRING", {"default": "", "dynamicPrompts": False}) + "URL": ("STRING", {"default": "", "dynamicPrompts": False, + "tooltip":"A remote URL to stream"}) } }, d) def run(self, **kw) -> RGBAMaskType: # need to see if we have a device... + # http://63.142.190.238:6106/mjpg/video.mjpg if self.device is None: self.device = MediaStreamBase() diff --git a/core/node_webcam.py b/core/node_webcam.py index ed07bc7..42c90ad 100644 --- a/core/node_webcam.py +++ b/core/node_webcam.py @@ -132,10 +132,14 @@ Capture frames from a web camera. Supports batch processing, allowing multiple f return deep_merge({ "optional": { - "CAMERA": (cls.CAMERAS, {"default": cls.CAMERAS[0], "tooltip": "The camera from the auto-scanned list"}), - "ZOOM": ("INT", {"default": 0, "min": 0, "max": 100, "step": 1, "tooltip": "Camera zoom"}), - "FOCUS": ("INT", {"default": 0, "min": 0, "max": 100, "step": 1, "tooltip": "Camera focus"}), - "EXPOSURE": ("INT", {"default": 50, "min": 0, "max": 100, "step": 1, "tooltip": "Camera exposure"}) + "CAMERA": (cls.CAMERAS, {"default": cls.CAMERAS[0], + "tooltip": "The camera from the auto-scanned list"}), + "ZOOM": ("INT", {"default": 0, "min": 0, "max": 100, "step": 1, + "tooltip": "Camera zoom"}), + "FOCUS": ("INT", {"default": 0, "min": 0, "max": 100, "step": 1, + "tooltip": "Camera focus"}), + "EXPOSURE": ("INT", {"default": 50, "min": 0, "max": 100, "step": 1, + "tooltip": "Camera exposure"}) } }, d) diff --git a/core/node_window.py b/core/node_window.py index 797d0af..94fa459 100644 --- a/core/node_window.py +++ b/core/node_window.py @@ -277,9 +277,12 @@ Capture frames from a dekstop window. Supports batch processing, allowing multip return deep_merge({ "optional": { "WINDOW": (keys, {"default": default, "tooltip": "Window to capture"}), - "XY": ("VEC2INT", {"default": (0, 0), "mij": 0, "label": ["TOP", "LEFT"], "tooltip": "Top, Left position"}), - "WH": ("VEC2INT", {"default": (0, 0), "mij": 0, "label": ["WIDTH", "HEIGHT"], "tooltip": "Width and Height"}), - "CLIENT": ("BOOLEAN", {"default": False, "tooltip": "Only capture the client area -- no scrollbars or menus"}), + "XY": ("VEC2INT", {"default": (0, 0), "mij": 0, "label": ["TOP", "LEFT"], + "tooltip": "Top, Left position"}), + "WH": ("VEC2INT", {"default": (0, 0), "mij": 0, "label": ["WIDTH", "HEIGHT"], + "tooltip": "Width and Height"}), + "CLIENT": ("BOOLEAN", {"default": False, + "tooltip": "Only capture the client area -- no scrollbars or menus"}), } }, d) diff --git a/pyproject.toml b/pyproject.toml index 20568a9..ebbb827 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "jovi_capture" description = "Capture Webcamera and URL media streams as ComfyUI images" -version = "1.0.1" +version = "1.0.2" license = { file = "LICENSE" } readme = "README.md" authors = [{ name = "Alexander G. Morano", email = "amorano@gmail.com" }] diff --git a/web/node_webcam.js b/web/node_webcam.js index 8be0c31..36a168a 100644 --- a/web/node_webcam.js +++ b/web/node_webcam.js @@ -3,7 +3,7 @@ * Project: jov_capture */ -import { app } from "../../../scripts/app.js"; +import { app } from "../../scripts/app.js"; import { api_get } from './util_jov.js' const _id = "CAMERA (JOV_CAPTURE)"; diff --git a/web/node_window.js b/web/node_window.js index 2fabf6c..99a8598 100644 --- a/web/node_window.js +++ b/web/node_window.js @@ -3,7 +3,7 @@ * Project: jov_capture */ -import { app } from "../../../scripts/app.js"; +import { app } from "../../scripts/app.js"; import { api_get } from './util_jov.js' const _id = "WINDOW (JOV_CAPTURE)"; diff --git a/web/widget_vector.js b/web/widget_vector.js index 8eaf8b6..58b89d1 100644 --- a/web/widget_vector.js +++ b/web/widget_vector.js @@ -3,8 +3,8 @@ */ -import { app } from "../../../scripts/app.js" -import { $el } from "../../../scripts/ui.js" +import { app } from "../../scripts/app.js" +import { $el } from "../../scripts/ui.js" import { widgetToInput, widgetToWidget, domInnerValueChange } from './util_jov.js' /** @import { IWidget, LGraphCanvas } from '../../types/litegraph/litegraph.d.ts' */