Release version 0.5.0 (#9)

* Release version 0.5.0

[BUG] Support spaces in file names on Windows
[BUG] Prompt to save modifications before history changes
[BUG] Handle query strings properly during URL expansion
[ENH] Support Tab/Shift+Tab indentation of selected lines
[ENH] Set window icon for MacOS and add repository logo for SourceTree/GitLab
[ENH] Display app version in About dialog
[ENH] Clean up temp files on exit

Signed-off-by: mds-dwa <[email protected]>

docs/keyboardShortcuts.rst

@@ -106,4 +106,7 @@ For ease of use, there are some extra shortcuts not shown in the menus themselve
      - Ctrl+Shift+Tab
    * - Reload
      - F5
-
+   * - Indent (if text is selected)
+     - Tab
+   * - Unindent (if text is selected)
+     - Shift+Tab

usdmanager/utils.py

@@ -83,6 +83,30 @@ def expandPath(path, parentPath=None, sdf_format_args=None):
     return os.path.expandvars(os.path.expanduser(os.path.normpath(path)))
 
 
+def expandUrl(path, parentPath=None):
+    """ Expand and normalize a URL that may have variables in it and a query string after it.
+
+    :Parameters:
+        path : `str`
+            File path
+        parentPath : `str` | None
+            Parent file path this file is defined in relation to.
+            Helps with asset resolution.
+    :Returns:
+        Normalized path with variables expanded.
+    :Rtype:
+        `str`
+    """
+    sdf_format_args = {}
+    if "?" in path:
+        sdf_format_args.update(sdfQuery(QtCore.QUrl(path)))
+        path, query = path.split("?", 1)
+        query = "?" + query
+    else:
+        query = ""
+    return QtCore.QUrl(os.path.abspath(expandPath(path, parentPath, sdf_format_args)) + query)
+
+
 def findModules(subdir):
     """ Find and import all modules in a subdirectory of this project.
     Ignores any files starting with an underscore or tilde.
@@ -107,20 +131,22 @@ def findModules(subdir):
     return modules
 
 
-def generateTemporaryUsdFile(usdFileName):
+def generateTemporaryUsdFile(usdFileName, tmpDir=None):
     """ Generate a temporary ASCII USD file that the user can edit.
     
     :Parameters:
         usdFileName : `str`
             Binary USD file path
+        tmpDir : `str` | None
+            Temp directory to create the new unzipped directory within
     :Returns:
         Temporary file name
     :Rtype:
         `str`
     :Raises OSError:
         If usdcat fails
     """
-    fd, tmpFileName = tempfile.mkstemp(suffix=".usd")
+    fd, tmpFileName = tempfile.mkstemp(suffix=".usd", dir=tmpDir)
     try:
         usdcat(usdFileName, tmpFileName, format="usda")
     finally:
@@ -180,7 +206,7 @@ def usdzip(inputs, dest):
 
 
 # TODO: Support nested references (e.g. @set.usdz[areas/shire.usdz[architecture/BilboHouse/Table.usd]]@)
-def unzip(path, layer=None):
+def unzip(path, layer=None, tmpDir=None):
     """ Unzip a usdz format file to a temporary directory.
     
     :Parameters:
@@ -189,6 +215,8 @@ def unzip(path, layer=None):
         layer : `str` | None
             Default layer within file (e.g. the portion within the square brackets here:
             @foo.usdz[path/to/file/within/package.usd]@)
+        tmpDir : `str` | None
+            Temp directory to create the new unzipped directory within
     :Returns:
         Destination file
     :Rtype:
@@ -198,8 +226,7 @@ def unzip(path, layer=None):
     :Raises ValueError:
         If default layer not found
     """
-    # TODO: Clean up this temp dir when exiting the app?
-    destDir = tempfile.mkdtemp(prefix="usdmanager_usdz_")
+    destDir = tempfile.mkdtemp(prefix="usdmanager_usdz_", dir=tmpDir)
     cmd = "unzip {} -d {}".format(path, destDir)
     logger.debug(cmd)
     try:

usdmanager/version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = '0.4.1'
+__version__ = '0.5.0'