Merge pull request #32100 from borysiasty/fix_dash_in_zip_filenames

[Plugin installer] Fix handling zip file names with a dash as a version suffix separator
qgis · Oct 5, 2019 · 8de7f3a · 8de7f3a
2 parents 3ec34e8 + 5c1cc4a
commit 8de7f3a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/python/pyplugin_installer/installer_data.py b/python/pyplugin_installer/installer_data.py
@@ -397,7 +397,11 @@ def xmlDownloaded(self):
                     fileName = pluginNodes.item(i).firstChildElement("file_name").text().strip()
                     if not fileName:
                         fileName = QFileInfo(pluginNodes.item(i).firstChildElement("download_url").text().strip().split("?")[0]).fileName()
-                    name = fileName.partition(".")[0]
+                    match = re.match('(.*?)[.-]', fileName)
+                    if match:
+                        name = match.groups()[0]
+                    else:
+                        name = fileName
                     experimental = False
                     if pluginNodes.item(i).firstChildElement("experimental").text().strip().upper() in ["TRUE", "YES"]:
                         experimental = True