atom: export version operator for Atom and Version objects

Author: radhermit

src/pkgcraft/atom/__init__.py

@@ -1,2 +1,2 @@
 from .base import Atom, Blocker, Cpv, SlotOperator
-from .version import Version, VersionWithOp
+from .version import Operator, Version, VersionWithOp

src/pkgcraft/atom/base.pyx

@@ -325,6 +325,25 @@ cdef class Atom(Cpv):
             return Blocker(blocker)
         return None
 
+    @property
+    def op(self):
+        """Get an atom's operator.
+
+        >>> from pkgcraft.atom import Atom, Operator
+        >>> a = Atom('cat/pkg')
+        >>> a.op is None
+        True
+        >>> a = Atom('>=cat/pkg-1')
+        >>> a.op is Operator.GreaterOrEqual
+        True
+        >>> a.op == '>='
+        True
+        """
+        version = self.version
+        if version is not None:
+            return version.op
+        return version
+
     @property
     def slot(self):
         """Get an atom's slot.

src/pkgcraft/atom/version.pxd

@@ -2,12 +2,12 @@ from pkgcraft cimport pkgcraft_c as C
 
 
 cdef class Version:
-    cdef C.AtomVersion *ptr
+    cdef C.Version *ptr
     # cached fields
     cdef int _hash
 
     @staticmethod
-    cdef Version from_ptr(C.AtomVersion *)
+    cdef Version from_ptr(C.Version *)
 
 
 cdef class VersionWithOp(Version):

src/pkgcraft/atom/version.pyx

@@ -1,7 +1,37 @@
+from enum import IntEnum
+
 from .. cimport pkgcraft_c as C
 from ..error import InvalidVersion
 
 
+class Operator(IntEnum):
+    Less = C.OPERATOR_LESS
+    LessOrEqual = C.OPERATOR_LESS_OR_EQUAL
+    Equal = C.OPERATOR_EQUAL
+    EqualGlob = C.OPERATOR_EQUAL_GLOB
+    Approximate = C.OPERATOR_APPROXIMATE
+    GreaterOrEqual = C.OPERATOR_GREATER_OR_EQUAL
+    Greater = C.OPERATOR_GREATER
+
+    @staticmethod
+    def from_str(str s not None):
+        op = C.pkgcraft_version_op_from_str(s.encode())
+        if op > 0:
+            return Operator(op)
+        raise ValueError(f'invalid operator: {s}')
+
+    def __str__(self):
+        c_str = C.pkgcraft_version_op_str(self)
+        s = c_str.decode()
+        C.pkgcraft_str_free(c_str)
+        return s
+
+    def __eq__(self, object other):
+        if isinstance(other, str):
+            return str(self) == other
+        return self is other
+
+
 cdef class Version:
     """Atom version.
 
@@ -30,7 +60,7 @@ cdef class Version:
             raise InvalidVersion
 
     @staticmethod
-    cdef Version from_ptr(C.AtomVersion *ptr):
+    cdef Version from_ptr(C.Version *ptr):
         """Convert a Version pointer to a Version object."""
         if ptr is not NULL:
             obj = <Version>Version.__new__(Version)
@@ -55,6 +85,25 @@ cdef class Version:
         C.pkgcraft_str_free(c_str)
         return s
 
+    @property
+    def op(self):
+        """Get a version's operator.
+
+        >>> from pkgcraft.atom import Operator, Version, VersionWithOp
+        >>> v = Version('1-r2')
+        >>> v.op is None
+        True
+        >>> v = VersionWithOp('>=1')
+        >>> v.op is Operator.GreaterOrEqual
+        True
+        >>> v.op == '>='
+        True
+        """
+        cdef int op = C.pkgcraft_version_op(self.ptr)
+        if op > 0:
+            return Operator(op)
+        return None
+
     def intersects(self, Version other):
         """Determine if two versions intersect.
 

src/pkgcraft/pkgcraft_c.pxd

@@ -25,6 +25,15 @@ cdef extern from "pkgcraft.h":
         LOG_LEVEL_WARN,
         LOG_LEVEL_ERROR,
 
+    cdef enum Operator:
+        OPERATOR_LESS # = 1,
+        OPERATOR_LESS_OR_EQUAL,
+        OPERATOR_EQUAL,
+        OPERATOR_EQUAL_GLOB,
+        OPERATOR_APPROXIMATE,
+        OPERATOR_GREATER_OR_EQUAL,
+        OPERATOR_GREATER,
+
     cdef enum PkgFormat:
         PKG_FORMAT_EBUILD,
         PKG_FORMAT_FAKE,
@@ -54,10 +63,6 @@ cdef extern from "pkgcraft.h":
     cdef struct Atom:
         pass
 
-    # Opaque wrapper for AtomVersion objects.
-    cdef struct AtomVersion:
-        pass
-
     # System config
     cdef struct Config:
         pass
@@ -110,6 +115,9 @@ cdef extern from "pkgcraft.h":
     cdef struct Uri:
         pass
 
+    cdef struct Version:
+        pass
+
     cdef struct PkgcraftError:
         char *message
         ErrorKind kind
@@ -295,7 +303,7 @@ cdef extern from "pkgcraft.h":
     #
     # # Safety
     # The argument must be a non-null Atom pointer.
-    AtomVersion *pkgcraft_atom_version(Atom *atom)
+    Version *pkgcraft_atom_version(Atom *atom)
 
     # Add an external Repo to the config.
     #
@@ -850,7 +858,7 @@ cdef extern from "pkgcraft.h":
     #
     # # Safety
     # The argument must be a non-null Pkg pointer.
-    AtomVersion *pkgcraft_pkg_version(Pkg *p)
+    Version *pkgcraft_pkg_version(Pkg *p)
 
     # Return a repo's categories.
     #
@@ -1237,57 +1245,76 @@ cdef extern from "pkgcraft.h":
     #
     # # Safety
     # The version arguments should be non-null Version pointers.
-    int pkgcraft_version_cmp(AtomVersion *v1,
-                             AtomVersion *v2)
+    int pkgcraft_version_cmp(Version *v1,
+                             Version *v2)
 
     # Free a version.
     #
     # # Safety
     # The version argument should be a non-null Version pointer.
-    void pkgcraft_version_free(AtomVersion *v)
+    void pkgcraft_version_free(Version *v)
 
     # Return the hash value for a version.
     #
     # # Safety
     # The version argument should be a non-null Version pointer.
-    uint64_t pkgcraft_version_hash(AtomVersion *v)
+    uint64_t pkgcraft_version_hash(Version *v)
 
     # Determine if two versions intersect.
     #
     # # Safety
     # The version arguments should be non-null Version pointers.
-    bool pkgcraft_version_intersects(AtomVersion *v1, AtomVersion *v2)
+    bool pkgcraft_version_intersects(Version *v1, Version *v2)
 
     # Parse a string into a version.
     #
     # Returns NULL on error.
     #
     # # Safety
     # The version argument should point to a valid string.
-    AtomVersion *pkgcraft_version_new(const char *s)
+    Version *pkgcraft_version_new(const char *s)
+
+    # Return a version's operator.
+    #
+    # Returns 0 on nonexistence.
+    #
+    # # Safety
+    # The argument must be a non-null Version pointer.
+    int pkgcraft_version_op(Version *v)
+
+    # Parse a string into an Operator.
+    #
+    # Returns 0 on error.
+    #
+    # # Safety
+    # The argument should be a UTF-8 string.
+    int pkgcraft_version_op_from_str(const char *s)
+
+    # Return the string for an Operator.
+    char *pkgcraft_version_op_str(Operator op)
 
     # Return a version's revision, e.g. the version "1-r2" has a revision of "2".
     #
     # # Safety
     # The version argument should be a non-null Version pointer.
-    char *pkgcraft_version_revision(AtomVersion *v)
+    char *pkgcraft_version_revision(Version *v)
 
     # Return a version's string value without operator.
     #
     # # Safety
     # The version argument should be a non-null Version pointer.
-    char *pkgcraft_version_str(AtomVersion *v)
+    char *pkgcraft_version_str(Version *v)
 
     # Return a version's string value including the operator if it exists.
     #
     # # Safety
     # The version argument should be a non-null Version pointer.
-    char *pkgcraft_version_str_with_op(AtomVersion *v)
+    char *pkgcraft_version_str_with_op(Version *v)
 
     # Parse a string into a version with an operator.
     #
     # Returns NULL on error.
     #
     # # Safety
     # The version argument should point to a valid string.
-    AtomVersion *pkgcraft_version_with_op(const char *s)
+    Version *pkgcraft_version_with_op(const char *s)