ab_tree: move minid/GUID conversion

Author: juliaschroeder

include/gromox/ab_tree.hpp

@@ -105,6 +105,7 @@ struct minid
 	static constexpr uint32_t RESOLVED = 0x0000002;
 
 	constexpr minid(uint32_t i = 0) : id(i) {}
+	constexpr explicit minid(const GUID &guid) : id(guid.time_low) {}
 	/**
 	 * @brief      Construct minid from type and ID
 	 *
@@ -113,6 +114,7 @@ struct minid
 	 */
 	constexpr minid(Type t, uint32_t v) : id((uint32_t(t) << TYPEOFFSET) | ((v + 0x10) & VALMASK)) {}
 	constexpr operator uint32_t() const { return id; }
+	constexpr explicit operator GUID() const { return GUID{id, 0, 0, {0, 0}, {0, 0, 0, 0, 0, 0}}; }
 
 	constexpr Type type() const { return Type(id >> TYPEOFFSET); } ///< Extract type from minid
 	constexpr uint32_t value() const { return (id & VALMASK) - 0x10; } ///< Extract object ID from minid
@@ -217,6 +219,7 @@ class ab_base
 	const sql_user *fetch_user(minid) const;
 	uint32_t get_leaves_num(minid) const;
 	inline const GUID &guid() const { return m_guid; }
+	size_t hidden() const;
 	uint32_t hidden(minid) const;
 	ec_error_t mdbdn(minid, std::string &) const;
 	bool mlist_info(minid, std::string *, std::string *, int *) const;
@@ -235,8 +238,6 @@ class ab_base
 	inline iterator uend() const { return iterator(this, m_users.cend()); } ///< Iterator to end of user list
 	iterator find(minid) const;
 
-	static minid from_guid(const GUID &);
-	static GUID guid(minid);
 	static display_type dtypx_to_etyp(display_type);
 
 	private:
@@ -357,7 +358,7 @@ struct ab_node
 
 	#undef WRAP
 
-	inline GUID guid() const { return ab_base::guid(mid); }
+	inline GUID guid() const { return GUID(mid); }
 	inline bool valid() const { return base && base->exists(mid); }
 
 	using iterator = decltype(ab_domain::userref)::const_iterator;

lib/ab_tree.cpp

@@ -489,21 +489,6 @@ bool ab_base::fetch_props(minid mid, const PROPTAG_ARRAY &tags, std::unordered_m
 	return true;
 }
 
-/**
- * @brief      Extract minid from node GUID
- *
- * No checks are performed whether the resulting minid is valid.
- * Use exists() to check whether the minid is usable.
- *
- * @param      guid  GUID of the node
- *
- * @return     Node minid
- */
-minid ab_base::from_guid(const GUID &guid)
-{
-	return guid.time_low;
-}
-
 /**
  * @brief      Get total number of children of the node
  *
@@ -520,30 +505,27 @@ uint32_t ab_base::get_leaves_num(minid mid) const
 }
 
 /**
- * @brief      Generate node GUID
+ * @brief      Get the number of direct child nodes
  *
  * @param      mid   Mid of the node
  *
- * @return     Node GUID
+ * @return     Number of users of a domain node or 0 for user nodes
  */
-GUID ab_base::guid(minid mid)
+size_t ab_base::children(minid mid) const
 {
-	GUID g{};
-	g.time_low = mid;
-	return g;
+	const ab_domain *domain = fetch_domain(mid);
+	return domain ? domain->userref.size() : 0;
 }
 
 /**
- * @brief      Get the number of direct child nodes
+ * @brief      Count number of users hidden from GAL
  *
- * @param      mid   Mid of the node
- *
- * @return     Number of users of a domain node or 0 for user nodes
+ * @return     Number of users with AB_HIDE_FROM_GAL flag set
  */
-size_t ab_base::children(minid mid) const
+size_t ab_base::hidden() const
 {
-	const ab_domain *domain = fetch_domain(mid);
-	return domain ? domain->userref.size() : 0;
+	return uint32_t(std::count_if(m_users.begin(), m_users.end(),
+	                              [](const sql_user& u) {return u.hidden & AB_HIDE_FROM_GAL;}));
 }
 
 /**