From 01a3436d9994a176805fd862bbaa2e05bc690316 Mon Sep 17 00:00:00 2001 From: pedohorse <13556996+pedohorse@users.noreply.github.com> Date: Mon, 27 Jan 2025 22:16:32 +0100 Subject: [PATCH] add automatic redshift package requirement --- .../Contents.dir/.OPdummydefs | Bin 10124 -> 0 bytes .../Contents.dir/.OPfallbacks | 2 -- .../Contents.dir/Contents.mime | 25 +++++++++++++++++- .../DialogScript | 22 +++++++++++++++ .../ExtraFileOptions | 22 ++++++++++++++- .../PreFirstCreate | 11 ++++++++ .../Sections.list | 1 + 7 files changed, 79 insertions(+), 4 deletions(-) delete mode 100644 dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Contents.dir/.OPdummydefs delete mode 100644 dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Contents.dir/.OPfallbacks create mode 100644 dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/PreFirstCreate diff --git a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Contents.dir/.OPdummydefs b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Contents.dir/.OPdummydefs deleted file mode 100644 index c158d5d7abe8ebd57d8b735c0cd295024399b179..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10124 zcmdT~-EP}96i&8bScC0mx4U7~7EOx5vy=1(E{36Pf+9eW0&%ex7zT~DXj?5U8WNp0 z2=W$tnLW(jW#>>PMM;$8#CEzeNTl!_^8E9BW^#Ob_--Q`U&HGU$ESx!@BH4;%Qwfb zPgC0Fz0pJeDZKwU7PBCX!qzyTJnY9bzS!8+cF*ANL z>rX-{S={Y*TJ2UlU3>rE(Zd)2z!sbE{SAEIH!Heb^Xgc<@zaSGMqaUq#o>VTv^)Hvoqfa5ZofHuetdFtw!OW*ahIe5Nunf@p@@m)O7mI@BcU@XCRBz4%J~Hu zVH~Ms!PeI07J(7b3Ar7^&r`o%rL&`0 z%y1f2#ewSL)APq+5U?m^#u+8ZNeQF#FbVsdN!m|$MgA#`C)UO|Wj1G@*kC4EwmDM! zG-0^N=z^0*>KTgy7Ux&I7hx2!PcpZHeVU3`f-n&=L%1?;b!x>*MxZh;FR5NP%;8w@ zq}6KWmqkM9Z-k>oHTunCQc%%&Ej@lR3C1^rm_f=BNs|v5RbEV0B>OWdMPyWfYNsT)7KMclxIL$0Iey}IC`H76fXk^SUrHthdI3w^>Z*{a9 z7%o)8?U!ZL#}suKke}8jgm6NRSZr)4W|eKi{?h|n`xrcoS#U|(q|;s~+)ZYw6JsDa zr&Cq*R*joX?Z<)!1DZ%5+y^HLw9Ld|u3;wOVK3uYYTSh={ojSW4_l%~(a1b|-_HDln3A`mG^PpkMK zA!Z>GMof}$N@x_2d~ObHU*; zq^UC_qiIJJvcbv(JM1?}>-rvzSfol_q+MIxd#`)z)p#0*A`az6=0lT_O5qeKm$|g3 zhg{GMiCT_+l9rX?z!^tOaN3xT zj#uTjg!P4^0{6#JM4Rbs1ztj;mlQ^YpW%iQ-Tv5L8b3bn`%v)h=nU%OD44|Z>4QBOC^ z`vgDG5f7hupE4;+%O^R?zP*w;r`!jh)}{sU%xdz&1+vkImFETA#juZK77_1~s8UZ8 znr#0{KnHSF_N>)r@*n(AKODE~=pkRq(fQt*8gRRARvLT(j)uBkCZn&}1FWOo24^}z zHE9ciT;9ChtbCtDUxc&N3F;{F+x1qTFXgQYa8-3yTB+r1l{LAAZEL;BmBQ5l-1%}x zyEdo{TMUOwuo^^~c2J@kO+p4@23@|?PHSw%{@Y;dLfBfj1cy0DGA5xpRtIvKhWrL_ zyMYz5G=VGRsY(u{RibhvHf0a;)POA{Hv=xkwE*Z+d~o130x!kb48F>!2^TJN7~uNy zuDIhO`CyP#V>VRaDHN~Mp$bzW&sx*LF0xXV*B~uatPyP?)8`G4LSU;1kQfJlP;m3{Vuk%OKEu`Pcpp5|tNAS-Bv524kj0oA1gvV34e8i=r%KZ?%2$p8QV diff --git a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Contents.dir/.OPfallbacks b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Contents.dir/.OPfallbacks deleted file mode 100644 index 9ae3319a..00000000 --- a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Contents.dir/.OPfallbacks +++ /dev/null @@ -1,2 +0,0 @@ -lifeblood::Driver/lifeblood_submitter::1.0.0 /home/xapkohheh/git/dev_fhs/projects_py/lifeblood/dcc_plugins/houdini/otls/Driver-lifeblood_submitter-1.0.0.hda -lifeblood::Driver/lifeblood_submitter::1.0.0 otls/Driver-lifeblood_submitter-1.0.0.hda diff --git a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Contents.dir/Contents.mime b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Contents.dir/Contents.mime index abfed453..44b050c7 100644 --- a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Contents.dir/Contents.mime +++ b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Contents.dir/Contents.mime @@ -538,6 +538,27 @@ return \"package.houdini.py%d_%d\" % (sys.version_info.major, sys.version_info.m length = 0 accel = 0.33333333333333331 0.33333333333333331 expr = "\"~=\" + hou.applicationVersionString()" language = python } } + channel env_arg_name_2 { + lefttype = extend + righttype = extend + defaultString = \"\" + flags = 0 + segment { options = { autoslope ai ao } + + length = 0 accel = 0.33333333333333331 0.33333333333333331 expr = "\"package.\" + hou.pwd().node(\"..\").evalParm(\"rs_pkg_name\")" language = python } + } + channel env_arg_val_2 { + lefttype = extend + righttype = extend + defaultString = \"\" + flags = 0 + segment { options = { autoslope ai ao } + + length = 0 accel = 0.33333333333333331 0.33333333333333331 expr = "if hasattr(hou.session, '_lifeblood__rs_ver_str'): + return '~=' + hou.session._lifeblood__rs_ver_str + +return 'error! cannot autodetect'" language = python } + } channel val_jsn_3 { lefttype = extend righttype = extend @@ -781,7 +802,7 @@ priority [ 0 locks=0 ] ( [ priority 50 ] ) folder0 [ 0 locks=0 ] ( 0 0 ) attribs [ 0 locks=0 ] ( 6 ) env_resolver_name [ 0 locks=0 ] ( StandardEnvironmentResolver ) -env_resolver_args [ 0 locks=0 ] ( 2 ) +env_resolver_args [ 0 locks=0 ] ( 3 ) enable_0 [ 0 locks=0 ] ( "on" ) attr_name_0 [ 0 locks=0 ] ( hipfile ) attr_type_0 [ 0 locks=0 ] ( "str" ) @@ -795,6 +816,8 @@ env_arg_name_0 [ 0 locks=0 autoscope=1 autosel=4294967295 ] ( [ env_arg_name_0 " env_arg_val_0 [ 0 locks=0 autoscope=1 autosel=4294967295 ] ( [ env_arg_val_0 "" ] ) env_arg_name_1 [ 0 locks=0 autoscope=1 autosel=4294967295 ] ( [ env_arg_name_1 "" ] ) env_arg_val_1 [ 0 locks=0 autoscope=1 autosel=4294967295 ] ( [ env_arg_val_1 "" ] ) +env_arg_name_2 [ 0 locks=0 autoscope=1 autosel=4294967295 ] ( [ env_arg_name_2 "" ] ) +env_arg_val_2 [ 0 locks=0 autoscope=1 autosel=4294967295 ] ( [ env_arg_val_2 "" ] ) _hidden2 [ 0 locks=0 ] ( 0 ) broadcast_parameters2 [ 0 locks=0 ] ( 0 ) sepparm [ 0 locks=0 ] ( ) diff --git a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/DialogScript b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/DialogScript index 6833518d..36aa7df6 100644 --- a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/DialogScript +++ b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/DialogScript @@ -201,6 +201,7 @@ parmtag { "import_source" "op:./lifeblood_submitter" } parmtag { "import_token" "roppath" } parmtag { "opfilter" "!!ROP!!" } + parmtag { "oprelative" "." } parmtag { "script_callback_language" "python" } } group { @@ -275,6 +276,27 @@ } + group { + name "folder3_1" + label "Redshift Package" + + parm { + name "rs_pkg_name" + label "Name" + type string + joinnext + default { "redshift" } + parmtag { "script_callback_language" "python" } + } + parm { + name "rs_pkg_ver" + label "Version" + type string + default { [ "if hasattr(hou.session, '_lifeblood__rs_ver_str'):\n return hou.session._lifeblood__rs_ver_str\n\nreturn 'error! cannot autodetect'" python ] } + parmtag { "script_callback_language" "python" } + } + } + } } diff --git a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/ExtraFileOptions b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/ExtraFileOptions index 6caeb582..6e422e4c 100644 --- a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/ExtraFileOptions +++ b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/ExtraFileOptions @@ -1,7 +1,27 @@ { + "PreFirstCreate/Cursor":{ + "type":"intarray", + "value":[10,1] + }, + "PreFirstCreate/IsExpr":{ + "type":"bool", + "value":false + }, + "PreFirstCreate/IsPython":{ + "type":"bool", + "value":true + }, + "PreFirstCreate/IsScript":{ + "type":"bool", + "value":true + }, + "PreFirstCreate/Source":{ + "type":"string", + "value":"" + }, "PythonModule/Cursor":{ "type":"intarray", - "value":[18,48] + "value":[18,1] }, "PythonModule/IsExpr":{ "type":"bool", diff --git a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/PreFirstCreate b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/PreFirstCreate new file mode 100644 index 00000000..623c23b4 --- /dev/null +++ b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/PreFirstCreate @@ -0,0 +1,11 @@ +import subprocess +import re + +out, _ = subprocess.Popen(['redshiftCmdLine'], stdout=subprocess.PIPE).communicate() + +node_type = kwargs['type'] +for line in out.splitlines(): + m = re.search(r'version (\d+)\.(\d+)(?:\.(\d+))', line.decode()) + if m: + hou.session._lifeblood__rs_ver_str = f'{m.group(1)}.{m.group(2)}.{m.group(3) or 0}' + break \ No newline at end of file diff --git a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Sections.list b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Sections.list index 2cd14533..6a32a0fa 100644 --- a/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Sections.list +++ b/dcc_plugins_workspace/houdini/otls/Driver-lifeblood_redshift_submitter-1.0.hda/lifeblood_8_8Driver_1lifeblood__redshift__submitter_8_81.0/Sections.list @@ -7,4 +7,5 @@ TypePropertiesOptions TypePropertiesOptions Help Help Tools.shelf Tools.shelf PythonModule PythonModule +PreFirstCreate PreFirstCreate ExtraFileOptions ExtraFileOptions