Fix libtorrent integration: remove hardcoded paths, fix code style

- Remove hardcoded /opt/homebrew/include paths from meson.build that
  would break CI on non-macOS platforms
- Add proper GPL copyright header to libtorrent.h and libtorrent.cpp
- Fix forward declaration of libtorrent::session (use struct not class)
- Rename member variable to mp_session following kiwix naming convention
- Fix namespace comment style to match existing codebase
- Simplify test file by removing redundant test case and fixing include order

libtorrent-rasterbar IS the official libtorrent library from
github.com/arvidn/libtorrent - the 'rasterbar' name comes from the
project's origins. This is the correct pkg-config name.

Author: aviralgarg05

meson.build

@@ -63,13 +63,10 @@ zlib_dep = dependency('zlib', static:static_deps)
 xapian_dep = dependency('xapian-core', static:static_deps)
 libtorrent_dep = dependency('libtorrent-rasterbar', static:static_deps)
 
-
 if compiler.has_header('mustache.hpp')
   extra_include = []
 elif compiler.has_header('mustache.hpp', args: '-I/usr/include/kainjow')
   extra_include = ['/usr/include/kainjow']
-elif compiler.has_header('mustache.hpp', args: '-I/opt/homebrew/include')
-  extra_include = []
 else
   error('Cannot found header mustache.hpp')
 endif
@@ -103,10 +100,7 @@ all_deps = [thread_dep, libzim_dep, pugixml_dep, libcurl_dep, microhttpd_dep, zl
 # Dependencies as array
 all_deps += libicu_deps
 
-# Add boost include path for libtorrent
-boost_include = include_directories('/opt/homebrew/include')
-
-inc = include_directories('include', extra_include, '/opt/homebrew/include')
+inc = include_directories('include', extra_include)
 
 conf = configuration_data()
 conf.set('LIBKIWIX_VERSION', '"@0@"'.format(meson.project_version()))

src/libtorrent.cpp

@@ -1,4 +1,21 @@
-
+/*
+ * Copyright 2025 Kiwix developers
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
 
 #include "libtorrent.h"
 
@@ -8,20 +25,16 @@
 namespace kiwix
 {
 
-LibTorrent::LibTorrent() : m_session(new libtorrent::session())
+LibTorrent::LibTorrent()
+  : mp_session(new libtorrent::session())
 {
-  // Create a basic libtorrent session
-  // This ensures we can successfully link against libtorrent
 }
 
-LibTorrent::~LibTorrent()
-{
-  // Cleanup is handled automatically by unique_ptr
-}
+LibTorrent::~LibTorrent() = default;
 
 std::string LibTorrent::getVersion() const
 {
   return LIBTORRENT_VERSION;
 }
 
-}  // end namespace kiwix
+} // namespace kiwix

src/libtorrent.h

@@ -1,7 +1,24 @@
+/*
+ * Copyright 2025 Kiwix developers
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
 
-
-#ifndef KIWIXLIB_LIBTORRENT_H_
-#define KIWIXLIB_LIBTORRENT_H_
+#ifndef KIWIX_LIBTORRENT_H
+#define KIWIX_LIBTORRENT_H
 
 #include <memory>
 #include <string>
@@ -15,27 +32,28 @@ namespace kiwix
 {
 
 /**
- * @brief A minimal wrapper class around libtorrent-rasterbar
+ * A minimal wrapper class around libtorrent.
  *
  * This is a stub implementation to verify that libkiwix can successfully
- * compile and link against libtorrent-rasterbar library.
+ * compile and link against libtorrent library.
  */
 class LibTorrent
 {
- private:
-  std::unique_ptr<libtorrent::session> m_session;
-
  public:
   LibTorrent();
-  virtual ~LibTorrent();
+  ~LibTorrent();
 
   /**
-   * @brief Get the version of libtorrent being used
-   * @return Version string of libtorrent-rasterbar
+   * Get the version of libtorrent being used.
+   *
+   * @return Version string of libtorrent
    */
   std::string getVersion() const;
+
+ private:
+  std::unique_ptr<libtorrent::session> mp_session;
 };
 
-}  // end namespace kiwix
+} // namespace kiwix
 
-#endif  // KIWIXLIB_LIBTORRENT_H_
+#endif // KIWIX_LIBTORRENT_H

test/libtorrent.cpp

@@ -1,9 +1,8 @@
+#include "gtest/gtest.h"
 #include "../src/libtorrent.h"
 
 #include <string>
 
-#include "gtest/gtest.h"
-
 namespace
 {
 
@@ -24,18 +23,4 @@ TEST(LibTorrentTest, CanGetVersion)
   EXPECT_NE(version.find_first_of("0123456789"), std::string::npos);
 }
 
-TEST(LibTorrentTest, CanIncludeLinkLibtorrent)
-{
-  // This test verifies that we can successfully:
-  // 1. Include libtorrent headers (done in libtorrent.h/cpp)
-  // 2. Link against libtorrent library (verified by instantiation)
-  // 3. Call basic libtorrent functions (getVersion uses LIBTORRENT_VERSION)
-
-  kiwix::LibTorrent lt;
-  std::string version = lt.getVersion();
-
-  // If we can create an instance and get version, linking works
-  EXPECT_TRUE(true);
-}
-
-}  // unnamed namespace
+} // unnamed namespace