tap_schema.py: rewrite _get_size function

python/felis/tap_schema.py

@@ -605,24 +605,20 @@ def _get_size(column: datamodel.Column) -> int | None:
  int or None
  The size of the column or None if not applicable.
  """
+ arraysize = column.votable_arraysize
 
- def _is_int(s: str) -> bool:
- try:
- int(s)
- return True
- except ValueError:
- return False
+ if not arraysize:
+ return None
 
- size = None
- arraysize = column.votable_arraysize
- if arraysize is not None and str(arraysize) != "":
- if isinstance(arraysize, int):
- size = arraysize
- elif _is_int(arraysize):
- size = int(arraysize)
- elif bool(re.match(r"^[0-9]+\*$", arraysize)):
- size = int(arraysize.replace("*", ""))
- return size
+ arraysize_str = str(arraysize)
+ if arraysize_str.isdigit():
+ return int(arraysize_str)
+
+ match = re.match(r"^([0-9]+)\*$", arraysize_str)
+ if match and match.group(1) is not None:
+ return int(match.group(1))
+
+ return None
 
  @staticmethod
  def _is_indexed(column: datamodel.Column, table: datamodel.Table) -> int: