Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Changes to support multiple shotgun servers #2

Open
robblau wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Changes to support multiple shotgun servers #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1725d16
Added support for update, delete, create, and batch calls.
robblau Jan 27, 2011
475070c
Merge remote-tracking branch 'upstream/master'
Feb 21, 2012
4ec111f
Updated to support multiple shotgun servers.
robblau Feb 21, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions shotgun_mode.mu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,15 +1068,30 @@ class: ShotgunMinorMode : MinorMode
}
}

method: sessionFromVersionIDs (void; int[] ids, bool doCompare = false, bool clearFirst = true)
method: sessionFromVersionIDs (void; int[] ids, bool doCompare = false, bool clearFirst = true, string flags="")
{
deb ("shotgun mode sessionFromVersionIDs called\n");
deb ("shotgun mode sessionFromVersionIDs(%s, %s, %s, %s) called\n" % (ids, doCompare, clearFirst, flags));
StringMap flagMap = StringMap(7);
for_each (flag; flags.split(" "))
{
string[] pair = flag.split("=");
flagMap.add(pair[0], pair[1]);
}
deb ("flagMap: %s\n" % flagMap.toString());

State state = data();
if (0 == sources().size()) state.emptySessionStr = "Loading From Shotgun ...";

if (0 == ids.size()) return;

_shotgunState.collectVersionInfo(ids, sessionFromInfos(doCompare,clearFirst,));
string serverUrl = "";
try
{
serverUrl = "http://%s" % flagMap.find("serverUrl");
}
catch (...) {;}

_shotgunState.collectVersionInfo(ids, sessionFromInfos(doCompare,clearFirst,), serverUrl);
}

method: goToPage (void; string url)
Expand Down
38 changes: 31 additions & 7 deletions shotgun_state.mu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ class: ShotgunState
ok = false;
}

if (ok) this.connectToServer();
// defer connecting to server until we know which server launched us
// if (ok) this.connectToServer();
}

method: recordsReturnedLast(int;)
Expand Down Expand Up @@ -162,12 +163,27 @@ class: ShotgunState
}


method: connectToServer(void; )
method: connectToServer(void; string serverUrl="")
{
try
{
let (url, scriptKey) = lookupServer (_serverURL);

string lookup;
if (serverUrl == "")
{
// if we've already connected, then there is nothing to do
if (_shotgunServer neq nil) return;
lookup = _serverURL;
}
else
lookup = serverUrl;
let (url, scriptKey) = lookupServer (lookup);

/*
* default url to connect to becomes last server passed in.
* this doesn't work great for sessions where entities come from different
* servers, but support for that is in the future
*/
_serverURL = url;
_scriptKey = scriptKey;
if (url eq nil) throw exception ("ShotgunState: cannot connect to nil url");
Expand Down Expand Up @@ -406,7 +422,7 @@ class: ShotgunState
else
{
deb (" nextEntity is %s, requesting info\n" % nextEntity);
_requestInfo (newTargetIDs, nextEntity, requestedEntities, infos, afterFunc);
_requestInfo (newTargetIDs, nextEntity, requestedEntities, infos, afterFunc, "");
}
}
catch (exception exc)
Expand Down Expand Up @@ -496,11 +512,18 @@ class: ShotgunState
string targetEntity,
string[] requestedEntities,
StringMap[] infos,
(void; StringMap[]) afterFunc)
(void; StringMap[]) afterFunc,
string serverUrl)
{
deb ("ShotgunState _requestInfo called\n");
deb (" targetIDs %s\n" % targetIDs);
deb (" targetEntity %s\n" % targetEntity);
deb (" serverUrl %s\n" % serverUrl);
deb (" _serverURL %s\n" % _serverURL);

// if we are trying to talk to a different shotgun server than the default
if (serverUrl != _serverURL)
connectToServer(serverUrl);

_updateEmptySessionStr (targetEntity);

Expand Down Expand Up @@ -535,17 +558,18 @@ class: ShotgunState
]));
}

method: collectVersionInfo (void; int[] ids, (void; StringMap[]) afterFunc)
method: collectVersionInfo (void; int[] ids, (void; StringMap[]) afterFunc, string serverURL="")
{
deb ("ShotgunState collectVersionInfo called\n");
deb (" ids %s\n" % ids);
deb (" serverURL %s\n" % serverURL);
if (0 == ids.size()) return;

StringMap[] infos;
for_each (id; ids) infos.push_back(shotgun_fields.freshInfo());
deb (" info[0] %s\n" % infos[0].toString(" "));

_requestInfo (ids, "Version", string[](), infos, afterFunc);
_requestInfo (ids, "Version", string[](), infos, afterFunc, serverURL);
}

method: collectAllVersionInfo (void; (void; StringMap[]) afterFunc)
Expand Down