Skip to content
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

Yet another Python3 wip #2258

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5cfda15
Remove buffering policy argument from open() function call.
Mictronics Dec 20, 2021
21e7c02
Use bytes object and convert bytes to string. Handle python3 non-bloc…
Mictronics Dec 20, 2021
bd3c5d6
Use motion v4.4.0 configuration parameter names.
Mictronics Dec 20, 2021
abe3e5a
Use python3.
Mictronics Dec 20, 2021
8e0952f
Convert bytes output to string.
Mictronics Dec 20, 2021
c58ce85
Fix connection to stream with motion v4.4.0.
Mictronics Dec 20, 2021
baf5af8
Set python3 environment.
Mictronics Dec 20, 2021
2559414
Add test environment.
Mictronics Dec 20, 2021
f852a65
Add example configuration files.
Mictronics Dec 20, 2021
eb50409
Popen does not respect bufsize and spams log.
Mictronics Dec 20, 2021
57923ac
Fix removal of camera entry when camera is removed.
Mictronics Dec 20, 2021
7a30a61
Supress camera not found error when motion detection is disabled.
Mictronics Dec 20, 2021
1b26b67
MMAL camera access working.
Mictronics Dec 20, 2021
e588a5c
Use floor division operator.
Mictronics Dec 20, 2021
13b64c0
Fix SMPT parameter fields in GUI.
Mictronics Dec 20, 2021
f600b7c
Make python3 compatible.
Mictronics Dec 20, 2021
5598a8d
Remove logging.
Mictronics Dec 20, 2021
4eaf653
Add tornado v6.1 support.
Mictronics Dec 27, 2021
c921c2f
Add second test environment.
Mictronics Dec 27, 2021
26638da
Revert 13b64c0
Mictronics Dec 27, 2021
8e8de40
Set motion listening port to what is default in motion-dist.conf
Mictronics Dec 27, 2021
b995cea
Fix 'finish called twice' exception.
Mictronics Dec 28, 2021
b7c8e4c
Fix encoding prior hashing.
Mictronics Dec 28, 2021
d8c46b5
Catch empty variable.
Mictronics Dec 28, 2021
8080aa5
Fix another 'finish called twice' exception.
Mictronics Dec 28, 2021
2d4da05
Use gui defined upload location instead of local media folder.
Mictronics Dec 28, 2021
4231822
Fix read image file in binary mode.
Mictronics Dec 28, 2021
76c70d2
Fix SFTP upload. File size was 0.
Mictronics Dec 28, 2021
f5fba42
Fix thumbnails in media list.
Mictronics Dec 28, 2021
c94863d
Create timelapse movies using specified codec instead of forcing avi.…
Mictronics Dec 29, 2021
ddc2435
Reduce the Google Drive scope to drive.file
Mictronics Dec 29, 2021
f91d73c
Ignore Spyder project folder.
Mictronics Dec 30, 2021
22ef65e
Fix movie playback for local camera.
Mictronics Dec 30, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ run
dist
motioneye.egg-info
dropbox.keys
.venv
.venv
.spyproject
15 changes: 15 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,18 @@ You can support the development of motionEye by making a small donation.
:alt: [paypal]
:target: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=ccrisan%40gmail%2ecom&lc=US&item_name=motionEye&no_note=0&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHostedGuest

Test environment 1:

* Raspberry Pi 3+ with Raspberry v2.1 camera
* Debian bullseye 32bit (DietPi v7.9.3 distribution)
* motion v4.4.0 bullseye armhf release
* Python v3.9.2 (with pip3, tornado v6.1, jinja2, pillow, pycurl, six)
* Pi camera setup as v4l2 or MMAL in motioneye

Test environment 2:

* x86 PC with USB web cam
* Linux Mint 20.2 Uma (Ubuntu 20.04 focal)
* motion v4.4.0 focal amd64 release
* Python v3.9.7 (with pip3, tornado v6.1, jinja2, pillow, pycurl, six)
* USB camera setup as v4l2 device in motioneye
84 changes: 84 additions & 0 deletions extra/camera-1.conf.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# @enabled on
# @id 1
# @storage_device custom-path
# @network_server
# @network_share_name
# @network_smb_ver 1.0
# @network_username
# @network_password
# @upload_enabled off
# @upload_picture on
# @upload_movie on
# @upload_service ftp
# @upload_server
# @upload_port
# @upload_method post
# @upload_location
# @upload_subfolders on
# @upload_username
# @upload_password
# @clean_cloud_enabled off
# @webcam_resolution 100
# @webcam_server_resize off
# @motion_detection off
# @preserve_pictures 0
# @manual_snapshots on
# @preserve_movies 0
# @manual_record off
# @working_schedule
# @working_schedule_type outside


width 1280
height 720
video_device /dev/video0
camera_name Camera1
video_params auto_exposure=0,auto_exposure_bias=12,blue_balance=1000,brightness=50,color_effects=0,color_effects_cbcr=32896,compression_quality=30,contrast=0,exposure_metering_mode=0,exposure_time_absolute=1000,h264_i_frame_period=60,h264_level=11,h264_profile=4,iso_sensitivity=0,iso_sensitivity_auto=1,power_line_frequency=1,red_balance=1000,rotate=0,saturation=0,scene_mode=0,sharpness=0,video_bitrate=10000000,video_bitrate_mode=0,white_balance_auto_preset=1
auto_brightness off
framerate 5
rotate 0
target_dir /var/lib/motioneye/Camera1
stream_localhost off
stream_port 8081
stream_maxrate 10
stream_quality 85
stream_motion off
stream_auth_method 0
text_left Camera1
text_right %Y-%m-%d\n%T
text_scale 1
text_changes off
locate_motion_mode off
locate_motion_style redbox
threshold 28800
threshold_maximum 0
threshold_tune off
noise_tune on
noise_level 31
lightswitch_percent 0
despeckle_filter
minimum_motion_frames 20
smart_mask_speed 0
mask_file
movie_output_motion off
picture_output_motion off
pre_capture 1
post_capture 1
picture_output off
picture_filename
emulate_motion off
event_gap 30
snapshot_interval 0
snapshot_filename
picture_quality 85
movie_filename %Y-%m-%d/%H-%M-%S
movie_max_time 0
movie_output off
movie_passthrough off
movie_codec mp4
movie_quality 75
on_event_start /home/dietpi/motioneye/motioneye/scripts/relayevent.sh "" start %t
on_event_end /home/dietpi/motioneye/motioneye/scripts/relayevent.sh "" stop %t
on_movie_end /home/dietpi/motioneye/motioneye/scripts/relayevent.sh "" movie_end %t %f
on_picture_save /home/dietpi/motioneye/motioneye/scripts/relayevent.sh "" picture_save %t %f
stream_authentication user:user
Loading