From 2ea151be3c6c642309cd9192d333c2cef9f4562f Mon Sep 17 00:00:00 2001 From: grekiki Date: Fri, 1 Oct 2021 08:32:41 -0700 Subject: [PATCH] C++ replay cache folder path / fix (#22396) old-commit-hash: 4c7acf680cc29537ad73a51f8ce32253306cac15 --- selfdrive/ui/replay/route.cc | 5 ++--- selfdrive/ui/replay/route.h | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/selfdrive/ui/replay/route.cc b/selfdrive/ui/replay/route.cc index fe2f29c636..f1dbddf40d 100644 --- a/selfdrive/ui/replay/route.cc +++ b/selfdrive/ui/replay/route.cc @@ -2,7 +2,6 @@ #include -#include #include #include #include @@ -179,7 +178,7 @@ Segment::Segment(int n, const SegmentFile &segment_files, bool load_dcam, bool l static CURLGlobalInitializer curl_initializer; static std::once_flag once_flag; std::call_once(once_flag, [=]() { - if (!QDir(CACHE_DIR).exists()) QDir().mkdir(CACHE_DIR); + if (!CACHE_DIR.exists()) QDir().mkdir(CACHE_DIR.absolutePath()); }); // fallback to qcamera/qlog @@ -253,5 +252,5 @@ QString Segment::localPath(const QUrl &url) { if (url.isLocalFile()) return url.toString(); QByteArray url_no_query = url.toString(QUrl::RemoveQuery).toUtf8(); - return CACHE_DIR + QString(QCryptographicHash::hash(url_no_query, QCryptographicHash::Sha256).toHex()); + return CACHE_DIR.filePath(QString(QCryptographicHash::hash(url_no_query, QCryptographicHash::Sha256).toHex())); } diff --git a/selfdrive/ui/replay/route.h b/selfdrive/ui/replay/route.h index eedb02ad21..0d096f478f 100644 --- a/selfdrive/ui/replay/route.h +++ b/selfdrive/ui/replay/route.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include #include @@ -8,7 +9,7 @@ #include "selfdrive/ui/replay/framereader.h" #include "selfdrive/ui/replay/logreader.h" -const QString CACHE_DIR = util::getenv("COMMA_CACHE", "/tmp/comma_download_cache/").c_str(); +const QDir CACHE_DIR(util::getenv("COMMA_CACHE", "/tmp/comma_download_cache/").c_str()); const int connections_per_file = 3; struct SegmentFile {