mirror of
https://github.com/blakeblackshear/frigate.git
synced 2024-11-21 19:07:46 +01:00
Misc fixes (#14064)
* Add loading indicator when explore view is revalidating * Portal tooltip in object lifecycle pane * Better config file handling * Only manually set aspect ratio when using alert videos
This commit is contained in:
parent
775a3a1c22
commit
3688a3bc67
@ -325,6 +325,12 @@ class PtzAutoTracker:
|
|||||||
def _write_config(self, camera):
|
def _write_config(self, camera):
|
||||||
config_file = os.environ.get("CONFIG_FILE", f"{CONFIG_DIR}/config.yml")
|
config_file = os.environ.get("CONFIG_FILE", f"{CONFIG_DIR}/config.yml")
|
||||||
|
|
||||||
|
# Check if we can use .yaml instead of .yml
|
||||||
|
config_file_yaml = config_file.replace(".yml", ".yaml")
|
||||||
|
|
||||||
|
if os.path.isfile(config_file_yaml):
|
||||||
|
config_file = config_file_yaml
|
||||||
|
|
||||||
logger.debug(
|
logger.debug(
|
||||||
f"{camera}: Writing new config with autotracker motion coefficients: {self.config.cameras[camera].onvif.autotracking.movement_weights}"
|
f"{camera}: Writing new config with autotracker motion coefficients: {self.config.cameras[camera].onvif.autotracking.movement_weights}"
|
||||||
)
|
)
|
||||||
|
@ -198,12 +198,23 @@ def update_yaml_from_url(file_path, url):
|
|||||||
def update_yaml_file(file_path, key_path, new_value):
|
def update_yaml_file(file_path, key_path, new_value):
|
||||||
yaml = YAML()
|
yaml = YAML()
|
||||||
yaml.indent(mapping=2, sequence=4, offset=2)
|
yaml.indent(mapping=2, sequence=4, offset=2)
|
||||||
with open(file_path, "r") as f:
|
|
||||||
data = yaml.load(f)
|
try:
|
||||||
|
with open(file_path, "r") as f:
|
||||||
|
data = yaml.load(f)
|
||||||
|
except FileNotFoundError:
|
||||||
|
logger.error(
|
||||||
|
f"Unable to read from Frigate config file {file_path}. Make sure it exists and is readable."
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
data = update_yaml(data, key_path, new_value)
|
data = update_yaml(data, key_path, new_value)
|
||||||
with open(file_path, "w") as f:
|
|
||||||
yaml.dump(data, f)
|
try:
|
||||||
|
with open(file_path, "w") as f:
|
||||||
|
yaml.dump(data, f)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Unable to write to Frigate config file {file_path}: {e}")
|
||||||
|
|
||||||
|
|
||||||
def update_yaml(data, key_path, new_value):
|
def update_yaml(data, key_path, new_value):
|
||||||
|
@ -109,7 +109,7 @@ export function AnimatedEventCard({
|
|||||||
<div
|
<div
|
||||||
className="relative h-24 4k:h-32"
|
className="relative h-24 4k:h-32"
|
||||||
style={{
|
style={{
|
||||||
aspectRatio: aspectRatio,
|
aspectRatio: alertVideos ? aspectRatio : undefined,
|
||||||
}}
|
}}
|
||||||
onMouseEnter={isDesktop ? () => setIsHovered(true) : undefined}
|
onMouseEnter={isDesktop ? () => setIsHovered(true) : undefined}
|
||||||
onMouseLeave={isDesktop ? () => setIsHovered(false) : undefined}
|
onMouseLeave={isDesktop ? () => setIsHovered(false) : undefined}
|
||||||
|
@ -334,7 +334,9 @@ export default function ObjectLifecycle({
|
|||||||
/>
|
/>
|
||||||
</Button>
|
</Button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent>Adjust annotation settings</TooltipContent>
|
<TooltipPortal>
|
||||||
|
<TooltipContent>Adjust annotation settings</TooltipContent>
|
||||||
|
</TooltipPortal>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -35,7 +35,12 @@ export default function ExploreView({
|
|||||||
|
|
||||||
// data
|
// data
|
||||||
|
|
||||||
const { data: events, mutate } = useSWR<SearchResult[]>(
|
const {
|
||||||
|
data: events,
|
||||||
|
mutate,
|
||||||
|
isLoading,
|
||||||
|
isValidating,
|
||||||
|
} = useSWR<SearchResult[]>(
|
||||||
[
|
[
|
||||||
"events/explore",
|
"events/explore",
|
||||||
{
|
{
|
||||||
@ -81,7 +86,7 @@ export default function ExploreView({
|
|||||||
}
|
}
|
||||||
}, [events, searchDetail, setSearchDetail]);
|
}, [events, searchDetail, setSearchDetail]);
|
||||||
|
|
||||||
if (!events) {
|
if (isLoading) {
|
||||||
return (
|
return (
|
||||||
<ActivityIndicator className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" />
|
<ActivityIndicator className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" />
|
||||||
);
|
);
|
||||||
@ -93,6 +98,7 @@ export default function ExploreView({
|
|||||||
<ThumbnailRow
|
<ThumbnailRow
|
||||||
key={label}
|
key={label}
|
||||||
searchResults={filteredEvents}
|
searchResults={filteredEvents}
|
||||||
|
isValidating={isValidating}
|
||||||
objectType={label}
|
objectType={label}
|
||||||
setSearchDetail={setSearchDetail}
|
setSearchDetail={setSearchDetail}
|
||||||
/>
|
/>
|
||||||
@ -104,12 +110,14 @@ export default function ExploreView({
|
|||||||
type ThumbnailRowType = {
|
type ThumbnailRowType = {
|
||||||
objectType: string;
|
objectType: string;
|
||||||
searchResults?: SearchResult[];
|
searchResults?: SearchResult[];
|
||||||
|
isValidating: boolean;
|
||||||
setSearchDetail: (search: SearchResult | undefined) => void;
|
setSearchDetail: (search: SearchResult | undefined) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
function ThumbnailRow({
|
function ThumbnailRow({
|
||||||
objectType,
|
objectType,
|
||||||
searchResults,
|
searchResults,
|
||||||
|
isValidating,
|
||||||
setSearchDetail,
|
setSearchDetail,
|
||||||
}: ThumbnailRowType) {
|
}: ThumbnailRowType) {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
@ -123,7 +131,7 @@ function ThumbnailRow({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="rounded-lg bg-background_alt p-2 md:px-4">
|
<div className="rounded-lg bg-background_alt p-2 md:px-4">
|
||||||
<div className="text-lg capitalize">
|
<div className="flex flex-row items-center text-lg capitalize">
|
||||||
{objectType.replaceAll("_", " ")}
|
{objectType.replaceAll("_", " ")}
|
||||||
{searchResults && (
|
{searchResults && (
|
||||||
<span className="ml-3 text-sm text-secondary-foreground">
|
<span className="ml-3 text-sm text-secondary-foreground">
|
||||||
@ -135,6 +143,7 @@ function ThumbnailRow({
|
|||||||
tracked objects){" "}
|
tracked objects){" "}
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
|
{isValidating && <ActivityIndicator className="ml-2 size-4" />}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex flex-row items-center space-x-2 py-2">
|
<div className="flex flex-row items-center space-x-2 py-2">
|
||||||
{searchResults?.map((event) => (
|
{searchResults?.map((event) => (
|
||||||
|
Loading…
Reference in New Issue
Block a user