Skip to content

Allow motion's %$ conversion specifier #3273

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.

Sign up for GitHub

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

Draft
MichaIng wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft

Allow motion's %$ conversion specifier #3273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0714856
Allow Motion's %$ Conversion Specifier
strawberry-poodle Feb 4, 2026
98f7513
i18n: update backend POT
MichaIng Mar 4, 2026
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
4 changes: 2 additions & 2 deletions motioneye/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,10 +876,10 @@ def motion_camera_ui_to_dict(ui, prev_config=None):
deviceNameFailMessage = _(
'Device names are only allowed to contain alphanumerical characters, hyphen -, underscore _, plus +, and space'
)
filenameValidRegExp = '^([A-Za-z0-9 ()/._-]|%[CYmdHMSqv])+$'
filenameValidRegExp = '^([A-Za-z0-9 ()/._-]|%[CYmdHMSqv$])+$'
filenameFailMessage = _(
'File names are only allowed to contain alphanumerical characters, parenthesis (), forward slash /, dot ., '
'underscore _, hyphen -, space, and a subset of motion conversion specifiers: %C %Y %m %d %H %M %S %q %v'
'underscore _, hyphen -, space, and a subset of motion conversion specifiers: %C %Y %m %d %H %M %S %q %v %$'
)
dirnameValidRegExp = '^[A-Za-z0-9 ()/._-]+$'
dirnameFailMessage = _(
Expand Down
2 changes: 1 addition & 1 deletion motioneye/locale/motioneye.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgid "Device names are only allowed to contain alphanumerical characters, hyphe
msgstr ""

#: motioneye/config.py:881
msgid "File names are only allowed to contain alphanumerical characters, parenthesis (), forward slash /, dot ., underscore _, hyphen -, space, and a subset of motion conversion specifiers: %C %Y %m %d %H %M %S %q %v"
msgid "File names are only allowed to contain alphanumerical characters, parenthesis (), forward slash /, dot ., underscore _, hyphen -, space, and a subset of motion conversion specifiers: %C %Y %m %d %H %M %S %q %v %$"
msgstr ""

#: motioneye/config.py:886
Expand Down
2 changes: 1 addition & 1 deletion motioneye/static/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var signatureRegExp = new RegExp('[^A-Za-z0-9/?_.=&{}\\[\\]":, -]', 'g');
// regex definitions for input sanity checks in frontend
// they must match the ones in motioneye/config.py
var deviceNameValidRegExp = new RegExp('^[A-Za-z0-9\-\_\+\ ]+$');
var filenameValidRegExp = new RegExp('^([A-Za-z0-9 \(\)/._-]|%[CYmdHMSqv])+$');
var filenameValidRegExp = new RegExp('^([A-Za-z0-9 \(\)/._-]|%[CYmdHMSqv$])+$');
var dirnameValidRegExp = new RegExp('^[A-Za-z0-9 \(\)/._-]+$');
var emailValidRegExp = new RegExp('^[A-Za-z0-9 _+.@^~<>,-]+$');
var webHookUrlValidRegExp = new RegExp('^[^;\']+$');
Expand Down
Loading