diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index 1a6bc632..8491086e 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -2,7 +2,7 @@ net7.0 - 8.8.1.1 + 8.8.2.1 diff --git a/Source/LibationFileManager/Configuration.PersistentSettings.cs b/Source/LibationFileManager/Configuration.PersistentSettings.cs index dc5e2686..b8e3c4ee 100644 --- a/Source/LibationFileManager/Configuration.PersistentSettings.cs +++ b/Source/LibationFileManager/Configuration.PersistentSettings.cs @@ -138,7 +138,7 @@ namespace LibationFileManager public Dictionary GridColumnsWidths { get => GetNonString(defaultValue: new EquatableDictionary()).Clone(); set => SetNonString(value); } [Description("Save cover image alongside audiobook?")] - public bool DownloadCoverArt { get => GetNonString(defaultValue: true); set => SetNonString(value); } + public bool DownloadCoverArt { get => GetNonString(defaultValue: false); set => SetNonString(value); } [Description("Download clips and bookmarks?")] public bool DownloadClipsBookmarks { get => GetNonString(defaultValue: false); set => SetNonString(value); } @@ -215,7 +215,7 @@ namespace LibationFileManager [Description("How to format the folders in which files will be saved")] public string FolderTemplate { - get => Templates.Folder.GetValid(GetString(Templates.Folder.DefaultTemplate)); + get => Templates.Folder.GetValid(GetString(defaultValue: Templates.Folder.DefaultTemplate)); set => setTemplate(Templates.Folder, value); } diff --git a/Source/LibationFileManager/Configuration.cs b/Source/LibationFileManager/Configuration.cs index d40ba59a..d66d0c13 100644 --- a/Source/LibationFileManager/Configuration.cs +++ b/Source/LibationFileManager/Configuration.cs @@ -24,9 +24,6 @@ namespace LibationFileManager if (booksDir is null || !Directory.Exists(booksDir)) return false; - if (string.IsNullOrWhiteSpace(pDic.GetString(nameof(InProgress)))) - return false; - return true; } diff --git a/Source/targz2deb.sh b/Source/targz2deb.sh index d5591f48..67c675ee 100644 --- a/Source/targz2deb.sh +++ b/Source/targz2deb.sh @@ -1,6 +1,7 @@ #!/bin/bash -FILE=$1 +FILE=$1; shift +VERSION=$1; shift if [ -z "$FILE" ] then @@ -14,6 +15,20 @@ then exit fi +if [ -z "$VERSION" ] +then + echo "This script must be called with the Libation version number as an argument." + exit +fi + +contains() { case "$1" in *"$2"*) true ;; *) false ;; esac } + +if ! contains "$FILE" "$VERSION" +then + echo "This script must be called with a Libation version number that is present in the filename passed." + exit +fi + # remove trailing ".tar.gz" FOLDER_MAIN=${FILE::-7} echo "Working dir: $FOLDER_MAIN" @@ -97,7 +112,7 @@ chmod 666 /usr/lib/libation/appsettings.json echo "Creating control file..." echo "Package: Libation -Version: 8.7.0 +Version: $VERSION Architecture: all Essential: no Priority: optional @@ -116,3 +131,4 @@ dpkg-deb --build $FOLDER_MAIN rm -r "$FOLDER_MAIN" echo "Done!" +