Minor cleanups and some new example programs. #67

phbcanada · 2023-02-14T18:23:03Z

The threaded streaming example program wasn't working so I fixed it.
The new "set_ftp" example is useful for me since I use FTP to record all my camera motion videos.
The "snap" example is useful for grabbing snapshots from each camera.
I use hostnames instead of IP addresses for my cameras. Just put the IP addresses in /etc/hosts.

Loosen restrictions.

Improvements to share common code. Fix threaded version to open window in main thread.

Forgot to commit with previous. New method: stop_stream.

New camera method: is_logged_in

New example program to set ftp parameters.

get_info calls all the info methods. snap will snap a single frame image.

Getting occasional garbage back from the cameras which causes the json conversion to crap out. Print some info when this happens.

Benehiko

Hey @phbcanada

Thank you for the contribution! This looks quite good and we should easily be able to merge it :)

Just one question about the version specifier inside the setup.py file.

Benehiko · 2023-02-26T09:56:58Z

setup.py

+        'numpy>=1.19.4',
+        'opencv-python>=4.4.0.46',
+        'Pillow>=8.0.1',
    ],


I'm not sure I agree with the inclusive ordered comparison >=. Minor versions could introduce breaking changes at some point. I would rather stick with a specific version and in this case update the specific version manually to a later release.

https://peps.python.org/pep-0440/#version-specifiers

The install failed on one of my systems so this was the easy fix. Not a big issue for me.

Benehiko · 2023-02-26T10:06:57Z

Could we also use conventional commits on the PR title?

I know this repository doesn't have any real guidelines on this and in the past it's been quite lax, but I think it is good practice.

you can change the title to something like fix: minor cleanups and new examples.

https://www.conventionalcommits.org/en/v1.0.0/#summary

phbcanada · 2023-02-26T14:17:53Z

I haven't used git/github for several years. Not really up on current conventions. Sorry.

Benehiko · 2023-02-26T14:18:46Z

I haven't used git/github for several years. Not really up on current conventions. Sorry.

np :)

The GetAbility command returns a property named "scheduleVersion" which indicates which API calls should be used. The new ones have a "V20" tacked onto the command name.

tinito · 2023-10-11T17:19:38Z

Any chances to get this merged? The set_network_ftp() method would be really helpful.

themoosman · 2023-10-11T17:21:23Z

Any chances to get this merged? The set_network_ftp() method would be really helpful.

There looks to be a simple requested change that still needs to be done.

Improve set_osd call. Extend FTP setting support. Add set_network_ntp Add set_network_email Fixes to add_user and modify_user.

GetAlarm is not supported on newer cameras.

Correct call is "SetEnc" not "SetRec". Argument types changed.

Benehiko

Looks good, just some minor changes. The setup.py is a bit concerning, IMO it needs to be fixed versions.

Benehiko · 2023-10-16T06:46:58Z

reolinkapi/mixins/display.py

+        body = [{"cmd": "SetOsd", # "action": 1,
                 "param": {
                    "Osd": {
-                        "bgcolor": bg_color,
+                        # "bgcolor": bg_color,


why are these commented out?

Benehiko · 2023-10-16T06:47:13Z

reolinkapi/mixins/display.py

                    }}}]
+        # print("SetOsd:", json.dumps(body[0], indent=4))


maybe just delete?

Benehiko · 2023-10-16T06:47:25Z

reolinkapi/mixins/network.py

@@ -25,9 +25,127 @@ def set_net_port(self, http_port: float = 80, https_port: float = 443, media_por
            "rtspPort": rtsp_port
        }}}]
        self._execute_command('SetNetPort', body, multi=True)
-        print("Successfully Set Network Ports")
+        # print("Successfully Set Network Ports")


Suggested change

# print("Successfully Set Network Ports")

print("Successfully Set Network Ports")

Benehiko · 2023-10-16T06:48:26Z

reolinkapi/mixins/user.py

        r_data = self._execute_command('ModifyUser', body)[0]
-        if r_data["value"]["rspCode"] == 200:
+        # print(f"modify user: {username}\nCamera responded with: {json.dumps(r_data, indent=4)}")


Suggested change

# print(f"modify user: {username}\nCamera responded with: {json.dumps(r_data, indent=4)}")

Benehiko · 2023-10-16T06:50:09Z

reolinkapi/handlers/api_handler.py

            body = [{"cmd": "Login", "action": 0,
                     "param": {"User": {"userName": self.username, "password": self.password}}}]
            param = {"cmd": "Login", "token": "null"}
            response = Request.post(self.url, data=body, params=param)
            if response is not None:
+                # print("LOGIN GOT: ", response.text)


Suggested change

# print("LOGIN GOT: ", response.text)

Benehiko · 2023-10-16T06:54:15Z

reolinkapi/handlers/api_handler.py

@@ -64,28 +68,47 @@ def login(self) -> bool:
        :return: bool
        """
        try:
+            # Suppress only the single warning from urllib3 needed.
+            requests.packages.urllib3.disable_warnings(category=InsecureRequestWarning)


maybe make this optional?

or what about just leaving this to the client to set this as an env variable

PYTHONWARNINGS="ignore:Unverified HTTPS request"

Benehiko · 2023-10-16T06:56:20Z

reolinkapi/handlers/api_handler.py

+                    # print("Login success")
+                else:
+                    # print(self.token)


remove the comments or restore the print of "Login success?"

phbcanada added 7 commits February 14, 2023 12:10

Update setup.py

f003a0d

Loosen restrictions.

Update streaming_video.py

eb8add1

Improvements to share common code. Fix threaded version to open window in main thread.

Update stream.py

ee7dde6

Forgot to commit with previous. New method: stop_stream.

Add check for login failure.

da83de9

New camera method: is_logged_in

New api method "set_network_ftp"

ea70bc7

New example program to set ftp parameters.

Two new example programs

f2a01d5

get_info calls all the info methods. snap will snap a single frame image.

Update api_handler.py

e61718a

Getting occasional garbage back from the cameras which causes the json conversion to crap out. Print some info when this happens.

Benehiko requested changes Feb 26, 2023

View reviewed changes

phbcanada added 2 commits March 5, 2023 18:04

Add support for newer API version on some cameras.

1f62a24

The GetAbility command returns a property named "scheduleVersion" which indicates which API calls should be used. The new ones have a "V20" tacked onto the command name.

Merge branch 'master' of github.com:phbcanada/reolinkapipy

f755409

phbcanada added 3 commits October 11, 2023 17:54

Add some support for V2 API. Misc fixes and additions.

247a19c

Improve set_osd call. Extend FTP setting support. Add set_network_ntp Add set_network_email Fixes to add_user and modify_user.

Correct call is actually GetMdAlarm

e3c913c

GetAlarm is not supported on newer cameras.

Fixes to set_recording_encoding

0e7b321

Correct call is "SetEnc" not "SetRec". Argument types changed.

Benehiko requested changes Oct 16, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Minor cleanups and some new example programs. #67

Minor cleanups and some new example programs. #67

phbcanada commented Feb 14, 2023

Benehiko left a comment

Benehiko Feb 26, 2023

phbcanada Feb 26, 2023

Benehiko commented Feb 26, 2023

phbcanada commented Feb 26, 2023

Benehiko commented Feb 26, 2023

tinito commented Oct 11, 2023

themoosman commented Oct 11, 2023

Benehiko left a comment

Benehiko Oct 16, 2023

Benehiko Oct 16, 2023

Benehiko Oct 16, 2023

Benehiko Oct 16, 2023

Benehiko Oct 16, 2023

Benehiko Oct 16, 2023

Benehiko Oct 16, 2023

	# print("Successfully Set Network Ports")
	print("Successfully Set Network Ports")

Minor cleanups and some new example programs. #67

Are you sure you want to change the base?

Minor cleanups and some new example programs. #67

Conversation

phbcanada commented Feb 14, 2023

Benehiko left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Benehiko commented Feb 26, 2023

phbcanada commented Feb 26, 2023

Benehiko commented Feb 26, 2023

tinito commented Oct 11, 2023

themoosman commented Oct 11, 2023

Benehiko left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment