Merge branch 'develop' for release v5.1.0

epoupon · Jan 6, 2022 · 76300bf · 76300bf
2 parents a1a6914 + 7f1d7bb
commit 76300bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/fileshelter/main/main.cpp b/src/fileshelter/main/main.cpp
@@ -190,6 +190,10 @@ int main(int argc, char *argv[])
 		shareManager->removeOrphanFiles(uploadedFilesPath);
 
 		ShareResource shareResource;
+		if (!deployPath.empty() && deployPath.back() == '/')
+			shareResource.setDeployPath(deployPath + "share");
+		else
+			shareResource.setDeployPath(deployPath + "/share");
 		server.addResource(&shareResource, std::string {shareResource.getDeployPath()});
 		server.addEntryPoint(Wt::EntryPointType::Application, [&](const Wt::WEnvironment& env)
 		{

diff --git a/src/fileshelter/resources/ShareResource.hpp b/src/fileshelter/resources/ShareResource.hpp
@@ -37,9 +37,12 @@ class ShareResource : public Wt::WResource
 	public:
 		~ShareResource();
 
-		static constexpr std::string_view 		getDeployPath() { return "/share"; }
-		static Wt::WLink						createLink(const Share::ShareUUID& shareId, std::optional<std::string_view> password);
+		static void				setDeployPath(std::string_view deployPath) { _deployPath = deployPath; }
+		static std::string_view	getDeployPath() { return _deployPath; }
+		static Wt::WLink		createLink(const Share::ShareUUID& shareId, std::optional<std::string_view> password);
+
 	private:
+		static inline std::string _deployPath;
 		void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response) override;
 };