Collect UPnP stuff in one folder

gerbera · Jan 13, 2024 · 1d2f6b2 · 1d2f6b2
1 parent 059774e
commit 1d2f6b2
Show file tree

Hide file tree

Showing 53 changed files with 93 additions and 90 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -244,14 +244,21 @@ add_library(libgerbera STATIC
         src/transcoding/transcode_ext_handler.h
         src/transcoding/transcode_handler.cc
         src/transcoding/transcode_handler.h
-        src/upnp_cds.cc
-        src/upnp_cds.h
-        src/upnp_cm.cc
-        src/upnp_cm.h
-        src/upnp_mrreg.cc
-        src/upnp_mrreg.h
-        src/upnp_xml.cc
-        src/upnp_xml.h
+        src/upnp/cont_dir_service.cc
+        src/upnp/cont_dir_service.h
+        src/upnp/conn_mgr_service.cc
+        src/upnp/conn_mgr_service.h
+        src/upnp/mr_reg_service.cc
+        src/upnp/mr_reg_service.h
+        src/upnp/clients.cc
+        src/upnp/clients.h
+        src/upnp/upnp_common.h
+        src/upnp/headers.cc
+        src/upnp/headers.h
+        src/upnp/quirks.cc
+        src/upnp/quirks.h
+        src/upnp/xml_builder.cc
+        src/upnp/xml_builder.h
         src/url_request_handler.cc
         src/url_request_handler.h
         src/util/enum_iterator.h
@@ -282,12 +289,6 @@ add_library(libgerbera STATIC
         src/util/timer.h
         src/util/tools.cc
         src/util/tools.h
-        src/util/upnp_clients.cc
-        src/util/upnp_clients.h
-        src/util/upnp_headers.cc
-        src/util/upnp_headers.h
-        src/util/upnp_quirks.cc
-        src/util/upnp_quirks.h
         src/util/url.cc
         src/util/url.h
         src/util/url_utils.cc

diff --git a/src/action_request.cc b/src/action_request.cc
@@ -34,10 +34,11 @@
 
 #include "action_request.h" // API
 
-#include "upnp_common.h"
-#include "upnp_xml.h"
+#include "upnp/quirks.h"
+#include "upnp/upnp_common.h"
+#include "upnp/xml_builder.h"
 #include "util/grb_net.h"
-#include "util/upnp_quirks.h"
+#include "util/tools.h"
 
 ActionRequest::ActionRequest(std::shared_ptr<UpnpXMLBuilder> xmlBuilder, std::shared_ptr<ClientManager> clients, UpnpActionRequest* upnpRequest)
     : upnp_request(upnpRequest)

diff --git a/src/cds/cds_container.h b/src/cds/cds_container.h
@@ -31,7 +31,7 @@ Gerbera - https://gerbera.io/
 #define __CDS_CONTAINER_H__
 
 #include "cds_objects.h"
-#include "upnp_common.h"
+#include "upnp/upnp_common.h"
 
 /// \brief A container in the content directory.
 class CdsContainer final : public CdsObject {

diff --git a/src/cds/cds_item.cc b/src/cds/cds_item.cc
@@ -32,9 +32,9 @@ Gerbera - https://gerbera.io/
 #include <array>
 #include <numeric>
 
-#include "upnp_common.h"
+#include "upnp/clients.h"
+#include "upnp/upnp_common.h"
 #include "util/grb_time.h"
-#include "util/upnp_clients.h"
 
 CdsItem::CdsItem()
 {

diff --git a/src/cds/cds_objects.cc b/src/cds/cds_objects.cc
@@ -39,8 +39,8 @@
 #include "cds_container.h"
 #include "cds_item.h"
 #include "database/database.h"
+#include "upnp/clients.h"
 #include "util/tools.h"
-#include "util/upnp_clients.h"
 
 static constexpr bool isCdsItem(unsigned int type) { return type & OBJECT_TYPE_ITEM; }
 static constexpr bool isCdsPureItem(unsigned int type) { return type == OBJECT_TYPE_ITEM; }

diff --git a/src/config/config_definition.cc b/src/config/config_definition.cc
@@ -56,7 +56,7 @@
 #include "content/content_manager.h"
 #include "database/sqlite3/sqlite_config.h"
 #include "metadata/metadata_enums.h"
-#include "upnp_common.h"
+#include "upnp/upnp_common.h"
 
 // default values
 

diff --git a/src/config/result/autoscan.h b/src/config/result/autoscan.h
@@ -37,7 +37,7 @@
 
 #include <mutex>
 
-#include "upnp_common.h"
+#include "upnp/upnp_common.h"
 #include "util/timer.h"
 
 // forward declarations

diff --git a/src/config/result/client_config.cc b/src/config/result/client_config.cc
@@ -31,8 +31,6 @@
 
 #include "cds/cds_enums.h"
 #include "util/tools.h"
-#include "util/upnp_clients.h"
-#include "util/upnp_quirks.h"
 
 ClientConfig::ClientConfig(int flags, std::string_view group, std::string_view ip, std::string_view userAgent, const std::map<std::string, std::string>& mimeMappings, int captionInfoCount, int stringLimit, bool multiValue)
 {

diff --git a/src/config/result/client_config.h b/src/config/result/client_config.h
@@ -31,8 +31,7 @@
 #include <mutex>
 #include <vector>
 
-#include "util/upnp_clients.h"
-#include "util/upnp_quirks.h"
+#include "upnp/clients.h"
 
 // forward declaration
 class ClientConfig;

diff --git a/src/config/result/directory_tweak.cc b/src/config/result/directory_tweak.cc
@@ -27,8 +27,7 @@
 
 #include "config/config.h"
 #include "content/content_manager.h"
-#include "util/upnp_clients.h"
-#include "util/upnp_quirks.h"
+#include "upnp/clients.h"
 
 void DirectoryConfigList::add(const std::shared_ptr<DirectoryTweak>& dir, std::size_t index)
 {

diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc
@@ -47,11 +47,11 @@
 #include "import_service.h"
 #include "metadata/metadata_handler.h"
 #include "update_manager.h"
+#include "upnp/clients.h"
 #include "util/mime.h"
 #include "util/string_converter.h"
 #include "util/timer.h"
 #include "util/tools.h"
-#include "util/upnp_clients.h"
 #include "web/session_manager.h"
 
 #ifdef HAVE_JS

diff --git a/src/content/import_service.cc b/src/content/import_service.cc
@@ -37,7 +37,7 @@
 #include "layout/builtin_layout.h"
 #include "metadata/metadata_enums.h"
 #include "metadata/metadata_handler.h"
-#include "upnp_common.h"
+#include "upnp/upnp_common.h"
 #include "util/mime.h"
 #include "util/string_converter.h"
 #include "util/tools.h"

diff --git a/src/content/layout/layout.cc b/src/content/layout/layout.cc
@@ -28,7 +28,7 @@
 #include "layout.h" // API
 
 #include "cds/cds_item.h"
-#include "upnp_common.h"
+#include "upnp/upnp_common.h"
 #include "util/tools.h"
 
 #ifdef ONLINE_SERVICES

diff --git a/src/content/scripting/script_names.h b/src/content/scripting/script_names.h
@@ -28,7 +28,7 @@
 
 #include "cds/cds_enums.h"
 #include "metadata/metadata_enums.h"
-#include "upnp_common.h"
+#include "upnp/upnp_common.h"
 
 const static auto res_names = std::map<ResourceAttribute, std::string> {
     std::pair(ResourceAttribute::SIZE, "R_SIZE"),

diff --git a/src/database/sql_database.cc b/src/database/sql_database.cc
@@ -47,12 +47,12 @@
 #include "content/autoscan_list.h"
 #include "metadata/metadata_enums.h"
 #include "search_handler.h"
-#include "upnp_xml.h"
+#include "upnp/clients.h"
+#include "upnp/xml_builder.h"
 #include "util/grb_net.h"
 #include "util/mime.h"
 #include "util/string_converter.h"
 #include "util/tools.h"
-#include "util/upnp_clients.h"
 #include "util/url_utils.h"
 
 #define MAX_REMOVE_SIZE 1000

diff --git a/src/device_description_handler.cc b/src/device_description_handler.cc
@@ -27,6 +27,8 @@
 #include <sstream>
 
 #include "iohandler/mem_io_handler.h"
+#include "upnp/quirks.h"
+#include "upnp/xml_builder.h"
 
 DeviceDescriptionHandler::DeviceDescriptionHandler(const std::shared_ptr<ContentManager>& content, const std::shared_ptr<UpnpXMLBuilder>& xmlBuilder)
     : RequestHandler(content)

diff --git a/src/device_description_handler.h b/src/device_description_handler.h
@@ -25,7 +25,6 @@
 #define GERBERA_DEVICE_DESCRIPTION_HANDLER_H
 
 #include "request_handler.h"
-#include "upnp_xml.h"
 #include <memory>
 
 class DeviceDescriptionHandler : public RequestHandler {
@@ -36,7 +35,6 @@ class DeviceDescriptionHandler : public RequestHandler {
     std::unique_ptr<IOHandler> open(const char* filename, enum UpnpOpenFileMode mode) override;
 
 protected:
-    std::shared_ptr<UpnpXMLBuilder> xmlBuilder;
     std::string deviceDescription;
 };
 

diff --git a/src/file_request_handler.cc b/src/file_request_handler.cc
@@ -45,12 +45,12 @@
 #include "iohandler/file_io_handler.h"
 #include "metadata/metadata_handler.h"
 #include "transcoding/transcode_dispatcher.h"
-#include "upnp_common.h"
-#include "upnp_xml.h"
+#include "upnp/headers.h"
+#include "upnp/quirks.h"
+#include "upnp/upnp_common.h"
+#include "upnp/xml_builder.h"
 #include "util/grb_net.h"
 #include "util/tools.h"
-#include "util/upnp_headers.h"
-#include "util/upnp_quirks.h"
 #include "util/url_utils.h"
 #include "web/session_manager.h"
 

diff --git a/src/file_request_handler.h b/src/file_request_handler.h
@@ -35,9 +35,11 @@
 #define __FILE_REQUEST_HANDLER_H__
 
 #include "request_handler.h"
-#include "upnp_xml.h"
+
 #include <memory>
 
+#include "upnp/xml_builder.h"
+
 class CdsResource;
 class MetadataHandler;
 

diff --git a/src/main.cc b/src/main.cc
@@ -72,9 +72,9 @@
 #include "content/content_manager.h"
 #include "contrib/cxxopts.hpp"
 #include "server.h"
-#include "upnp_cds.h"
-#include "upnp_cm.h"
-#include "upnp_mrreg.h"
+#include "upnp/conn_mgr_service.h"
+#include "upnp/cont_dir_service.h"
+#include "upnp/mr_reg_service.h"
 
 static constexpr auto gitBranch = std::string_view(GIT_BRANCH);
 static constexpr auto gitCommitHash = std::string_view(GIT_COMMIT_HASH);

diff --git a/src/metadata/ffmpeg_handler.cc b/src/metadata/ffmpeg_handler.cc
@@ -56,7 +56,7 @@ extern "C" {
 
 #include "cds/cds_item.h"
 #include "iohandler/io_handler.h"
-#include "upnp_common.h"
+#include "upnp/upnp_common.h"
 #include "util/grb_time.h"
 #include "util/string_converter.h"
 #include "util/tools.h"

diff --git a/src/server.cc b/src/server.cc
@@ -56,14 +56,15 @@
 #include "file_request_handler.h"
 #include "iohandler/io_handler.h"
 #include "subscription_request.h"
-#include "upnp_cds.h"
-#include "upnp_cm.h"
-#include "upnp_common.h"
-#include "upnp_mrreg.h"
+#include "upnp/clients.h"
+#include "upnp/conn_mgr_service.h"
+#include "upnp/cont_dir_service.h"
+#include "upnp/mr_reg_service.h"
+#include "upnp/upnp_common.h"
+#include "upnp/xml_builder.h"
 #include "util/grb_net.h"
 #include "util/mime.h"
 #include "util/tools.h"
-#include "util/upnp_clients.h"
 #include "util/url_utils.h"
 #include "util/xml_to_json.h"
 #include "web/pages.h"

diff --git a/src/util/upnp_clients.cc → src/upnp/clients.cc b/src/util/upnp_clients.cc → src/upnp/clients.cc
@@ -25,7 +25,7 @@
 /// client info initially taken from https://sourceforge.net/p/minidlna/git/ci/master/tree/clients.cc
 #define LOG_FAC log_facility_t::clients
 
-#include "upnp_clients.h" // API
+#include "clients.h" // API
 
 #include "config/config.h"
 #include "config/result/client_config.h"

diff --git a/src/util/upnp_clients.h → src/upnp/clients.h b/src/util/upnp_clients.h → src/upnp/clients.h
@@ -36,8 +36,8 @@
 
 #include "cds/cds_enums.h"
 #include "common.h"
+#include "upnp/quirks.h"
 #include "util/grb_time.h"
-#include "util/upnp_quirks.h"
 
 // forward declaration
 class Config;

diff --git a/src/upnp_cm.cc → src/upnp/conn_mgr_service.cc b/src/upnp_cm.cc → src/upnp/conn_mgr_service.cc
@@ -32,14 +32,14 @@
 /// \file upnp_cm.cc
 #define LOG_FAC log_facility_t::connmgr
 
-#include "upnp_cm.h" // API
+#include "conn_mgr_service.h" // API
 
 #include "action_request.h"
 #include "config/config_manager.h"
 #include "database/database.h"
 #include "subscription_request.h"
-#include "upnp_common.h"
-#include "upnp_xml.h"
+#include "upnp/upnp_common.h"
+#include "upnp/xml_builder.h"
 #include "util/tools.h"
 
 ConnectionManagerService::ConnectionManagerService(const std::shared_ptr<Context>& context,

diff --git a/src/upnp_cm.h → src/upnp/conn_mgr_service.h b/src/upnp_cm.h → src/upnp/conn_mgr_service.h
diff --git a/src/upnp_cds.cc → src/upnp/cont_dir_service.cc b/src/upnp_cds.cc → src/upnp/cont_dir_service.cc
@@ -32,7 +32,7 @@
 /// \file upnp_cds.cc
 #define LOG_FAC log_facility_t::cds
 
-#include "upnp_cds.h" // API
+#include "cont_dir_service.h" // API
 
 #include <vector>
 
@@ -43,10 +43,10 @@
 #include "database/database.h"
 #include "database/sql_database.h"
 #include "subscription_request.h"
-#include "upnp_xml.h"
+#include "upnp/clients.h"
+#include "upnp/quirks.h"
+#include "upnp/xml_builder.h"
 #include "util/tools.h"
-#include "util/upnp_clients.h"
-#include "util/upnp_quirks.h"
 
 ContentDirectoryService::ContentDirectoryService(const std::shared_ptr<Context>& context,
     std::shared_ptr<UpnpXMLBuilder> xmlBuilder, UpnpDevice_Handle deviceHandle, int stringLimit)

diff --git a/src/upnp_cds.h → src/upnp/cont_dir_service.h b/src/upnp_cds.h → src/upnp/cont_dir_service.h
diff --git a/src/util/upnp_headers.cc → src/upnp/headers.cc b/src/util/upnp_headers.cc → src/upnp/headers.cc
@@ -23,7 +23,7 @@
 
 /// \file upnp_headers.cc
 
-#include "upnp_headers.h" // API
+#include "headers.h" // API
 
 #if !defined(USING_NPUPNP)
 #include <UpnpExtraHeaders.h>

diff --git a/src/util/upnp_headers.h → src/upnp/headers.h b/src/util/upnp_headers.h → src/upnp/headers.h
diff --git a/src/upnp_mrreg.cc → src/upnp/mr_reg_service.cc b/src/upnp_mrreg.cc → src/upnp/mr_reg_service.cc
@@ -32,14 +32,14 @@
 /// \file upnp_mrreg.cc
 #define LOG_FAC log_facility_t::mrregistrar
 
-#include "upnp_mrreg.h" // API
+#include "mr_reg_service.h" // API
 
 #include "action_request.h"
 #include "config/config_manager.h"
 #include "database/database.h"
 #include "subscription_request.h"
-#include "upnp_common.h"
-#include "upnp_xml.h"
+#include "upnp/upnp_common.h"
+#include "upnp/xml_builder.h"
 #include "util/tools.h"
 
 MRRegistrarService::MRRegistrarService(const std::shared_ptr<Context>& context,

diff --git a/src/upnp_mrreg.h → src/upnp/mr_reg_service.h b/src/upnp_mrreg.h → src/upnp/mr_reg_service.h