mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-09-13 04:23:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-priv/master

Browse Source 
# Conflicts:
#	system/fleetmanager/fleet_manager.py
#	system/fleetmanager/helpers.py
This commit is contained in:
Jason Wen
2023-09-23 00:36:44 -04:00
parent d20dbdf12b da58d5114b
commit 64e38459d0
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/fleetmanager/fleet_manager.py
+6 -6
View File
@@ -5,10 +5,10 @@ import secrets
import threading
import time
from flask import Flask, render_template, Response, request, send_from_directory, session, redirect, url_for
from common.realtime import set_core_affinity
from system.swaglog import cloudlog
import system.fleetmanager.helpers as fleet
from system.loggerd.config import ROOT as REALDATA
from openpilot.common.realtime import set_core_affinity
import openpilot.system.fleetmanager.helpers as fleet
from openpilot.system.hardware.hw import Paths
from openpilot.system.swaglog import cloudlog
app = Flask(__name__)
@@ -43,7 +43,7 @@ def login():
def full(cameratype, route):
chunk_size = 1024 * 512 # 5KiB
file_name = cameratype + (".ts" if cameratype == "qcamera" else ".hevc")
vidlist = "|".join(REALDATA + "/" + segment + "/" + file_name for segment in fleet.segments_in_route(route))
vidlist = "|".join(Paths.log_root() + "/" + segment + "/" + file_name for segment in fleet.segments_in_route(route))
def generate_buffered_stream():
with fleet.ffmpeg_mp4_concat_wrap_process_builder(vidlist, cameratype, chunk_size) as process:
@@ -57,7 +57,7 @@ def full(cameratype, route):
def fcamera(cameratype, segment):
if not fleet.is_valid_segment(segment):
return render_template("error.html", error="invalid segment")
file_name = REALDATA + "/" + segment + "/" + cameratype + (".ts" if cameratype == "qcamera" else ".hevc")
file_name = Paths.log_root() + "/" + segment + "/" + cameratype + (".ts" if cameratype == "qcamera" else ".hevc")
return Response(fleet.ffmpeg_mp4_wrap_process_builder(file_name).stdout.read(), status=200, mimetype='video/mp4')
system/fleetmanager/helpers.py
+7 -7
View File
@@ -3,10 +3,10 @@ import subprocess
from flask import render_template, request, session
from functools import wraps
from pathlib import Path
from common.params import Params
from system.hardware import PC
from system.loggerd.config import ROOT as REALDATA
from system.loggerd.uploader import listdir_by_creation
from openpilot.common.params import Params
from openpilot.system.hardware import PC
from openpilot.system.hardware.hw import Paths
from openpilot.system.loggerd.uploader import listdir_by_creation
from tools.lib.route import SegmentName
@@ -37,7 +37,7 @@ def list_files(path):
def is_valid_segment(segment):
try:
segment_to_segment_name(REALDATA, segment)
segment_to_segment_name(Paths.log_root(), segment)
return True
except AssertionError:
return False
@@ -50,9 +50,9 @@ def segment_to_segment_name(data_dir, segment):
def all_segment_names():
segments = []
for segment in listdir_by_creation(REALDATA):
for segment in listdir_by_creation(Paths.log_root()):
try:
segments.append(segment_to_segment_name(REALDATA, segment))
segments.append(segment_to_segment_name(Paths.log_root(), segment))
except AssertionError:
pass
return segments