search

Motion-Project / motionplus

MotionPlus Home Page: https://motion-project.github.io/
GNU General Public License v3.0
293 stars 38 forks source link

added webcontrol_base_path config file parameter #16

Closed extorn closed 2 years ago

extorn commented 2 years ago

This permits the project to run from a subfolder of a domain if specified, otherwise, it will run from the root as normal.

Note: I discovered during this change that you are re-using the "cam-id" field to pass the resource requested by the website - this is quite confusing as there is no comment to warn me. It'd be clearer by keeping it named as "resource-id" and then putting that into a cam-id field or filename field as appropriate. What caught me out was the test if cam-id == "config.json". Maybe it's obvious is a GUI but I was using vim for each file.

extorn commented 2 years ago

Hopefully these two commits make this now acceptable (push the code commit that was missed and add documentation entry). Please do double check everything works as you expect. I am sure I have only a superficial understanding of your app.

Mr-Dave commented 2 years ago

yea.....so I'm not sure I would have gone down the path you took for the last commits. The default of having a slash instead of an empty string cascades to cause numerous other problems. Also, the config.json being served without a camid is something associated with the legacy Motion code. Motion permits having the port specify the camera and in order to maintain legacy functionality, it had to process the url without a camera id.

Edit: I will be doing a squash merge so it will only have the last version and not the intermediate commits.

Mr-Dave commented 2 years ago

I'd like to close this so that the waiting revisions can be implemented. You can either rebase and go back to the revision with a blank or I can implement and attribute to you.

Mr-Dave commented 2 years ago

I am seeing some other revisions are required. I will fix and push a commit and attribute to you.