Skip to content

Commit e78b0f1

Browse files
authored
Merge pull request #95 from Kaszanas/dev
[PR] Hotfix 2.1.2: Checking empty map names
2 parents eec4cd0 + 9353067 commit e78b0f1

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

dataproc/downloader/map_downloader_pipeline.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,10 @@ func readMapNamesFromMapFiles(
152152

153153
// Fill out the mapping, these maps won't be opened again:
154154
for foreignName, englishName := range foreignToEnglishMapping {
155+
// Skip empty names:
156+
if foreignName == "" || englishName == "" {
157+
continue
158+
}
155159
mainForeignToEnglishMapping[foreignName] = englishName
156160
}
157161
}

dataproc/sc2_map_processing/sc2_map_utils.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,14 @@ func ReadLocalizedDataFromMapGetForeignToEnglishMapping(
347347
// https://github.com/Kaszanas/SC2InfoExtractorGo/issues/67
348348
// Clean the foreign map name:
349349
mapName = cleanMapName(mapName)
350+
if mapName == "" || englishMapName == "" {
351+
log.WithFields(log.Fields{
352+
"mapFilepath": mapFilepath,
353+
"mapName": mapName,
354+
"englishMapName": englishMapName,
355+
}).Warn("Empty map name, skipping")
356+
continue
357+
}
350358

351359
foreignToEnglishMapName[mapName] = englishMapName
352360
}

0 commit comments

Comments
 (0)