Merge pull request #29 from homebysix/1.2.1

v1.2.1 merge to master

Author: homebysix

CHANGELOG.md

@@ -7,6 +7,11 @@ All notable changes to this project will be documented in this file. This projec
 
 Nothing yet.
 
+## [1.2.1] - 2021-03-01
+
+### Fixed
+
+- Fixed issue preventing `findExistingLabel()` from finding URLs' labels
 
 ## [1.2.0] - 2020-10-15
 
@@ -86,7 +91,8 @@ Nothing yet.
 - Initial release
 
 
-[Unreleased]: https://github.com/homebysix/docklib/compare/v1.2.0...HEAD
+[Unreleased]: https://github.com/homebysix/docklib/compare/v1.2.1...HEAD
+[1.2.0]: https://github.com/homebysix/docklib/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/homebysix/docklib/compare/v1.0.5...v1.2.0
 [1.0.5]: https://github.com/homebysix/docklib/compare/v1.0.4...v1.0.5
 [1.0.4]: https://github.com/homebysix/docklib/compare/v1.0.3...v1.0.4

docklib/__init__.py

@@ -1,3 +1,3 @@
 from .docklib import *
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"

docklib/docklib.py

@@ -118,9 +118,11 @@ def findExistingLabel(self, test_label, section="persistent-apps"):
         found."""
         section_items = self.items[section]
         if section_items:
-            for index, item in enumerate(section_items):
-                if item["tile-data"].get("file-label") == test_label:
-                    return index
+            # Most dock items use "file-label", but URLs use "label"
+            for label_key in ("file-label", "label"):
+                for index, item in enumerate(section_items):
+                    if item["tile-data"].get(label_key) == test_label:
+                        return index
 
         return -1