Skip to content

Commit

Permalink
feat: use internal name for internal
Browse files Browse the repository at this point in the history
  • Loading branch information
bdraco committed Aug 14, 2023
1 parent 70deeda commit c016506
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/zeroconf/_services/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ def _unpack_text_into_properties(self) -> None:

def get_name(self) -> str:
"""Name accessor"""
return self.name[: len(self.name) - len(self.type) - 1]
return self._name[: len(self._name) - len(self.type) - 1]

def _get_ip_addresses_from_cache_lifo(
self, zc: 'Zeroconf', now: float, type: int
Expand Down Expand Up @@ -529,7 +529,7 @@ def dns_addresses(
created: Optional[float] = None,
) -> List[DNSAddress]:
"""Return matching DNSAddress from ServiceInfo."""
name = self.server or self.name
name = self.server or self._name
ttl = override_ttl if override_ttl is not None else self.host_ttl
class_ = _CLASS_IN_UNIQUE
version_value = version.value
Expand All @@ -552,7 +552,7 @@ def dns_pointer(self, override_ttl: Optional[int] = None, created: Optional[floa
_TYPE_PTR,
_CLASS_IN,
override_ttl if override_ttl is not None else self.other_ttl,
self.name,
self._name,
created,
)

Expand All @@ -562,21 +562,21 @@ def dns_service(self, override_ttl: Optional[int] = None, created: Optional[floa
if TYPE_CHECKING:
assert isinstance(port, int)
return DNSService(
self.name,
self._name,
_TYPE_SRV,
_CLASS_IN_UNIQUE,
override_ttl if override_ttl is not None else self.host_ttl,
self.priority,
self.weight,
port,
self.server or self.name,
self.server or self._name,
created,
)

def dns_text(self, override_ttl: Optional[int] = None, created: Optional[float] = None) -> DNSText:
"""Return DNSText from ServiceInfo."""
return DNSText(
self.name,
self._name,
_TYPE_TXT,
_CLASS_IN_UNIQUE,
override_ttl if override_ttl is not None else self.other_ttl,
Expand All @@ -589,11 +589,11 @@ def dns_nsec(
) -> DNSNsec:
"""Return DNSNsec from ServiceInfo."""
return DNSNsec(
self.name,
self._name,
_TYPE_NSEC,
_CLASS_IN_UNIQUE,
override_ttl if override_ttl is not None else self.host_ttl,
self.name,
self._name,
missing_types,
created,
)
Expand Down Expand Up @@ -624,7 +624,7 @@ def set_server_if_missing(self) -> None:
This function is for backwards compatibility.
"""
if self.server is None:
self.server = self.name
self.server = self._name
self.server_key = self.server.lower()

def load_from_cache(self, zc: 'Zeroconf', now: Optional[float] = None) -> bool:
Expand All @@ -635,10 +635,10 @@ def load_from_cache(self, zc: 'Zeroconf', now: Optional[float] = None) -> bool:
if not now:
now = current_time_millis()
original_server_key = self.server_key
cached_srv_record = zc.cache.get_by_details(self.name, _TYPE_SRV, _CLASS_IN)
cached_srv_record = zc.cache.get_by_details(self._name, _TYPE_SRV, _CLASS_IN)
if cached_srv_record:
self._process_record_threadsafe(zc, cached_srv_record, now)
cached_txt_record = zc.cache.get_by_details(self.name, _TYPE_TXT, _CLASS_IN)
cached_txt_record = zc.cache.get_by_details(self._name, _TYPE_TXT, _CLASS_IN)
if cached_txt_record:
self._process_record_threadsafe(zc, cached_txt_record, now)
if original_server_key == self.server_key:
Expand Down Expand Up @@ -740,7 +740,7 @@ def generate_request_query(
) -> DNSOutgoing:
"""Generate the request query."""
out = DNSOutgoing(_FLAGS_QR_QUERY)
name = self.name
name = self._name
server_or_name = self.server or name
cache = zc.cache
out.add_question_or_one_cache(cache, now, name, _TYPE_SRV, _CLASS_IN)
Expand All @@ -754,7 +754,7 @@ def generate_request_query(

def __eq__(self, other: object) -> bool:
"""Tests equality of service name"""
return isinstance(other, ServiceInfo) and other.name == self.name
return isinstance(other, ServiceInfo) and other._name == self._name

def __repr__(self) -> str:
"""String representation"""
Expand Down

0 comments on commit c016506

Please sign in to comment.