From 8c9c03cd427a6536b20ecc7a660f0207e23bf88b Mon Sep 17 00:00:00 2001 From: xx-TheDoctor-xx Date: Sat, 18 Apr 2020 06:33:58 +0100 Subject: [PATCH] Update Removed the asking stuff --- PMF/src/Managers/PackageManager.cs | 68 ++++---------------------- PMF/src/{ => Managers}/PackageState.cs | 1 - README.md | 2 + 3 files changed, 12 insertions(+), 59 deletions(-) rename PMF/src/{ => Managers}/PackageState.cs (94%) diff --git a/PMF/src/Managers/PackageManager.cs b/PMF/src/Managers/PackageManager.cs index 5bc0ede..20cdb33 100644 --- a/PMF/src/Managers/PackageManager.cs +++ b/PMF/src/Managers/PackageManager.cs @@ -112,14 +112,9 @@ namespace PMF.Managers if (asset == null) return PackageState.VersionNotFound; - if (validateSdkVersion(asset)) - { - // If it is not installed, packageDirectory will have the value of the directory where the package should be - package = remotePackage; - return InstallPackage(remotePackage, asset); - } - - return PackageState.Cancelled; + // If it is not installed, packageDirectory will have the value of the directory where the package should be + package = remotePackage; + return InstallPackage(remotePackage, asset); } public static bool Uninstall(string id) @@ -151,13 +146,8 @@ namespace PMF.Managers if (localPackage.Assets[0].Version == asset.Version) return PackageState.UpToDate; - if (validateSdkVersion(asset)) - { - Uninstall(id); - return InstallPackage(remotePackage, asset); - } - - return PackageState.Cancelled; + Uninstall(id); + return InstallPackage(remotePackage, asset); } /// @@ -184,13 +174,8 @@ namespace PMF.Managers var asset = remotePackage.GetAssetVersion(version); - if (validateSdkVersion(asset)) - { - Uninstall(id); - return InstallPackage(remotePackage, asset); - } - - return PackageState.Cancelled; + Uninstall(id); + return InstallPackage(remotePackage, asset); } /// @@ -198,7 +183,7 @@ namespace PMF.Managers /// /// /// true if update success, false if package is not installed - public static PackageState UpdateBySdkVersion(string id, out Package package, bool dontAsk = false) + public static PackageState UpdateBySdkVersion(string id, out Package package) { package = null; @@ -220,41 +205,8 @@ namespace PMF.Managers if (localPackage.Assets[0].Version == asset.Version) return PackageState.UpToDate; - if (dontAsk || validateSdkVersion(asset)) - { - Uninstall(id); - return InstallPackage(remotePackage, asset); - } - - return PackageState.Cancelled; - } - - private static bool validateSdkVersion(Asset asset) - { - if (asset.SdkVersion > Config.CurrentSdkVersion) - return askUser("You are installing a package which the sdk version is more recent than what you have. Would you like to continue?"); - else if (asset.SdkVersion < Config.CurrentSdkVersion) - return askUser("You are installing a package which the sdk version is older than what you have. Would you like to continue?"); - - return true; - } - - /// - /// Just asks the user something - /// - /// true yes, false no - private static bool askUser(string question) - { - Console.WriteLine($"{question} [Y][N]"); - while (true) - { - char answer = char.ToLower(Console.ReadKey().KeyChar); - - if (answer == 'n') - return false; - else if (answer == 'y') - return true; - } + Uninstall(id); + return InstallPackage(remotePackage, asset); } } } diff --git a/PMF/src/PackageState.cs b/PMF/src/Managers/PackageState.cs similarity index 94% rename from PMF/src/PackageState.cs rename to PMF/src/Managers/PackageState.cs index aa0b769..a8737f6 100644 --- a/PMF/src/PackageState.cs +++ b/PMF/src/Managers/PackageState.cs @@ -16,7 +16,6 @@ namespace PMF NotExisting, VersionNotFound, - Cancelled, Failed } } diff --git a/README.md b/README.md index 3652c56..3b049ff 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # PMF - Package Management Framework +[![Build Status](https://travis-ci.com/xX-TheDoctor-Xx/PMF.svg?branch=master)](https://travis-ci.com/xX-TheDoctor-Xx/PMF) + PMF is a barebones C# library that provides basic support for package management # Features