abraunegg · abraunegg · Oct 18, 2023 · Oct 18, 2023 · Oct 18, 2023 · Oct 18, 2023
diff --git a/Makefile.in b/Makefile.in
@@ -55,7 +55,7 @@ endif
 system_unit_files = contrib/systemd/onedrive@.service
 user_unit_files = contrib/systemd/onedrive.service
 
-DOCFILES = README.md config LICENSE CHANGELOG.md docs/Docker.md docs/INSTALL.md docs/SharePoint-Shared-Libraries.md docs/USAGE.md docs/BusinessSharedFolders.md docs/advanced-usage.md docs/application-security.md
+DOCFILES = readme.md config LICENSE changelog.md docs/advanced-usage.md docs/application-config-options.md docs/application-security.md docs/business-shared-folders.md docs/docker.md docs/install.md docs/national-cloud-deployments.md docs/podman.md docs/privacy-policy.md docs/sharepoint-libraries.md docs/terms-of-service.md docs/ubuntu-package-install.md docs/usage.md 
 
 ifneq ("$(wildcard /etc/redhat-release)","")
 RHEL = $(shell cat /etc/redhat-release | grep -E "(Red Hat Enterprise Linux|CentOS)" | wc -l)
@@ -66,19 +66,18 @@ RHEL_VERSION = 0
 endif
 
 SOURCES = \
+	src/main.d \
 	src/config.d \
-	src/itemdb.d \
 	src/log.d \
-	src/main.d \
-	src/monitor.d \
-	src/onedrive.d \
+	src/util.d \
 	src/qxor.d \
-	src/selective.d \
-	src/sqlite.d \
+	src/curlEngine.d \
+	src/onedrive.d \
 	src/sync.d \
-	src/upload.d \
-	src/util.d \
-	src/progress.d \
+	src/itemdb.d \
+	src/sqlite.d \
+	src/clientSideFiltering.d \
+	src/monitor.d \
 	src/arsd/cgi.d
 
 ifeq ($(NOTIFICATIONS),yes)

diff --git a/CHANGELOG.md → changelog.md b/CHANGELOG.md → changelog.md
@@ -2,6 +2,13 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.5.0 - TBA
+
+
+### Changed
+*   Renamed various documentation files to align with document content
+
+
 ## 2.4.25 - 2023-06-21
 ### Fixed
 *   Fixed that the application was reporting as v2.2.24 when in fact it was v2.4.24 (release tagging issue)

diff --git a/config b/config
@@ -3,7 +3,7 @@
 # with their default values.
 # All values need to be enclosed in quotes
 # When changing a config option below, remove the '#' from the start of the line
-# For explanations of all config options below see docs/USAGE.md or the man page.
+# For explanations of all config options below see docs/usage.md or the man page.
 #
 # sync_dir = "~/OneDrive"
 # skip_file = "~*|.~*|*.tmp"
@@ -40,22 +40,19 @@
 # bypass_data_preservation = "false"
 # azure_ad_endpoint = ""
 # azure_tenant_id = "common"
-# sync_business_shared_folders = "false"
+# sync_business_shared_items = "false"
 # sync_dir_permissions = "700"
 # sync_file_permissions = "600"
 # rate_limit = "131072"
+# operation_timeout = "3600"
 # webhook_enabled = "false"
 # webhook_public_url = ""
 # webhook_listening_host = ""
 # webhook_listening_port = "8888"
-# webhook_expiration_interval = "86400"
-# webhook_renewal_interval = "43200"
+# webhook_expiration_interval = "600"
+# webhook_renewal_interval = "300"
+# webhook_retry_interval = "60"
 # space_reservation = "50"
 # display_running_config = "false"
 # read_only_auth_scope = "false"
 # cleanup_local_files = "false"
-# operation_timeout = "3600"
-# dns_timeout = "60"
-# connect_timeout = "10"
-# data_timeout = "600"
-# ip_protocol_version = "0"
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for onedrive v2.4.25.
+# Generated by GNU Autoconf 2.69 for onedrive v2.5.0-alpha-4.
 #
 # Report bugs to <https://github.com/abraunegg/onedrive>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='onedrive'
 PACKAGE_TARNAME='onedrive'
-PACKAGE_VERSION='v2.4.25'
-PACKAGE_STRING='onedrive v2.4.25'
+PACKAGE_VERSION='v2.5.0-alpha-4'
+PACKAGE_STRING='onedrive v2.5.0-alpha-4'
 PACKAGE_BUGREPORT='https://github.com/abraunegg/onedrive'
 PACKAGE_URL=''
 
@@ -1219,7 +1219,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures onedrive v2.4.25 to adapt to many kinds of systems.
+\`configure' configures onedrive v2.5.0-alpha-4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1280,7 +1280,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of onedrive v2.4.25:";;
+     short | recursive ) echo "Configuration of onedrive v2.5.0-alpha-4:";;
    esac
   cat <<\_ACEOF
 
@@ -1393,7 +1393,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-onedrive configure v2.4.25
+onedrive configure v2.5.0-alpha-4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1410,7 +1410,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by onedrive $as_me v2.4.25, which was
+It was created by onedrive $as_me v2.5.0-alpha-4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2162,7 +2162,7 @@ fi
 
 
 
-PACKAGE_DATE="June 2023"
+PACKAGE_DATE="December 2023"
 
 
 
@@ -3159,7 +3159,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by onedrive $as_me v2.4.25, which was
+This file was extended by onedrive $as_me v2.5.0-alpha-4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3212,7 +3212,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-onedrive config.status v2.4.25
+onedrive config.status v2.5.0-alpha-4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
@@ -9,7 +9,7 @@ dnl - commit the changed files (configure.ac, configure)
 dnl - tag the release
 
 AC_PREREQ([2.69])
-AC_INIT([onedrive],[v2.4.25], [https://github.com/abraunegg/onedrive], [onedrive])
+AC_INIT([onedrive],[v2.5.0-alpha-4], [https://github.com/abraunegg/onedrive], [onedrive])
 AC_CONFIG_SRCDIR([src/main.d])
 
 

diff --git a/contrib/completions/complete.bash b/contrib/completions/complete.bash
@@ -11,7 +11,7 @@ _onedrive()
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	options='--check-for-nomount --check-for-nosync --debug-https --disable-notifications --display-config --display-sync-status --download-only --disable-upload-validation --dry-run --enable-logging --force-http-1.1 --force-http-2 --get-file-link --local-first --logout -m --monitor --no-remote-delete --print-token --reauth --resync --skip-dot-files --skip-symlinks --synchronize --upload-only -v --verbose --version -h --help'
-	argopts='--create-directory --get-O365-drive-id --operation-timeout --remove-directory --single-directory --source-directory'
+	argopts='--create-directory --get-O365-drive-id --remove-directory --single-directory --source-directory'
 
 	# Loop on the arguments to manage conflicting options
 	for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
@@ -34,7 +34,7 @@ _onedrive()
 		fi
 		return 0
 		;;
-	--create-directory|--get-O365-drive-id|--operation-timeout|--remove-directory|--single-directory|--source-directory)
+	--create-directory|--get-O365-drive-id|--remove-directory|--single-directory|--source-directory)
 		return 0
 		;;
 	*)

diff --git a/contrib/completions/complete.fish b/contrib/completions/complete.fish
@@ -23,7 +23,6 @@ complete -c onedrive -l local-first -d 'Synchronize from the local directory sou
 complete -c onedrive -l logout -d 'Logout the current user.'
 complete -c onedrive -n "not __fish_seen_subcommand_from --synchronize" -a "-m --monitor" -d 'Keep monitoring for local and remote changes.'
 complete -c onedrive -l no-remote-delete -d 'Do not delete local file deletes from OneDrive when using --upload-only.'
-complete -c onedrive -l operation-timeout -d 'Specify the maximum amount of time (in seconds) an operation is allowed to take.'
 complete -c onedrive -l print-token -d 'Print the access token, useful for debugging.'
 complete -c onedrive -l remote-directory -d 'Remove a directory on OneDrive - no sync will be performed.'
 complete -c onedrive -l reauth -d 'Reauthenticate the client with OneDrive.'

diff --git a/contrib/completions/complete.zsh b/contrib/completions/complete.zsh
@@ -27,7 +27,6 @@ all_opts=(
   '--logout[Logout the current user]'
   '(-m --monitor)'{-m,--monitor}'[Keep monitoring for local and remote changes]'
   '--no-remote-delete[Do not delete local file deletes from OneDrive when using --upload-only]'
-  '--operation-timeout[Specify the maximum amount of time (in seconds) an operation is allowed to take.]:seconds:'
   '--print-token[Print the access token, useful for debugging]'
   '--reauth[Reauthenticate the client with OneDrive]'
   '--resync[Forget the last saved state, perform a full sync]'

diff --git a/contrib/docker/entrypoint.sh b/contrib/docker/entrypoint.sh
@@ -118,6 +118,13 @@ if [ -n "${ONEDRIVE_SINGLE_DIRECTORY:=""}" ]; then
    ARGS=(--single-directory \"${ONEDRIVE_SINGLE_DIRECTORY}\" ${ARGS[@]})
 fi
 
+# Tell client run in dry-run mode
+if [ "${ONEDRIVE_DRYRUN:=0}" == "1" ]; then
+   echo "# We are running in dry-run mode"
+   echo "# Adding --dry-run"
+   ARGS=(--dry-run ${ARGS[@]})
+fi
+
 if [ ${#} -gt 0 ]; then
   ARGS=("${@}")
 fi