From 65438e98d00b27959c0502aca5937a6134e8b6a4 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Thu, 14 Mar 2024 16:55:18 +0100 Subject: [PATCH 1/8] Preparing for updater change --- Duplicati/Library/AutoUpdater/UpdateInfo.cs | 1 + .../Library/AutoUpdater/UpdaterManager.cs | 23 +++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Duplicati/Library/AutoUpdater/UpdateInfo.cs b/Duplicati/Library/AutoUpdater/UpdateInfo.cs index af6509c46..ae55ec096 100644 --- a/Duplicati/Library/AutoUpdater/UpdateInfo.cs +++ b/Duplicati/Library/AutoUpdater/UpdateInfo.cs @@ -48,6 +48,7 @@ namespace Duplicati.Library.AutoUpdater public class UpdateInfo { + public string UpdateFromV1Url; public string Displayname; public string Version; public DateTime ReleaseTime; diff --git a/Duplicati/Library/AutoUpdater/UpdaterManager.cs b/Duplicati/Library/AutoUpdater/UpdaterManager.cs index 0c5113d87..abe61868a 100644 --- a/Duplicati/Library/AutoUpdater/UpdaterManager.cs +++ b/Duplicati/Library/AutoUpdater/UpdaterManager.cs @@ -932,9 +932,16 @@ namespace Duplicati.Library.AutoUpdater updateDetected = CheckForUpdate(); if (updateDetected != null && downloadUpdate) { - if (!runDuring) - Console.WriteLine("Update to {0} detected, installing...", updateDetected.Displayname); - updateInstalled = DownloadAndUnpackUpdate(updateDetected); + if (!string.IsNullOrWhiteSpace(updateDetected.UpdateFromV1Url)) + { + Console.WriteLine("Update to {0} detected, manual install required: {1}", updateDetected.Displayname, updateDetected.UpdateFromV1Url); + } + else + { + if (!runDuring) + Console.WriteLine("Update to {0} detected, installing...", updateDetected.Displayname); + updateInstalled = DownloadAndUnpackUpdate(updateDetected); + } } }); @@ -958,7 +965,10 @@ namespace Duplicati.Library.AutoUpdater } else if (updateDetected != null) { - Console.WriteLine("Update \"{0}\" detected", updateDetected.Displayname); + if (!string.IsNullOrWhiteSpace(updateDetected.UpdateFromV1Url)) + Console.WriteLine("Update to {0} detected, manual install required: {1}", updateDetected.Displayname, updateDetected.UpdateFromV1Url); + else + Console.WriteLine("Update \"{0}\" detected", updateDetected.Displayname); } backgroundChecker = null; @@ -992,7 +1002,10 @@ namespace Duplicati.Library.AutoUpdater } else { - Console.WriteLine("Update \"{0}\" detected", updateDetected.Displayname); + if (!string.IsNullOrWhiteSpace(updateDetected.UpdateFromV1Url)) + Console.WriteLine("Update to {0} detected, manual install required: {1}", updateDetected.Displayname, updateDetected.UpdateFromV1Url); + else + Console.WriteLine("Update \"{0}\" detected", updateDetected.Displayname); } } } From 873548723ecf65b45d40483a3fce4b5fb2e8298d Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Wed, 20 Mar 2024 09:45:31 +0100 Subject: [PATCH 2/8] Fixed missing license update for MacOS installer --- Installer/OSX/LICENSE.html | 566 ++----------------------------------- 1 file changed, 16 insertions(+), 550 deletions(-) diff --git a/Installer/OSX/LICENSE.html b/Installer/OSX/LICENSE.html index e70d93ad4..cc0f89548 100644 --- a/Installer/OSX/LICENSE.html +++ b/Installer/OSX/LICENSE.html @@ -3,558 +3,24 @@ +

+Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: -

GNU LESSER GENERAL PUBLIC LICENSE

-

-Version 2.1, February 1999 -

+The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- - -

Preamble

- -

- The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. -

-

- This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. -

-

- When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. -

-

- To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. -

-

- For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. -

-

- We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. -

-

- To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. -

-

- Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. -

-

- Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. -

-

- When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. -

-

- We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. -

-

- For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. -

-

- In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. -

-

- Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. -

-

- The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. -

- - -

TERMS AND CONDITIONS FOR COPYING, -DISTRIBUTION AND MODIFICATION

- - -

-0. -This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". -

-

- A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. -

-

- The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) -

-

- "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. -

-

- Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. -

-

-1. -You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. -

-

- You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. -

-

-2. -You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: -

- - - -

-These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Library, and can be -reasonably considered independent and separate works in themselves, then -this License, and its terms, do not apply to those sections when you -distribute them as separate works. But when you distribute the same -sections as part of a whole which is a work based on the Library, the -distribution of the whole must be on the terms of this License, whose -permissions for other licensees extend to the entire whole, and thus to -each and every part regardless of who wrote it. -

-

-Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise -the right to control the distribution of derivative or collective works -based on the Library. -

-

-In addition, mere aggregation of another work not based on the Library with -the Library (or with a work based on the Library) on a volume of a storage -or distribution medium does not bring the other work under the scope of -this License. -

-

-3. -You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. -

-

- Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. -

-

- This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. -

-

-4. -You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. -

-

- If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. -

-

-5. -A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. -

-

- However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. -

-

- When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. -

-

- If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) -

-

- Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. -

-

-6. -As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. -

-

- You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: -

- - - -

- For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. -

-

- It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. -

-

-7. You may place library facilities that are a work -based on the Library side-by-side in a single library together with -other library facilities not covered by this License, and distribute -such a combined library, provided that the separate distribution of -the work based on the Library and of the other library facilities is -otherwise permitted, and provided that you do these two things: -

- - - -

-8. You may not copy, modify, sublicense, link with, -or distribute the Library except as expressly provided under this -License. Any attempt otherwise to copy, modify, sublicense, link -with, or distribute the Library is void, and will automatically -terminate your rights under this License. However, parties who have -received copies, or rights, from you under this License will not have -their licenses terminated so long as such parties remain in full -compliance. -

-

-9. -You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. -

-

-10. -Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. -

-

-11. -If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. -

-

-If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. -

-

-It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. -

-

-This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. -

-

-12. -If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. -

-

-13. -The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. -

-

-Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. -

-

-14. -If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. -

-

-NO WARRANTY -

-

-15. -BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -

-

-16. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE.

From e64478474bd21682f138c542a7cfd9ff058f5926 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Mon, 25 Mar 2024 07:49:52 +0100 Subject: [PATCH 3/8] Showing link for manual update --- Duplicati/Server/UpdatePollThread.cs | 29 ++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/Duplicati/Server/UpdatePollThread.cs b/Duplicati/Server/UpdatePollThread.cs index a4f6c0404..7c5263228 100644 --- a/Duplicati/Server/UpdatePollThread.cs +++ b/Duplicati/Server/UpdatePollThread.cs @@ -205,11 +205,32 @@ namespace Duplicati.Server var v = Program.DataConnection.ApplicationSettings.UpdatedVersion; if (v != null) { - ThreadState = UpdatePollerStates.Downloading; - Program.StatusEventNotifyer.SignalNewEvent(); - - if (Duplicati.Library.AutoUpdater.UpdaterManager.DownloadAndUnpackUpdate(v, (pg) => { DownloadProgess = pg; })) + if (string.IsNullOrWhiteSpace(v.UpdateFromV1Url)) + { + ThreadState = UpdatePollerStates.Downloading; Program.StatusEventNotifyer.SignalNewEvent(); + + if (Duplicati.Library.AutoUpdater.UpdaterManager.DownloadAndUnpackUpdate(v, (pg) => { DownloadProgess = pg; })) + Program.StatusEventNotifyer.SignalNewEvent(); + } + else + { + Program.DataConnection.RegisterNotification( + NotificationType.Error, + "Manual update required", + $"{v.UpdateFromV1Url}", + null, + null, + "update:new", + null, + "NewUpdateFound", + null, + (self, all) => + { + return all.FirstOrDefault(x => x.Action == "update:new") ?? self; + } + ); + } } } From 0e714c9fb5e517700b9cb86fd968b976a8ace5b9 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Tue, 26 Mar 2024 15:42:47 +0100 Subject: [PATCH 4/8] Improved support for updating with manual update process --- Duplicati/Server/UpdatePollThread.cs | 56 ++++++++++++------- .../ngax/templates/notificationarea.html | 17 ++++-- 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/Duplicati/Server/UpdatePollThread.cs b/Duplicati/Server/UpdatePollThread.cs index 7c5263228..9c36fc3e1 100644 --- a/Duplicati/Server/UpdatePollThread.cs +++ b/Duplicati/Server/UpdatePollThread.cs @@ -180,26 +180,43 @@ namespace Duplicati.Server if (Program.DataConnection.ApplicationSettings.UpdatedVersion != null && Duplicati.Library.AutoUpdater.UpdaterManager.TryParseVersion(Program.DataConnection.ApplicationSettings.UpdatedVersion.Version) > System.Reflection.Assembly.GetExecutingAssembly().GetName().Version) { - Program.DataConnection.RegisterNotification( - NotificationType.Information, - "Found update", - Program.DataConnection.ApplicationSettings.UpdatedVersion.Displayname, - null, - null, - "update:new", - null, - "NewUpdateFound", - null, - (self, all) => { - return all.FirstOrDefault(x => x.Action == "update:new") ?? self; - } - ); + if (string.IsNullOrWhiteSpace(Program.DataConnection.ApplicationSettings.UpdatedVersion.UpdateFromV1Url)) + { + Program.DataConnection.RegisterNotification( + NotificationType.Information, + "Found update", + Program.DataConnection.ApplicationSettings.UpdatedVersion.Displayname, + null, + null, + "update:new", + null, + "NewUpdateFound", + null, + (self, all) => all.FirstOrDefault(x => x.Action == "update:new") ?? self + ); + } + else + { + Program.DataConnection.RegisterNotification( + NotificationType.Information, + "Manual update required", + Program.DataConnection.ApplicationSettings.UpdatedVersion.UpdateFromV1Url, + null, + null, + "update:manual", + null, + "NewUpdateFound", + null, + (self, all) => all.FirstOrDefault(x => x.Action == "update:manual") ?? self + ); + + } } } if (m_download) { - lock(m_lock) + lock (m_lock) m_download = false; var v = Program.DataConnection.ApplicationSettings.UpdatedVersion; @@ -218,17 +235,14 @@ namespace Duplicati.Server Program.DataConnection.RegisterNotification( NotificationType.Error, "Manual update required", - $"{v.UpdateFromV1Url}", + v.UpdateFromV1Url, null, null, - "update:new", + "update:manual", null, "NewUpdateFound", null, - (self, all) => - { - return all.FirstOrDefault(x => x.Action == "update:new") ?? self; - } + (self, all) => all.FirstOrDefault(x => x.Action == "update:manual") ?? self ); } } diff --git a/Duplicati/Server/webroot/ngax/templates/notificationarea.html b/Duplicati/Server/webroot/ngax/templates/notificationarea.html index 852dbbef3..b67315e45 100644 --- a/Duplicati/Server/webroot/ngax/templates/notificationarea.html +++ b/Duplicati/Server/webroot/ngax/templates/notificationarea.html @@ -2,11 +2,11 @@
  • {{item.Title}}
    -
    {{item.Message}}
    +
    {{item.Message}}
    If the backup file was not downloaded automatically, right click and choose "Save as …"
    -
    +
    Dismiss Show @@ -17,9 +17,8 @@
    -
    -
    New update found: {{message}}
    +
    New update found: {{message}}
    @@ -33,6 +32,16 @@
    + +
    +
    Manual update found: {{item.Message}}
    + +
    + Dismiss + Show +
    +
    +
  • From cc1f91bf87fa9b0c679ecbd5b8eabaa572a17733 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Tue, 26 Mar 2024 15:43:03 +0100 Subject: [PATCH 5/8] Stability improvement for future manifests --- Duplicati/Library/AutoUpdater/UpdaterManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Duplicati/Library/AutoUpdater/UpdaterManager.cs b/Duplicati/Library/AutoUpdater/UpdaterManager.cs index abe61868a..90755af94 100644 --- a/Duplicati/Library/AutoUpdater/UpdaterManager.cs +++ b/Duplicati/Library/AutoUpdater/UpdaterManager.cs @@ -425,7 +425,7 @@ namespace Duplicati.Library.AutoUpdater public static bool DownloadAndUnpackUpdate(UpdateInfo version, Action progress = null) { - if (INSTALLDIR == null) + if (INSTALLDIR == null || version == null || version.RemoteURLS == null) return false; From 9f0810612a09b5fbbb6409a76aa126f3399bf0d4 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Tue, 2 Apr 2024 22:31:55 +0200 Subject: [PATCH 6/8] Changed logic for reporting exceptions, so all statistics are reported despite an exception stopping the backup --- .../Interface/IGenericCallbackModule.cs | 3 +- Duplicati/Library/Main/Controller.cs | 72 ++++++++++--------- .../Library/Modules/Builtin/ReportHelper.cs | 15 ++-- .../DuplicatiFormatSerializer.cs | 13 +++- .../IResultFormatSerializer.cs | 4 +- .../JsonFormatSerializer.cs | 6 +- .../Library/Modules/Builtin/RunScript.cs | 9 +-- .../Modules/Builtin/SendHttpMessage.cs | 4 +- .../Modules/Builtin/SendJabberMessage.cs | 4 +- 9 files changed, 76 insertions(+), 54 deletions(-) diff --git a/Duplicati/Library/Interface/IGenericCallbackModule.cs b/Duplicati/Library/Interface/IGenericCallbackModule.cs index a4d8f7087..972d227e8 100644 --- a/Duplicati/Library/Interface/IGenericCallbackModule.cs +++ b/Duplicati/Library/Interface/IGenericCallbackModule.cs @@ -38,6 +38,7 @@ namespace Duplicati.Library.Interface /// Called when the operation finishes /// /// The result object, if this derives from an exception, the operation failed - void OnFinish(object result); + /// The exception that stopped the backup, or null + void OnFinish(object result, Exception exception); } } diff --git a/Duplicati/Library/Main/Controller.cs b/Duplicati/Library/Main/Controller.cs index 727611dfa..53872261b 100644 --- a/Duplicati/Library/Main/Controller.cs +++ b/Duplicati/Library/Main/Controller.cs @@ -1,23 +1,23 @@ -// Copyright (C) 2024, The Duplicati Team -// https://duplicati.com, hello@duplicati.com -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. +// Copyright (C) 2024, The Duplicati Team +// https://duplicati.com, hello@duplicati.com +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. using System; using System.Collections.Generic; @@ -441,7 +441,7 @@ namespace Duplicati.Library.Main r.Interrupted = false; } - OnOperationComplete(result); + OnOperationComplete(result, null); Logging.Log.WriteInformationMessage(LOGTAG, "CompletedOperation", Strings.Controller.CompletedOperationMessage(m_options.MainAction)); @@ -469,23 +469,26 @@ namespace Duplicati.Library.Main db.WriteResults(); } - OnOperationComplete(result); + // Do not propagate the cancel exception + OnOperationComplete(result, null); } catch { } } else { // Perform the module shutdown - OnOperationComplete(ex); + OnOperationComplete(ex, ex); } return result; } else { - try + Logging.Log.WriteErrorMessage(LOGTAG, "FailedOperation", ex, Strings.Controller.FailedOperationMessage(m_options.MainAction, ex.Message)); + + if (result is BasicResults basicResults) { - if (result is BasicResults basicResults) + try { basicResults.OperationProgressUpdater.UpdatePhase(OperationPhase.Error); basicResults.Fatal = true; @@ -498,13 +501,18 @@ namespace Duplicati.Library.Main db.WriteResults(); } } + + // Report the result, and the failure + OnOperationComplete(result, ex); + } + catch { } + } + else + { + // Perform the module shutdown + OnOperationComplete(ex, ex); } - catch { } - - OnOperationComplete(ex); - - Logging.Log.WriteErrorMessage(LOGTAG, "FailedOperation", ex, Strings.Controller.FailedOperationMessage(m_options.MainAction, ex.Message)); throw; } @@ -538,13 +546,13 @@ namespace Duplicati.Library.Main System.Globalization.CultureInfo.DefaultThreadCurrentUICulture = uiLocale; } - private void OnOperationComplete(object result) + private void OnOperationComplete(object result, Exception exception) { if (m_options != null && m_options.LoadedModules != null) { foreach (KeyValuePair mx in m_options.LoadedModules) if (mx.Key && mx.Value is IGenericCallbackModule module) - try { module.OnFinish(result); } + try { module.OnFinish(result, exception); } catch (Exception ex) { Logging.Log.WriteWarningMessage(LOGTAG, $"OnFinishError{mx.Key}", ex, "OnFinish callback {0} failed: {1}", mx.Key, ex.Message); } foreach (KeyValuePair mx in m_options.LoadedModules) diff --git a/Duplicati/Library/Modules/Builtin/ReportHelper.cs b/Duplicati/Library/Modules/Builtin/ReportHelper.cs index 583200f14..8c8b3f263 100644 --- a/Duplicati/Library/Modules/Builtin/ReportHelper.cs +++ b/Duplicati/Library/Modules/Builtin/ReportHelper.cs @@ -297,8 +297,9 @@ namespace Duplicati.Library.Modules.Builtin /// The expanded template. /// The input template. /// The result object. + /// An optional exception that has stopped the backup /// If set to true, the result is intended for a subject or title line. - protected virtual string ReplaceTemplate(string input, object result, bool subjectline) + protected virtual string ReplaceTemplate(string input, object result, Exception exception, bool subjectline) { // For JSON, ignore the template and just use the contents if (ExportFormat == ResultExportFormat.Json && !subjectline) @@ -339,7 +340,7 @@ namespace Duplicati.Library.Modules.Builtin if (input.IndexOf($"%{kv.Key}%", StringComparison.OrdinalIgnoreCase) >= 0) extra[kv.Key] = kv.Value; - return m_resultFormatSerializer.Serialize(result, LogLines, extra); + return m_resultFormatSerializer.Serialize(result, exception, LogLines, extra); } else { @@ -355,7 +356,7 @@ namespace Duplicati.Library.Modules.Builtin else { if (input.IndexOf("%RESULT%", StringComparison.OrdinalIgnoreCase) >= 0) - input = Regex.Replace(input, "\\%RESULT\\%", m_resultFormatSerializer.Serialize(result, LogLines, null), RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); + input = Regex.Replace(input, "\\%RESULT\\%", m_resultFormatSerializer.Serialize(result, exception, LogLines, null), RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); } foreach (KeyValuePair kv in m_options) @@ -394,7 +395,7 @@ namespace Duplicati.Library.Modules.Builtin } } - public void OnFinish(object result) + public void OnFinish(object result, Exception exception) { // Dispose the current log scope if (m_logscope != null) @@ -412,7 +413,7 @@ namespace Duplicati.Library.Modules.Builtin return; ParsedResultType level; - if (result is Exception) + if (result is Exception || exception != null) level = ParsedResultType.Fatal; else if (result != null && result is IBasicResults results) level = results.ParsedResult; @@ -438,8 +439,8 @@ namespace Duplicati.Library.Modules.Builtin if (body != DEFAULT_BODY && System.IO.Path.IsPathRooted(body) && System.IO.File.Exists(body)) body = System.IO.File.ReadAllText(body); - body = ReplaceTemplate(body, result, false); - subject = ReplaceTemplate(subject, result, true); + body = ReplaceTemplate(body, result, exception, false); + subject = ReplaceTemplate(subject, result, exception, true); SendMessage(subject, body); } diff --git a/Duplicati/Library/Modules/Builtin/ResultSerialization/DuplicatiFormatSerializer.cs b/Duplicati/Library/Modules/Builtin/ResultSerialization/DuplicatiFormatSerializer.cs index e57596fc0..78f15de10 100644 --- a/Duplicati/Library/Modules/Builtin/ResultSerialization/DuplicatiFormatSerializer.cs +++ b/Duplicati/Library/Modules/Builtin/ResultSerialization/DuplicatiFormatSerializer.cs @@ -37,12 +37,19 @@ namespace Duplicati.Library.Modules.Builtin.ResultSerialization /// /// The serialized result string. /// The result to serialize. + /// The exception, if any /// The log lines to serialize. /// Additional parameters to include - public string Serialize(object result, IEnumerable loglines, Dictionary additional) + public string Serialize(object result, Exception failException, IEnumerable loglines, Dictionary additional) { StringBuilder sb = new StringBuilder(); + // Prepend the error message as the first two lines, to mimic previous behavior with only the exception text + if (failException != null && result != failException) + { + sb.AppendLine(Serialize(failException, null, null, null)); + } + if (result == null) { sb.Append("null?"); @@ -105,7 +112,7 @@ namespace Duplicati.Library.Modules.Builtin.ResultSerialization } else { - var ignore = new string[] { + var ignore = new string[] { nameof(IBasicResults.Warnings), nameof(IBasicResults.Errors), nameof(IBasicResults.Messages) @@ -115,7 +122,7 @@ namespace Duplicati.Library.Modules.Builtin.ResultSerialization } if (additional != null && additional.Count > 0) - sb.AppendLine(Serialize(additional, null, null)); + sb.AppendLine(Serialize(additional, null, null, null)); if (loglines != null && loglines.Any()) { diff --git a/Duplicati/Library/Modules/Builtin/ResultSerialization/IResultFormatSerializer.cs b/Duplicati/Library/Modules/Builtin/ResultSerialization/IResultFormatSerializer.cs index f84cc463a..2eb2f2d29 100644 --- a/Duplicati/Library/Modules/Builtin/ResultSerialization/IResultFormatSerializer.cs +++ b/Duplicati/Library/Modules/Builtin/ResultSerialization/IResultFormatSerializer.cs @@ -18,6 +18,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. +using System; using System.Collections.Generic; namespace Duplicati.Library.Modules.Builtin @@ -32,9 +33,10 @@ namespace Duplicati.Library.Modules.Builtin /// /// The serialized result string. /// The result to serialize. + /// An optional failure exception, or null /// The log lines to serialize. /// Additional parameters to include - string Serialize(object result, IEnumerable loglines, Dictionary additional); + string Serialize(object result, Exception exception, IEnumerable loglines, Dictionary additional); /// /// Returns the format that the serializer represents diff --git a/Duplicati/Library/Modules/Builtin/ResultSerialization/JsonFormatSerializer.cs b/Duplicati/Library/Modules/Builtin/ResultSerialization/JsonFormatSerializer.cs index a004922e3..05d17aa0c 100644 --- a/Duplicati/Library/Modules/Builtin/ResultSerialization/JsonFormatSerializer.cs +++ b/Duplicati/Library/Modules/Builtin/ResultSerialization/JsonFormatSerializer.cs @@ -76,16 +76,18 @@ namespace Duplicati.Library.Modules.Builtin.ResultSerialization /// /// The serialized result string. /// The result to serialize. + /// The exception, if any /// The log lines to serialize. /// Additional parameters to include - public string Serialize(object result, IEnumerable loglines, Dictionary additional) + public string Serialize(object result, Exception exception, IEnumerable loglines, Dictionary additional) { return JsonConvert.SerializeObject( new { Data = result, Extra = additional, - LogLines = loglines + LogLines = loglines, + Exception = exception?.ToString() }, new JsonSerializerSettings() diff --git a/Duplicati/Library/Modules/Builtin/RunScript.cs b/Duplicati/Library/Modules/Builtin/RunScript.cs index 2fce8e9d5..379f45c33 100644 --- a/Duplicati/Library/Modules/Builtin/RunScript.cs +++ b/Duplicati/Library/Modules/Builtin/RunScript.cs @@ -170,7 +170,7 @@ namespace Duplicati.Library.Modules.Builtin m_localpath = localpath; } - public void OnFinish (object result) + public void OnFinish (object result, Exception exception) { // Dispose the current log scope if (m_logscope != null) @@ -184,7 +184,8 @@ namespace Duplicati.Library.Modules.Builtin return; ParsedResultType level; - if (result is OperationAbortException oae) + OperationAbortException oae = result as OperationAbortException ?? exception as OperationAbortException; + if (oae != null) { switch (oae.AbortReason) { @@ -202,7 +203,7 @@ namespace Duplicati.Library.Modules.Builtin break; } } - else if (result is Exception) + else if (result is Exception || exception != null) level = ParsedResultType.Fatal; else if (result != null && result is IBasicResults results) level = results.ParsedResult; @@ -212,7 +213,7 @@ namespace Duplicati.Library.Modules.Builtin using (TempFile tmpfile = new TempFile()) { using (var streamWriter = new StreamWriter(tmpfile)) - streamWriter.Write(resultFormatSerializer.Serialize(result, m_logstorage, null)); + streamWriter.Write(resultFormatSerializer.Serialize(result, exception, m_logstorage, null)); Execute(m_finishScript, "AFTER", m_operationName, ref m_remoteurl, ref m_localpath, m_timeout, false, m_options, tmpfile, level); } diff --git a/Duplicati/Library/Modules/Builtin/SendHttpMessage.cs b/Duplicati/Library/Modules/Builtin/SendHttpMessage.cs index 33b725dff..18a3b9051 100644 --- a/Duplicati/Library/Modules/Builtin/SendHttpMessage.cs +++ b/Duplicati/Library/Modules/Builtin/SendHttpMessage.cs @@ -206,13 +206,13 @@ namespace Duplicati.Library.Modules.Builtin { #endregion - protected override string ReplaceTemplate(string input, object result, bool subjectline) + protected override string ReplaceTemplate(string input, object result, Exception exception, bool subjectline) { // No need to do the expansion as we throw away the result if (subjectline) return string.Empty; - return base.ReplaceTemplate(input, result, subjectline); + return base.ReplaceTemplate(input, result, exception, subjectline); } protected override void SendMessage(string subject, string body) { diff --git a/Duplicati/Library/Modules/Builtin/SendJabberMessage.cs b/Duplicati/Library/Modules/Builtin/SendJabberMessage.cs index e1cd01d34..0d3bbe495 100644 --- a/Duplicati/Library/Modules/Builtin/SendJabberMessage.cs +++ b/Duplicati/Library/Modules/Builtin/SendJabberMessage.cs @@ -185,12 +185,12 @@ namespace Duplicati.Library.Modules.Builtin #endregion - protected override string ReplaceTemplate(string input, object result, bool subjectline) + protected override string ReplaceTemplate(string input, object result, Exception exception, bool subjectline) { // No need to do the expansion as we throw away the result if (subjectline) return string.Empty; - return base.ReplaceTemplate(input, result, subjectline); + return base.ReplaceTemplate(input, result, exception, subjectline); } protected override void SendMessage(string subject, string body) From 23065d44ef142c104d47ef84e083b51cdf5d54ff Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Wed, 3 Apr 2024 11:24:57 +0200 Subject: [PATCH 7/8] Version bump to v2.0.7.102-2.0.7.102_canary_2024-04-03 You can download this build from: Binaries: https://updates.duplicati.com/canary/duplicati-2.0.7.102_canary_2024-04-03.zip Signature file: https://updates.duplicati.com/canary/duplicati-2.0.7.102_canary_2024-04-03.zip.sig ASCII signature file: https://updates.duplicati.com/canary/duplicati-2.0.7.102_canary_2024-04-03.zip.sig.asc MD5: c08ebf88cc6b4c164b6dcb3da5a2af94 SHA1: c593036adda4b2599023e88398c9aa59f57cb91b SHA256: 46df0472bce7e63554808dd6924b957eb2cd4d7c08b76129d590c2d3c9aa40c2 --- Updates/build_version.txt | 2 +- changelog.txt | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Updates/build_version.txt b/Updates/build_version.txt index 398050c62..257e56326 100644 --- a/Updates/build_version.txt +++ b/Updates/build_version.txt @@ -1 +1 @@ -101 +102 diff --git a/changelog.txt b/changelog.txt index 7d7bc1cc0..503b23f36 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,17 @@ +2024-04-03 - 2.0.7.102_canary_2024-04-03 +========== +This build is intended to be the last build that uses .Net4 (aka .Net Desktop). +Future builds are expected to use .Net8 and will require a manual update, +because the .Net builds are no longer operating system independent. + +The upside is that there are fewer dependencies (no more Mono), +and execution times are greatly improved. + +* Removed donation messages +* Updated MacOS Installer license text +* Updated installer to support future manual upgrade +* Added information to reports when encountering an exception + 2024-03-08 - 2.0.7.101_canary_2024-03-08 ========== * Updated license to MIT, thanks @kenkendk From 62f707be6d75c8f71de118ef2b4ddddd36fc4efe Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Thu, 18 Apr 2024 14:07:05 +0200 Subject: [PATCH 8/8] Fixed including the machineId in reports --- .../Duplicati.Library.Modules.Builtin.csproj | 3 ++ .../Library/Modules/Builtin/ReportHelper.cs | 42 +++++++++---------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj index 440bc2118..012a144ca 100644 --- a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj +++ b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj @@ -132,6 +132,9 @@ {D63E53E4-A458-4C2F-914D-92F715F58ACF} Duplicati.Library.Common + + Duplicati.Library.AutoUpdater + diff --git a/Duplicati/Library/Modules/Builtin/ReportHelper.cs b/Duplicati/Library/Modules/Builtin/ReportHelper.cs index 8c8b3f263..62b6ec2a4 100644 --- a/Duplicati/Library/Modules/Builtin/ReportHelper.cs +++ b/Duplicati/Library/Modules/Builtin/ReportHelper.cs @@ -40,8 +40,8 @@ namespace Duplicati.Library.Modules.Builtin /// private static readonly string LOGTAG = Logging.Log.LogTagFromType(); - /// - /// The salt used for calculating a backup Id from the remote URL + /// + /// The salt used for calculating a backup Id from the remote URL /// private const string SALT = "DUPL"; @@ -313,21 +313,21 @@ namespace Duplicati.Library.Modules.Builtin if (input.IndexOf("%LOCALPATH%", StringComparison.OrdinalIgnoreCase) >= 0 && m_localpath != null) extra["LocalPath"] = string.Join(System.IO.Path.PathSeparator.ToString(), m_localpath); if (input.IndexOf("%PARSEDRESULT%", StringComparison.OrdinalIgnoreCase) >= 0) - extra["ParsedResult"] = m_parsedresultlevel; - - // If the options contains the key, it is captured by the loop over m_options - // so we only patch it in case it is missing - - if (input.IndexOf("%machine-id%", StringComparison.OrdinalIgnoreCase) >= 0) - { - if (!m_options.ContainsKey("machine-id")) - extra["machine-id"] = ""; + extra["ParsedResult"] = m_parsedresultlevel; + + // If the options contains the key, it is captured by the loop over m_options + // so we only patch it in case it is missing + + if (input.IndexOf("%machine-id%", StringComparison.OrdinalIgnoreCase) >= 0) + { + if (!m_options.ContainsKey("machine-id")) + extra["machine-id"] = Library.AutoUpdater.UpdaterManager.InstallID; } - - if (input.IndexOf("%backup-id%", StringComparison.OrdinalIgnoreCase) >= 0) - { - if (!m_options.ContainsKey("backup-id")) - extra["backup-id"] = Library.Utility.Utility.ByteArrayAsHexString(Library.Utility.Utility.RepeatedHashWithSalt(m_remoteurl, SALT)); + + if (input.IndexOf("%backup-id%", StringComparison.OrdinalIgnoreCase) >= 0) + { + if (!m_options.ContainsKey("backup-id")) + extra["backup-id"] = Library.Utility.Utility.ByteArrayAsHexString(Library.Utility.Utility.RepeatedHashWithSalt(m_remoteurl, SALT)); } if (input.IndexOf("%backup-name%", StringComparison.OrdinalIgnoreCase) >= 0) @@ -363,13 +363,13 @@ namespace Duplicati.Library.Modules.Builtin input = Regex.Replace(input, "\\%" + kv.Key + "\\%", kv.Value ?? "", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); if (!m_options.ContainsKey("backup-name")) - input = Regex.Replace(input, "\\%backup-name\\%", System.IO.Path.GetFileNameWithoutExtension(Duplicati.Library.Utility.Utility.getEntryAssembly().Location) ?? "", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); - - if (!m_options.ContainsKey("backup-id")) - input = Regex.Replace(input, "\\%backup-id\\%", Library.Utility.Utility.ByteArrayAsHexString(Library.Utility.Utility.RepeatedHashWithSalt(m_remoteurl, SALT)), RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); + input = Regex.Replace(input, "\\%backup-name\\%", System.IO.Path.GetFileNameWithoutExtension(Duplicati.Library.Utility.Utility.getEntryAssembly().Location) ?? "", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); + + if (!m_options.ContainsKey("backup-id")) + input = Regex.Replace(input, "\\%backup-id\\%", Library.Utility.Utility.ByteArrayAsHexString(Library.Utility.Utility.RepeatedHashWithSalt(m_remoteurl, SALT)), RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); if (!m_options.ContainsKey("machine-id")) - input = Regex.Replace(input, "\\%machine-id\\%", "", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); + input = Regex.Replace(input, "\\%machine-id\\%", Library.AutoUpdater.UpdaterManager.InstallID, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); input = Regex.Replace(input, "\\%[^\\%]+\\%", ""); return input;