-
Notifications
You must be signed in to change notification settings - Fork 662
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
PR #2258 with conflicts conservatively resolved #2318
Conversation
About the motion settings: I think we need to support both variants, based on the motion version, i.e. the old names for motion <=4.3 and the new variants for motion >=4.4. Is there a good way to check for the motion version? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
RSLGMT
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
RSLGTM
I reverted the motion config key changes. We should do this properly in a dedicated PR where we handle support for both versions. With the old/current keys we support motion up to v4.3, hence all versions shipped by distros, while we do not support latest upstream v4.4. The other changes are however pretty fine. Compared to #2258 I did some minor change to @cclauss |
I found the original PRs of two of the major changes here: #2152 and #2110. I'd prefer to merge those (done with one already). The remaining change here is the added sample motion configs, but I wonder what the benefit of them is, since motionEye creates default motion configs internally, and this hence would require doubled code changes, and hardcodes the configs for specific motion versions. |
See: https://motion-project.github.io/motion_config.html Signed-off-by: MichaIng <micha@dietpi.com>
and use a more generic motionEye scripts path, which matches the one of the current release, when installing as root. We should try to keep this valid and generally changes to install/setup steps low. Signed-off-by: MichaIng <micha@dietpi.com>
Marking this as closed in favour if the original PRs. Whether or not default motion configs are wanted, should be discussed in a separate issue/PR. |
@Mictronics
I rebased your PR and resolved conflicts in a way to prefer the changes that have been done to dev. There isn't much left anymore. I know you did some other changes not directly related to Python 3. Could you have a look and maybe re-add them here? Things I found interesting:
/%(camera_id)/stream
for getting the IP camera stream, which is at least something which seems required formjpg-streamer
, but not sure whether/how it was intended to work before.videodevice
tovideo_device
motion.conf setting... Ah now I see this is indeed correct for recent motion versions, so we should re-add this change: https://motion-project.github.io/motion_config.htmlEDIT: Done!
Please see whether there were other important changes you want to have re-added.