Skip to content

Place logdir under user's Documents folder on Windows #17480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Place logdir under user's Documents folder on Windows #17480

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
864923d
Change the logging directory to under Documents in the user's home di…
victoryforce Sep 14, 2024
c6296c2
Minor comments and code reformatting
victoryforce Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
This file is part of darktable,
Copyright (C) 2009-2020 darktable developers.
Copyright (C) 2009-2024 darktable developers.

darktable is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -15,6 +15,7 @@
You should have received a copy of the GNU General Public License
along with darktable. If not, see <http://www.gnu.org/licenses/>.
*/

#include "common/darktable.h"
#include "common/image.h"
#include "develop/develop.h"
Expand Down Expand Up @@ -43,7 +44,8 @@ int main(int argc, char *argv[])
char datetime[DT_DATETIME_EXIF_LENGTH];
dt_datetime_now_to_exif(datetime);

// make sure to not redirect output when the output is already being redirected, either to a file or a pipe.
// Make sure to not redirect output when the output is already
// being redirected, either to a file or a pipe.
int out_type = GetFileType(GetStdHandle(STD_OUTPUT_HANDLE));
int err_type = GetFileType(GetStdHandle(STD_ERROR_HANDLE));
gboolean redirect_output = ((out_type != FILE_TYPE_DISK && out_type != FILE_TYPE_PIPE) &&
Expand All @@ -52,7 +54,10 @@ int main(int argc, char *argv[])
for(int k = 1; k < argc; k++)
{
// For simple arguments do not redirect stdout
if(!strcmp(argv[k], "--help") || !strcmp(argv[k], "-h") || !strcmp(argv[k], "/?") || !strcmp(argv[k], "--version"))
if(!strcmp(argv[k], "--help") ||
!strcmp(argv[k], "-h") ||
!strcmp(argv[k], "/?") ||
!strcmp(argv[k], "--version"))
{
redirect_output = FALSE;
break;
Expand All @@ -61,26 +66,29 @@ int main(int argc, char *argv[])

if(redirect_output)
{
// something like C:\Users\username\AppData\Local\Microsoft\Windows\Temporary Internet Files\darktable\darktable-log.txt
char *logdir = g_build_filename(g_get_user_cache_dir(), "darktable", NULL);
char *logdir = g_build_filename(g_get_home_dir(), "Documents", "Darktable", NULL);
char *logfile = g_build_filename(logdir, "darktable-log.txt", NULL);

g_mkdir_with_parents(logdir, 0700);

g_freopen(logfile, "a", stdout);
dup2(fileno(stdout), fileno(stderr));

// We don't need the console window anymore, free it
// This ensures that only darktable's main window will be visible
// We don't need the console window anymore, free it.
// This ensures that only darktable's main window will be visible.
FreeConsole();

g_free(logdir);
g_free(logfile);

// don't buffer stdout/stderr. we have basically two options: unbuffered or line buffered.
// unbuffered keeps the order in which things are printed but concurrent threads printing can lead to intermangled output. ugly.
// line buffered should keep lines together but in my tests the order of things no longer matches. ugly and potentially confusing.
// thus we are doing the thing that is just ugly (in rare cases) but at least not confusing.
// Don't buffer stdout/stderr. We have basically two options:
// unbuffered or line buffered.
// Unbuffered keeps the order in which things are printed but concurrent
// threads printing can lead to intermangled output. Ugly.
// Line buffered should keep lines together but the order of things
// no longer matches. Ugly and potentially confusing.
// Thus we are doing the thing that is just ugly (in rare cases)
// but at least not confusing.
setvbuf(stdout, NULL, _IONBF, 0);
setvbuf(stderr, NULL, _IONBF, 0);

Expand All @@ -90,7 +98,8 @@ int main(int argc, char *argv[])
printf("\n");
}

// make sure GTK client side decoration is disabled, otherwise windows resizing issues can be observed
// Make sure GTK client side decoration is disabled,
// otherwise windows resizing issues can be observed.
g_setenv("GTK_CSD", "0", TRUE);
#endif

Expand Down Expand Up @@ -151,4 +160,3 @@ int main(int argc, char *argv[])
// vim: shiftwidth=2 expandtab tabstop=2 cindent
// kate: tab-indents: off; indent-width 2; replace-tabs on; indent-mode cstyle; remove-trailing-spaces modified;
// clang-format on

Loading