mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
Merge branch 'master' into develop
This commit is contained in:
commit
6c2ce5be0b
1 changed files with 8 additions and 2 deletions
|
|
@ -7,6 +7,7 @@ import errno
|
||||||
import pyblish.api
|
import pyblish.api
|
||||||
from avalon import api, io
|
from avalon import api, io
|
||||||
from avalon.vendor import filelink
|
from avalon.vendor import filelink
|
||||||
|
from pathlib2 import Path
|
||||||
# this is needed until speedcopy for linux is fixed
|
# this is needed until speedcopy for linux is fixed
|
||||||
if sys.platform == "win32":
|
if sys.platform == "win32":
|
||||||
from speedcopy import copyfile
|
from speedcopy import copyfile
|
||||||
|
|
@ -468,8 +469,11 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
|
||||||
Returns:
|
Returns:
|
||||||
None
|
None
|
||||||
"""
|
"""
|
||||||
src = os.path.normpath(src)
|
|
||||||
dst = os.path.normpath(dst)
|
src = Path(src).resolve()
|
||||||
|
drive, _path = os.path.splitdrive(dst)
|
||||||
|
unc = Path(drive).resolve()
|
||||||
|
dst = str(unc / _path)
|
||||||
|
|
||||||
self.log.debug("Copying file .. {} -> {}".format(src, dst))
|
self.log.debug("Copying file .. {} -> {}".format(src, dst))
|
||||||
dirname = os.path.dirname(dst)
|
dirname = os.path.dirname(dst)
|
||||||
|
|
@ -490,6 +494,8 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
|
||||||
|
|
||||||
def hardlink_file(self, src, dst):
|
def hardlink_file(self, src, dst):
|
||||||
dirname = os.path.dirname(dst)
|
dirname = os.path.dirname(dst)
|
||||||
|
src = Path(src).resolve()
|
||||||
|
dst = Path(dst).resolve()
|
||||||
try:
|
try:
|
||||||
os.makedirs(dirname)
|
os.makedirs(dirname)
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue