Merge pull request #103 from davidlatwe/fix-package-root

Change to use variant's root instead of uri
mottosso · Oct 12, 2020 · 7b55650 · 7b55650
2 parents 8949e4e + aa687a2
commit 7b55650
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/allzpark/dock.py b/allzpark/dock.py
@@ -465,13 +465,15 @@ def on_latest():
 
         def on_openfile():
             package = model_.data(index, "package")
-            fname = os.path.join(package.root, "package.py")
+            pkg_uri = os.path.dirname(package.uri)
+            fname = os.path.join(pkg_uri, "package.py")
             util.open_file_location(fname)
             self.message.emit("Opened %s" % fname)
 
         def on_copyfile():
             package = model_.data(index, "package")
-            fname = os.path.join(package.root, "package.py")
+            pkg_uri = os.path.dirname(package.uri)
+            fname = os.path.join(pkg_uri, "package.py")
             clipboard = QtWidgets.QApplication.instance().clipboard()
             clipboard.setText(fname)
             self.message.emit("Copied %s" % fname)

diff --git a/allzpark/model.py b/allzpark/model.py
@@ -187,7 +187,7 @@ def reset(self, applications=None):
         self.items[:] = []
 
         for app in applications:
-            root = os.path.dirname(app.uri)
+            root = app.root
 
             data = allzparkconfig.metadata_from_package(app)
             tools = getattr(app, "tools", None) or [app.name]
@@ -362,7 +362,7 @@ def reset(self, packages=None):
         paths = self._ctrl._package_paths()
 
         for pkg in packages:
-            root = os.path.dirname(pkg.uri)
+            root = pkg.root
             data = allzparkconfig.metadata_from_package(pkg)
             state = (
                 "(dev)" if is_local(pkg) else