Compare commits

..
5 Commits
Author SHA1 Message Date
soutade 906b8a3733 Update libgourou version to v0.8.10 2026-09-02 16:41:29 +02:00
soutade c32230f27d Remove warning about _XOPEN_SOURCE 2026-09-02 16:41:29 +02:00
soutade 06297aa6f0 Add warning about new device activation (now require a ByteBooks account) 2026-09-02 16:37:57 +02:00
soutade 2d4a5c992c Get ca-certificates.crt path from SSL_CERT_FILE env var if available 2026-09-02 16:21:52 +02:00
benoitperrin 1abb470819 Fix adept_remove -O placing result in a nested sub-directory
With -O <dir>, the output path was built from the full input path
instead of its base name:

    filename = std::string(inputFile);
    if (outputDir)
        filename = std::string(outputDir) + "/" + filename;

So `adept_remove -O /out /tmp/x/book.epub` wrote the result to
/out/tmp/x/book.epub (createPath() silently creating the intermediate
directories) instead of /out/book.epub.

-O is documented as the directory "were to put result", so only the
input's base name should be appended. acsmdownloader is unaffected
because it derives its output name from the title metadata, not from
the input path.

Reduce the input to its base name before prefixing it with -O.
2026-07-01 11:14:30 +02:00
5 changed files with 11 additions and 3 deletions
+2
View File
@@ -86,6 +86,8 @@ other variables are DESTDIR and PREFIX to handle destination install directory
Utils
-----
!!Warning!! : When activating a new device (with _adept\_activate_), Adobe ID accounts are deprecated. You need to sign in with a (dts) ByteBooks account.
First, add libgourou.so to your LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD
+1 -1
View File
@@ -37,7 +37,7 @@
#define ACS_SERVER "https://adeactivate.adobe.com/adept"
#endif
#define LIBGOUROU_VERSION "0.8.9"
#define LIBGOUROU_VERSION "0.8.10"
namespace gourou
{
-1
View File
@@ -31,7 +31,6 @@
#include <iostream>
#include <algorithm>
#define _XOPEN_SOURCE 700
#include <stdio.h>
#include <sys/types.h>
#include <dirent.h>
+5 -1
View File
@@ -88,7 +88,11 @@ public:
filename = std::string(inputFile);
if (outputDir)
filename = std::string(outputDir) + "/" + filename;
{
char* basepath = strdup(inputFile);
filename = std::string(outputDir) + "/" + basename(basepath);
free(basepath);
}
}
if (endsWith(filename, ".epub"))
+3
View File
@@ -261,6 +261,9 @@ std::string DRMProcessorClientImpl::sendHTTPRequest(const std::string& URL, cons
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
curl_easy_setopt(curl, CURLOPT_COOKIEJAR, cookiejar);
if (getenv("SSL_CERT_FILE") != NULL)
curl_easy_setopt(curl, CURLOPT_CAINFO, getenv("SSL_CERT_FILE"));
if (POSTData.size())
{
curl_easy_setopt(curl, CURLOPT_POST, 1L);