Skip to content

Commit 82658ff

Browse files
committed
existing channels snake case
1 parent 22a1b1a commit 82658ff

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

server/recceiver/cfstore.py

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -845,29 +845,29 @@ def get_existing_channels(
845845
cf_config: The configuration for the processor.
846846
processor: The processor.
847847
"""
848-
existingChannels: Dict[str, CFChannel] = {}
848+
existing_channels: Dict[str, CFChannel] = {}
849849

850850
# The list of pv's is searched keeping in mind the limitations on the URL length
851-
searchStrings = []
852-
searchString = ""
851+
search_strings = []
852+
search_string = ""
853853
for channel_name in new_channels:
854-
if not searchString:
855-
searchString = channel_name
856-
elif len(searchString) + len(channel_name) < 600:
857-
searchString = searchString + "|" + channel_name
854+
if not search_string:
855+
search_string = channel_name
856+
elif len(search_string) + len(channel_name) < 600:
857+
search_string = search_string + "|" + channel_name
858858
else:
859-
searchStrings.append(searchString)
860-
searchString = channel_name
861-
if searchString:
862-
searchStrings.append(searchString)
863-
864-
for eachSearchString in searchStrings:
865-
_log.debug("Find existing channels by name: %s", eachSearchString)
866-
for found_channel in client.findByArgs(prepareFindArgs(cf_config, [("~name", eachSearchString)])):
867-
existingChannels[found_channel["name"]] = CFChannel.from_channelfinder_dict(found_channel)
859+
search_strings.append(search_string)
860+
search_string = channel_name
861+
if search_string:
862+
search_strings.append(search_string)
863+
864+
for each_search_string in search_strings:
865+
_log.debug("Find existing channels by name: %s", each_search_string)
866+
for found_channel in client.findByArgs(prepareFindArgs(cf_config, [("~name", each_search_string)])):
867+
existing_channels[found_channel["name"]] = CFChannel.from_channelfinder_dict(found_channel)
868868
if processor.cancelled:
869869
raise defer.CancelledError()
870-
return existingChannels
870+
return existing_channels
871871

872872

873873
def handle_old_channels(
@@ -949,7 +949,7 @@ def handle_old_channels(
949949

950950

951951
def update_existing_channel_diff_iocid(
952-
existingChannels: Dict[str, CFChannel],
952+
existing_channels: Dict[str, CFChannel],
953953
channel_name: str,
954954
newProps: List[CFProperty],
955955
processor: CFProcessor,
@@ -965,7 +965,7 @@ def update_existing_channel_diff_iocid(
965965
channels
966966
967967
Args:
968-
existingChannels: The dictionary of existing channels.
968+
existing_channels: The dictionary of existing channels.
969969
channel_name: The name of the channel.
970970
newProps: The new properties.
971971
processor: The processor.
@@ -975,23 +975,23 @@ def update_existing_channel_diff_iocid(
975975
ioc_info: The IOC information.
976976
iocid: The IOC ID.
977977
"""
978-
existingChannel = existingChannels[channel_name]
979-
existingChannel.properties = __merge_property_lists(
978+
existing_channel = existing_channels[channel_name]
979+
existing_channel.properties = __merge_property_lists(
980980
newProps,
981-
existingChannel,
981+
existing_channel,
982982
processor.managed_properties,
983983
)
984-
channels.append(existingChannel)
985-
_log.debug("Add existing channel with different IOC: %s", existingChannel)
984+
channels.append(existing_channel)
985+
_log.debug("Add existing channel with different IOC: %s", existing_channel)
986986
# in case, alias exists, update their properties too
987987
if cf_config.alias_enabled:
988988
if channel_name in record_info_by_name:
989989
alProps = [CFProperty.alias(ioc_info.owner, channel_name)]
990990
for p in newProps:
991991
alProps.append(p)
992992
for alias_name in record_info_by_name[channel_name].aliases:
993-
if alias_name in existingChannels:
994-
ach = existingChannels[alias_name]
993+
if alias_name in existing_channels:
994+
ach = existing_channels[alias_name]
995995
ach.properties = __merge_property_lists(
996996
alProps,
997997
ach,
@@ -1094,7 +1094,7 @@ def __updateCF__(
10941094
iocid,
10951095
)
10961096
# now pvNames contains a list of pv's new on this host/ioc
1097-
existingChannels = get_existing_channels(new_channels, client, cf_config, processor)
1097+
existing_channels = get_existing_channels(new_channels, client, cf_config, processor)
10981098

10991099
for channel_name in new_channels:
11001100
newProps = create_ioc_properties(
@@ -1115,10 +1115,10 @@ def __updateCF__(
11151115
if channel_name in record_info_by_name:
11161116
newProps = newProps + record_info_by_name[channel_name].info_properties
11171117

1118-
if channel_name in existingChannels:
1118+
if channel_name in existing_channels:
11191119
_log.debug("update existing channel %s: exists but with a different iocid from %s", channel_name, iocid)
11201120
update_existing_channel_diff_iocid(
1121-
existingChannels,
1121+
existing_channels,
11221122
channel_name,
11231123
newProps,
11241124
processor,

0 commit comments

Comments
 (0)