Merge pull request #4 from nimbleheroes/swc_beta

Swc beta

Author: swc-jesse

python/sync/resolver.py

@@ -82,8 +82,8 @@ def root_path(self):
         else:
             templated_path = self.root_template.apply_fields(self.template_fields,
                                                             platform= sys.platform)
-            return os.path.join(templated_path, "...")
-
+            #return os.path.join(templated_path, "...")
+            return templated_path
     @property
     def entity_info(self):
         try:

python/sync/sync.py

@@ -46,7 +46,7 @@ def __init__(self, fw):
         self.p4_server = self._get_p4_server()
 
 
-    def sync_with_dlg(self, app, entities_to_sync,  specific_files=False):
+    def sync_with_dlg(self, app, entities_to_sync,  specific_files=False, child_asset_ids=None):
         """
         Show the sync window for user file syncing
 
@@ -56,6 +56,7 @@ def sync_with_dlg(self, app, entities_to_sync,  specific_files=False):
         self.entities_to_sync = entities_to_sync
         self.app = app
         self.specific_files = specific_files
+        self.child_asset_ids = child_asset_ids
 
         try:
             # ensure this always runs on the main thread:
@@ -77,7 +78,7 @@ def _sync_with_dlg(self):
             from ..widgets import SyncForm
 
             result, _ = self._fw.engine.show_modal("Perforce Sync ", self._fw, SyncForm, 
-                                                   self.app, self.entities_to_sync, self.specific_files)
+                                                   self.app, self.entities_to_sync, self.specific_files, self.child_asset_ids)
 
             if result == QtGui.QDialog.Accepted:
                 pass
@@ -100,12 +101,12 @@ def _get_p4_server(self):
         return str(sg_project.get(server_field))
 
 
-def sync_with_dialog(app, entities_to_sync, specific_files=False):
+def sync_with_dialog(app, entities_to_sync, specific_files=False,  child_asset_ids=None):
     """
     Show the Perforce sync dialog
 
     :returns Qt UI:    A new Perforce sync dialog
     """
 
     fw = sgtk.platform.current_bundle()
-    return SyncHandler(fw).sync_with_dlg(app, entities_to_sync, specific_files=specific_files)
+    return SyncHandler(fw).sync_with_dlg(app, entities_to_sync, specific_files=specific_files, child_asset_ids=child_asset_ids)

python/widgets/open_sync_form.py

@@ -33,7 +33,7 @@ class SyncForm(QtGui.QWidget):
 
     progress = 0
 
-    def __init__(self, parent_sgtk_app, entities_to_sync, specific_files,  parent=None):
+    def __init__(self, parent_sgtk_app, entities_to_sync, specific_files, child_asset_ids=None , parent=None):
         """
         Construction of sync UI
         """
@@ -44,6 +44,7 @@ def __init__(self, parent_sgtk_app, entities_to_sync, specific_files,  parent=No
         self.app = parent_sgtk_app
         self.entities_to_sync = entities_to_sync
         self.specific_files= specific_files
+        self.child_asset_ids = child_asset_ids
         self.scan()
 
     def scan(self):
@@ -626,6 +627,10 @@ def populate_assets(self):
             asset_info_gather_worker.status_update.connect(self.set_progress_message)
             asset_info_gather_worker.includes.connect(self.update_available_filters)
 
+            if self.child_asset_ids:
+                if entity_to_sync.get('id') in self.child_asset_ids:
+                    asset_info_gather_worker.child = True
+
             self.threadpool.start(asset_info_gather_worker)
 
 

python/widgets/sync_workers.py

@@ -95,6 +95,8 @@ def __init__(self, app=None, entity=None, framework=None):
         self._icon = None
         self._detail = None
 
+        self.child = False
+
         self.fw = framework
         self.asset_item = None
 
@@ -127,7 +129,12 @@ def asset_name(self):
 
     @property
     def root_path(self):
-        rp = self.asset_item.get('root_path')
+        p4_path_operator = "*"
+        if self.child is True:
+            p4_path_operator = "..."
+            self.fw.logger.warning("processed root path as a child: %s" %self.asset_item.get('root_path'))
+
+        rp = os.path.join(self.asset_item.get('root_path'),  p4_path_operator )
         if self.entity.get('type') in ["PublishedFile"]:
             rp = "B:/" + self.entity.get('path_cache')
         return rp
@@ -204,7 +211,8 @@ def run(self):
         """
         try:
             self.template_resolver = TemplateResolver(app=self.app,
-                                                entity=self.entity )
+                                                entity=self.entity,
+                                        )
 
             self.asset_item = self.template_resolver.entity_info
             progress_status_string = ""