Skip to content

Commit f2bb383

Browse files
committed
Remove PackageCacher class
1 parent a653e41 commit f2bb383

File tree

3 files changed

+19
-145
lines changed

3 files changed

+19
-145
lines changed

src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/PackageManager.cs

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,8 @@ private IReadOnlyList<IPackage> _findPackages(string query, bool SecondAttempt)
213213
task.Wait();
214214
}
215215

216-
Package[] packages = task.GetAwaiter().GetResult().ToArray();
217-
218-
for (int i = 0; i < packages.Length; i++)
219-
{
220-
packages[i] = PackageCacher.GetAvailablePackage(packages[i]);
221-
}
222-
Logger.Info($"Found {packages.Length} available packages from {Name} with the query {query}");
216+
var packages = task.GetAwaiter().GetResult();
217+
Logger.Info($"Found {packages.Count} available packages from {Name} with the query {query}");
223218
return packages;
224219
}
225220
catch (Exception e)
@@ -263,14 +258,8 @@ private IReadOnlyList<IPackage> _getAvailableUpdates(bool SecondAttempt)
263258
task.Wait();
264259
}
265260

266-
Package[] packages = task.GetAwaiter().GetResult().ToArray();
267-
268-
for (int i = 0; i < packages.Length; i++)
269-
{
270-
packages[i] = PackageCacher.GetUpgradablePackage(packages[i]);
271-
}
272-
273-
Logger.Info($"Found {packages.Length} available updates from {Name}");
261+
var packages = task.GetAwaiter().GetResult();
262+
Logger.Info($"Found {packages.Count} available updates from {Name}");
274263
return packages;
275264
}
276265
catch (Exception e)
@@ -312,14 +301,8 @@ private IReadOnlyList<IPackage> _getInstalledPackages(bool SecondAttempt)
312301
task.Wait();
313302
}
314303

315-
Package[] packages = task.GetAwaiter().GetResult().ToArray();
316-
317-
for (int i = 0; i < packages.Length; i++)
318-
{
319-
packages[i] = PackageCacher.GetInstalledPackage(packages[i]);
320-
}
321-
322-
Logger.Info($"Found {packages.Length} installed packages from {Name}");
304+
var packages = task.GetAwaiter().GetResult();
305+
Logger.Info($"Found {packages.Count} installed packages from {Name}");
323306
return packages;
324307
}
325308
catch (Exception e)
@@ -370,9 +353,12 @@ public virtual void RefreshPackageIndexes()
370353
Logger.Debug($"Manager {Name} has not implemented RefreshPackageIndexes");
371354
}
372355

356+
/// <summary>
357+
/// Attempt a live, fast, repair method when an exception occurs (for example, reconnect to COM Server)
358+
/// </summary>
373359
public virtual void AttemptFastRepair()
374360
{
375-
// Implementing this method is optional
361+
Logger.Debug($"Manager {Name} has not implemented AttemptFastRepair");
376362
}
377363
}
378364
}

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/PackageCacher.cs

Lines changed: 0 additions & 120 deletions
This file was deleted.

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,15 @@ public virtual void SetTag(PackageTag tag)
279279

280280
public virtual bool NewerVersionIsInstalled()
281281
{
282-
return PackageCacher.NewerVersionIsInstalled(this);
282+
foreach (var p in GetInstalledPackages())
283+
{
284+
if (p.NormalizedVersion >= this.NormalizedNewVersion)
285+
{
286+
return true;
287+
}
288+
}
289+
290+
return false;
283291
}
284292

285293
public async Task<string?> GetInstallerFileName()

0 commit comments

Comments
 (0)