tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish migrating default Configuration values into Configuration

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2023-01-09 15:25:02 -07:00
commit ece93cb4d7
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/AppScaffolding/AppScaffolding.csproj
View File

@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<Version>8.8.1.1</Version> <Version>8.8.2.1</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Octokit" Version="4.0.3" /> <PackageReference Include="Octokit" Version="4.0.3" />

4
Source/LibationFileManager/Configuration.PersistentSettings.cs
View File

@ -138,7 +138,7 @@ namespace LibationFileManager
public Dictionary<string, int> GridColumnsWidths { get => GetNonString(defaultValue: new EquatableDictionary<string, int>()).Clone(); set => SetNonString(value); } public Dictionary<string, int> GridColumnsWidths { get => GetNonString(defaultValue: new EquatableDictionary<string, int>()).Clone(); set => SetNonString(value); }
[Description("Save cover image alongside audiobook?")] [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?")] [Description("Download clips and bookmarks?")]
public bool DownloadClipsBookmarks { get => GetNonString(defaultValue: false); set => SetNonString(value); } 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")] [Description("How to format the folders in which files will be saved")]
public string FolderTemplate 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); set => setTemplate(Templates.Folder, value);
} }

3
Source/LibationFileManager/Configuration.cs
View File

@ -24,9 +24,6 @@ namespace LibationFileManager
if (booksDir is null || !Directory.Exists(booksDir)) if (booksDir is null || !Directory.Exists(booksDir))
return false; return false;
if (string.IsNullOrWhiteSpace(pDic.GetString(nameof(InProgress))))
return false;
return true; return true;
} }

20
Source/targz2deb.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
FILE=$1 FILE=$1; shift
VERSION=$1; shift
if [ -z "$FILE" ] if [ -z "$FILE" ]
then then
@ -14,6 +15,20 @@ then
exit exit
fi 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" # remove trailing ".tar.gz"
FOLDER_MAIN=${FILE::-7} FOLDER_MAIN=${FILE::-7}
echo "Working dir: $FOLDER_MAIN" echo "Working dir: $FOLDER_MAIN"
@ -97,7 +112,7 @@ chmod 666 /usr/lib/libation/appsettings.json
echo "Creating control file..." echo "Creating control file..."
echo "Package: Libation echo "Package: Libation
Version: 8.7.0 Version: $VERSION
Architecture: all Architecture: all
Essential: no Essential: no
Priority: optional Priority: optional
@ -116,3 +131,4 @@ dpkg-deb --build $FOLDER_MAIN
rm -r "$FOLDER_MAIN" rm -r "$FOLDER_MAIN"
echo "Done!" echo "Done!"