checkpoint

Alpm/PackageList.cs

@@ -2,39 +2,42 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace Foodsoft.Alpm
 {
-    public struct PackageList : IEnumerable<Package>, IDisposable
+    public class PackageList : ICollection<CachePackage>
     {
-        private SafeListHandle<SafeDatabaseHandle> _handle;
-        private Database _db;
+        private readonly SafeDatabaseHandle _parentHandle;
+        private readonly IntPtr _listPtr;
+        private readonly Database _db;
 
-        internal PackageList(SafeListHandle<SafeDatabaseHandle> handle, Database db)
+        internal PackageList(IntPtr listPtr, SafeDatabaseHandle parentHandle, Database db)
         {
-            _handle = handle;
+            _parentHandle = parentHandle;
+            _listPtr = listPtr;
             _db = db;
         }
 
-        public IEnumerator<Package> GetEnumerator()
+        public IEnumerator<CachePackage> GetEnumerator()
         {
             var release = false;
-
+        
             RuntimeHelpers.PrepareConstrainedRegions();
             try
             {
-                _handle.DangerousAddRef(ref release);
-                if (!release) throw new ObjectDisposedException(_handle.GetType().FullName);
-                for (var list = _handle.DangerousGetHandle(); list != IntPtr.Zero; list = Wrapper.ListNext(list))
+                _parentHandle.DangerousAddRef(ref release);
+                if (!release) throw new ObjectDisposedException(_parentHandle.GetType().FullName);
+                for (var list = _listPtr; list != IntPtr.Zero; list = Wrapper.ListNext(list))
                 {
                     yield return new CachePackage(
-                        new SafeCachePackageHandle(Wrapper.ListData(list), _handle.ParentHandle), _db);
+                        new SafeCachePackageHandle(Wrapper.ListData(list), _parentHandle), _db);
                 }
             }
             finally
             {
                 if (release)
-                    _handle.DangerousRelease();
+                    _parentHandle.DangerousRelease();
             }
         }
 
@@ -42,10 +45,51 @@ namespace Foodsoft.Alpm
         {
             return GetEnumerator();
         }
-
-        public void Dispose()
+        public bool Contains(CachePackage item)
         {
-            _handle.Dispose();
+            var name = item.Name;
+
+            return _parentHandle.UseHandle(_listPtr, (list) =>
+            {
+                for (; list != IntPtr.Zero; list = Wrapper.ListNext(list))
+                {
+                    if (name == alpm.alpm_pkg_get_name(list))
+                        return true;
+                }
+
+                return false;
+            });
         }
+
+        public void CopyTo(CachePackage[] array, int arrayIndex)
+        {
+            _parentHandle.UseHandle(_listPtr,(list) =>
+            {
+                for (; list != IntPtr.Zero; list = Wrapper.ListNext(list))
+                {
+                    array[arrayIndex++] = new CachePackage(
+                        new SafeCachePackageHandle(Wrapper.ListData(list), _parentHandle), _db);
+                }
+                return 0;
+            });
+        }
+
+        public void Add(CachePackage item)
+        {
+            throw new NotSupportedException();
+        }
+
+        public bool Remove(CachePackage item)
+        {
+            throw new NotSupportedException();
+        }
+        public void Clear()
+        {
+            throw new NotSupportedException();
+        }
+
+        public int Count => _parentHandle.UseHandle(_listPtr,(list) => (int) alpm.alpm_list_count(list));
+
+        public bool IsReadOnly => true;
     }
 }