keshavdv / unifi-cam-proxy

Enable non-Ubiquiti cameras to work with Unifi NVR
MIT License
1.71k stars 237 forks source link

🔨 Refactored and consolidated project setup #284

Closed bdsoha closed 1 year ago

bdsoha commented 1 year ago

Related #276. Closes #287.

Removed Typing:

Combined:

Bumped actions:

Different version of Python were used (or defined) in various locations. Restructured to use Python 3.9 everywhere. This will also resolve the following issue with the pyunifiprotect package:

Traceback (most recent call last):
  File "/usr/local/bin/unifi-cam-proxy", line 5, in <module>
    from unifi.main import main
  File "/usr/local/lib/python3.8/site-packages/unifi/main.py", line 6, in <module>
    from pyunifiprotect import ProtectApiClient
  File "/usr/local/lib/python3.8/site-packages/pyunifiprotect/__init__.py", line 2, in <module>
    from pyunifiprotect.api import ProtectApiClient
  File "/usr/local/lib/python3.8/site-packages/pyunifiprotect/api.py", line 21, in <module>
    from pyunifiprotect.data import (
  File "/usr/local/lib/python3.8/site-packages/pyunifiprotect/data/__init__.py", line 1, in <module>
    from pyunifiprotect.data.base import (
  File "/usr/local/lib/python3.8/site-packages/pyunifiprotect/data/base.py", line 26, in <module>
    from pyunifiprotect.data.types import (
  File "/usr/local/lib/python3.8/site-packages/pyunifiprotect/data/types.py", line 32, in <module>
    class FixSizeOrderedDict(dict[KT, VT]):
TypeError: 'type' object is not subscriptable
Syco54645 commented 1 year ago

@bdsoha can you please resolve the conflicts in this pr? Not that I can merge it but should get the ball rolling.

Syco54645 commented 1 year ago

@keshavdv the repo is failing to build and this person is attempting to fix it. When you have a moment can you please review? For now the docker container in dockerhub remains broken.

Syco54645 commented 1 year ago

@bdsoha i do not think this will fully fix the issues. i forked your repo and have begun fixing the build issues but I am not sure how to handle the one that cargo is now throwing. you can see my changes here. https://github.com/Syco54645/unifi-cam-proxy/tree/newmaster

bdsoha commented 1 year ago

@Syco54645 You are still working off of the main branch (which does not include my changes). Make sure to fork the correct branch (bdsoha:feature/combine-setup).

Syco54645 commented 1 year ago

@bdsoha my bad, I thought I had. I will do that next time I feel ambitious.

bdsoha commented 1 year ago

@keshavdv There are issues related to formatting (flake8) that need to be resolved before merging this. However, IMO they should not be part of this PR.

If you merged this PR, I will create an new branch dedicated to fixing the formatting and linting issues.

bdsoha commented 1 year ago

@keshavdv Any change you can merge this PR so I can continue to contribute to the CI process?