Regenerate enums (#537)

* Avoid subtracting `-1` from the number of possible enum values

* Regenerate enums

* Avoid generating redundant enums

Author: kleisauke

examples/gen-enums.py

@@ -4,7 +4,7 @@
 import xml.etree.ElementTree as ET
 
 from pyvips import ffi, enum_dict, flags_dict, \
-    vips_lib, type_map, type_name, type_from_name
+    type_map, type_name, type_from_name
 
 # This file generates enums.py -- the set of classes giving the permissible
 # values for the pyvips enums/flags. Run with something like:
@@ -103,10 +103,6 @@ def add_nickname(gtype, a, b):
 
     type_map(type_from_name('GEnum'), add_nickname)
 
-    # Filter internal enums
-    blacklist = ['VipsImageType', 'VipsToken']
-    all_nicknames = [name for name in all_nicknames if name not in blacklist]
-
     for name in all_nicknames:
         gtype = type_from_name(name)
         python_name = remove_prefix(name)
@@ -198,11 +194,6 @@ def add_nickname(gtype, a, b):
 
 
 if __name__ == "__main__":
-    # otherwise we're missing some enums
-    vips_lib.vips_token_get_type()
-    vips_lib.vips_saveable_get_type()
-    vips_lib.vips_image_type_get_type()
-
     print('# libvips enums -- this file is generated automatically')
     print('# flake8: noqa: E501')  # ignore line too long error
     generate_enums()

pyvips/base.py

@@ -117,9 +117,12 @@ def values_for_enum(gtype):
     g_type_class = gobject_lib.g_type_class_ref(gtype)
     g_enum_class = ffi.cast('GEnumClass *', g_type_class)
 
-    # -1 since we always have a "last" member.
-    return [_to_string(g_enum_class.values[i].value_nick)
-            for i in range(g_enum_class.n_values - 1)]
+    result = [_to_string(g_enum_class.values[i].value_nick)
+              for i in range(g_enum_class.n_values)]
+    # FIXME: remove after https://github.com/libvips/libvips/pull/4520
+    if 'last' in result:
+        result.remove('last')
+    return result
 
 
 def values_for_flag(gtype):
@@ -138,10 +141,12 @@ def enum_dict(gtype):
     g_type_class = gobject_lib.g_type_class_ref(gtype)
     g_enum_class = ffi.cast('GEnumClass *', g_type_class)
 
-    # -1 since we always have a "last" member.
-    return {_to_string(g_enum_class.values[i].value_nick):
-            g_enum_class.values[i].value
-            for i in range(g_enum_class.n_values - 1)}
+    result = {_to_string(g_enum_class.values[i].value_nick):
+              g_enum_class.values[i].value
+              for i in range(g_enum_class.n_values)}
+    # FIXME: remove after https://github.com/libvips/libvips/pull/4520
+    result.pop('last', None)
+    return result
 
 
 def flags_dict(gtype):