@^2j`40(4FL @2g4ȫ2 RAU\(!`" &bm֭ynX"4
%OEީ+GˈUPQ$8L ͌ +
+=)DDD,H>A*+%͏v V@KrT
=t Ƃ#)!! 8LDŽu\݂Q)<)\*F AA k4@M"-lR%p >8!#*S8c%adSCD%T N@""@[0l1cP;V8r"Y&bVH2%ӻA9- /Beebj"ʈn66Hy\H yșW
9Isk[9Luw)j~svcs_W[{~k/:?;ޜw/3[s~kl;~}n<_mmy[[ygzs_-εc\ g+1՝ּqxsoTs|{mr`Ը;Wιr7wZkyrmʽmPqu`u YnX*ς 7_AD.|>:@݂!`Z,W F!ʂO+W`!i'|Pm
+}xuBi2Y\Ax䂡+zT` B*PNET)_ , UffX%,0!skP"
+_ Ul *˚ThNqCJdX%|
J;aJ2kHe 6vu鈌2dA.w %0
+(ufLq^_h>UtQթka²nCv Ff-Y}f_f[ uhC뫓UP-AmW_#CрB/pIgt'&H+O`BT0w J UBJ_- s51oP@4̝)a'*T ntBJEt0yA0 fH.",0 ԇcabN݂AX,+ < ͤ0giIqP
+w4SLsC4#(f " *Qe0 GB.铌>;+نtG`L Ûhl<4$OnȀzb H0 aXX0*em9 M*jxJx2B%sȫn51BO.z%*a%櫶 c<앟 d"@h$``
+s$Xhr ?WmK> HBV Z OX 8!9ߎvK>y@ M-u#@> `/" ݺˁtH0WiCQi4LX@A50XDcYҶ0 uj X[0rCx9fY#p(G6dG D [in;j0W$`F(2dǐ1#U4^t FwJ^= @RH2^]v ,oky D2Ƴ$-1^, .*@)a}=:Vb X\WI
#85"q2[yX2S!v)<*t v5,\h'e?\u ZWC$Z(zbҚ2UEi "zYp,*zO
+9HTpB_qBGK*_=*uS^XeW컠`[0$!_,E Gy0qq&, e]2އ'ne`L4CPp9,ĬD;xXqG6T*|ov/Y)
-H@z F+W)̥"~ F$@qʲB\N.2D%Sr6 ҰS'jS ݂-]pY6X
+b\HėˤeaĖu0c9N#_:K'
#T_ݤ[I6
+mmXTe(
"|Ys5^Š KȌ\0njjdQiTr*X4N [iTTqI 4@ 5H8} ,
ˡL@C]^;$Ld@蓰ͥ!DJ@5 Rf9
ӀUTx
+-F8}+S$*FM`>[0a[VQin8*'Pӂܲ%V@URmyB .C
+AP, S(LYv F`.4 ITe۩@ِb Dc
+OrL`&OӹY OU)"5HJSB@bGStzcGiN9a b@Cal ||9v2v臑[0$ =MI3z
+JO$a 0O`
4aʬ?&Z#BB^uFffQkt [el@]D5 ^Ji^C#q Ұ&Oea")Ī*&.Cz2&c l VPM
e!cL'd AơX8v2
+}u }uBIO!@u'-1^栕k%a^DG;xTLdcZ QE $23ޥ"~S%~ځՈ&b)TD`Qx^HFD'+c<*9*,WmUW I!ܼA4$ ˡ¡}8LTSYJ6(KX!=6ϯDȕ,0^O6X!0 C [q,3~qͺnm)v[k>u}nVg~մƺok5U_1r_\_Ʒڛk5ŝ˻Ws35NktzV3K74;[{SݹUw|ݹ>ߌsR{~[w߹zsnz{V._yܾ1U ? y_{3~rWݽs]r6dRZI&I֛cg-o%(V(u-w7Ϝcl9ƛ}v9R9}{םZጭ6[ι[y:S-|[秊sV?z}io }_ޯŴ^7b{i_{i\nnq|is)9q6sroۧ;?wk\oWs+r5[o
S`$1225٦ J& L:.LFL22"I@,H (2rf k ,W_h{ah
3"]Ok/U:j\ĸ;VyBŅj%$ QHs^<8R odDg2#2dȩI CVu?}Θ+3+QK\r__*j 3{sc5q6a AWΎ{`inz <7vK[{Db "k!m^OYUq"O#WGH|1at*z@E,)Siޓ(qć4ZͪVbd}F,.pa%/ ϨW:eID UqP3=ӷR*j"ƻCvY
+]Cv'^uJfG홸,;ypW'`],nTl֍4>7}Xի O ԉ,GcԠF> (j >J;)J 9Qj tBVa9JOFy-W
}4Ƕ>;:]Z}mBo\C̐qCA C력:Ե(?!>4hOOM[ _>Y:R|S|*9 2eڰjTI|F 7ɖHagRҬS>ȧsPO5D2&!;Lڵ(<:d#|Qo:E& a# i w"d#֕ 6 38?^,Qpu-ǰ2JG@z?cpZ!;ڲ߱{H7/qs[` "*moZ`#&# QiK07ld A=(KVQAP rjⴽ,y:6=]G1+ KzsdFX
9Hy[?"8fU֟7BL@ Cq@"L3~.usrS#t@ y;cqh%&VF"!q# (2sˈ8q5톌^#a[Z.mڼklk H٪5GEQbqu >y3Mz .2ht-Bf2liʊUw%=,d"Ѽ'k,TQٶ.j:S]yT $|OzCߗYҼ>( g5Qƻ Dwgޖ$5qes 4:
}[xZ 7{ OQ"C]A"R4 Ջ~'7"{%!y3Vy]!k{p`JF@Dh kc%VX3X9&%:
+ ޥL lQ1ZS4 v2"6Rbj1hf@~@Ci7k SVQZ& m/&7X >a c3
+掸oQ3C0t* Pϕ߹E鿸^`ϣ0X
+s+E$CJ% Dvn?dLB -(9RG]]F 7 !fC=,&gObcVν!Tb@q &@ W`ze÷\TL]ۄTI5'%ͨADf.]AU˶! 'aA1#ぃCΖ"Xْa
+TM.@&k/AIq\
+Y4 Z/@qpl:>K0pP KT'^ !kT^qAJy(L?Qn {Kͤ1T{KrSITDZps.%*cM fͷ\dȧ<; S]):7 c(5 P߲ ii]43jv @BWj'0 +ޠ|LO RaL
*zk`Pd
+Fz:MGcq#t1|^mSVd"5%z/ L=zx4jMS&C!E$p[ C*[ P.gKML M7
<k9q
+y3t/Fa YWCNcC.}ȫ [;З9;?&b')`4$? XIm?Z^"U!+pGW|^1,bNJHy%
ȶUjش
+Yk}d]d#_,1
Xi
+2h R?m^nnn\*euE| ZR $>k~vwAfY~!ߧKS E٘hFM58K/!0
ǹ
% EDzњh{:-i~ܙ23zH:@
+~xqv *y )s]MKܓCERZ{\"PŽƬS\LK>d0UE@ d}7樂GZ.J٠p#ӞE51=0mZO?O%P
+>>9;jKf-5F;d ֤ 5 -/v)?-䏫-gQVݢS3[\%Xb`!Ჳ ۘvbaP_Ƭ4~ Ь@q
+'J*n Ne$>u"*Y[m`juyy?(`:yǥܸȣUwn$Yb\ ;:? @-Y 2 B x\ĥr/q
Q_`2OS>kYUAaWwN 9eCr\b} th)6As˗M
fa0yPޗlb/b @PgbU+_gg>}/t)o Av,0' 'H b'7C8tst$ TgñP2]D:tqb(Pң ~ !
)OvM3Y̬$o6 ym d?ہ2w
_Kc iNav`cd4JV1oStSXmVEA
+!?9$P9 b㎭H`hLa& mo s{Br&'E9\/D3{ I" GsUz2) $pCI5IdB,U8X9 V=p \-[)mg XDbY,+MKMUʌdEA4 qQ$}OoIqaW4? k>$b#9i Yզ氢&Hֱ1fqÉzl ߨLdGc%_F5 Ru$j|dݯMG0ْu[+=4 _p238b4 MeA0|MHa
+8 ۦQ^k' zs_b$nlz4{S!eU|!9>DQw
O `M4v8 ULN86&$&Y4UCrΌ&%1PB]ԁTh 4)I<}\5 Ȱ_7&EkD?>/+&N$&sV+&URn=,&EZ ΦSJbwK'k4L 2( 3.QPY$Jv!
+w>D kЍ3%{ &c0Lq >&fC`X2e:1)W+8SNh'6x|j[-}Nk
LG=ҌK
C#1l٥ { n@ ϤY`I0V@&5c'ǙcKHTSikLULZ9V3tJ.w
+4SkD3CmaS+zq%&w.o7z+L-|kCU8y >5VI58ގW(6+~1˰sbFʜJF? ÒcWA .hQ @T)nmVl~õT= _vU7<',~.kԸ H]tۼXH$܆Æ6kC~hp՟ 5(\k24s(a9Š{;XP z)5(ebe2}5M8w ڮBDgBҎ*b]\nB)ӗQ|<wxV{Wa5M W'O9k*E5\c^Uf r'!|z",?u0^$#I1yȥXC K̡sA k"+!֔f1!9!I(u%&>4*nńp"J
bV ΅#`$7ǜ2 #NQnhs&:%f5 IJEs;|:IUY@x,tdk/R1tlm=Ԝ%y#jKBB Pg$Ŀ%ViCLP%01'h>\$J/!q!\ !f n6;#4[}!ְ0Cu,G6B|SmEv:R |Ώfa6ۧ)Wj)*/ 0&46Tp t&>"Tb ]7!+! MMͅSJ PV 3ֵ:n
+|@v9'1:n$*w_t bS[¨;˓5kj4ͻxH`ey\G-eX:fRu- fkoOe r; 6Sg_/i tDI&$DN(,Dx*.
+ 6ǐ*ݮs| EhpHq
~m]XŷԲEr2b$I̔_dl,x&Y>/ i 96gfM&A& 4Kf7&#U3b*ՆpYC] @xQvQO:XgA㲀[`6a. d V z..j0y؎Q\#t.%̄ˠgX(P"3?˅d8հJkVF`e5z; 52 h5%lB=߆ɂhT
+K mO> "0!siH2epal,huk FG}D2LuF>ǺVp3CԋlkTa~tǃkD3FAШ'Ywo\
!Kl4!d(ќd"ki*3 1w#+LhK +39 Oܐ"L
LvuSpL KXj;nMtCulcE]=9ꭣ5SЂ)g ^ Ć N̛E:& c y5@Fe\ sX\ѯ6x<F80%ԓڊU`3/s-~伯Y8md4+'
LgA5# p?#<ͤԍE$D?
Zn#S#Hw`'\Ov[m=dx7Yxc e+_ZJ 'arjD!m9|烠6eeaE{ %uϡ`+<~jPNh|]h)3 甆~ Qrz )-5 .meJa thYJ7 2 *W~VvIոw4ڭޠZ5 ,$G<9NJXM(exF#˚3O74!Km_S=gs&XO4>O Pg@:"!lf ;= p OZ6@' ME
++@&k"wPN<'2MHU78em#g5Xlptf2˪)]7C\ǡL%IƧih
+N
=E4X1C3E%Pyps2E氝}ɟo
+LJu8E4_)%t
+= е n- :
+5k]w~ͲvӐ$ k>h:Q5tWLP(s8bL,Ke]Zyζ5<uK*Rk&;0#WV 㳎,#Rzf W Њ6煺RņVX`QAh{7/d$T u jyW*ϥJ
o%5t9
+7؆ _0IH`P#}c|iVXJĻRA[P![ԝ"
++A}!}5?߃|\njN @qeD< 29v_jFrӹqKd.Oj49ӽ= * k7$*>wVQr7 !deId_i9nkd{Ma З=YX>PʱɝK _#qȓ`15f`6To6]y$mǾhOww w|X }TJ*lHۊd6K[l|<_U`:Q̿ xWSOo՜:vHщ#o+0 Qe4 KxAQZ䨩Ec Zf= W+OFm๏Je6+K_4-1x;Mf+r tx6h -q[|}( ]߯ yGJ s}EHކR߱ 4'L_Xs
+C}}vh/n\%?è.$ P6K0:_Ǡ=2ED>8c,#LJt3Dt1ɕgÙ|<*lj W:Z+
-I eݢX$l5 ?6:NRp0H]_q&mwɼ>
-<2A_~fY%P(Y2W'$ pv2,$T5o5BlehcrB&>c\n~ȉEFxWVe^g+FbȬ> NѝߪHNGQ!T!֛l766w"<)tC eyiA,dϻN;wMeC6v> 7B3̳^NhZ- ⌔ )
̓2 mά,e9}c~~"tᡢYʐut {%AIqdI 1(0FGfOڪ:81w/'3<p1fZ4̓oS7TwuDd J䮷(m 4Nxz`>kښR`X H_ƨb8xtXbYb %9?CWkyspS[H_.dr=iK ']` ` C^0vDX
:T@N&oEAwvT"&yh9F.A
+ĸW|60^Ж T#}t%`-
08L6U[yU8d*4$
Nv! [ I6H;jF`E,s9T M/Iho&̉7*T):MG# = MH
+J}|
bdy8*Kid"1M8 ={L#ЊTmC`%GD^u ׇryM E$hsװGfᒹVK )u`j:țG= "ˊ߀ gAڪr̬̣ 6R
+w2E>ҵ]Wk ?\D \C +g+;fNV 8l`$DF*)蛘-ҰU &U'0"71(Mg?G p-W.S8JIY'_!h7ik@Ѝ =Uh Kܢy 'q̤u56$2
+(t wcOdPR;ھ+!T^A4.%[_ކiϺ rbf Fjk6D^$ӕ}%6]$U_
+ B ۠xbD*ځqS #nC &5t7 DM! n(X|Sq.0!U 07
+1V!= kc}-h9$ j# HRRXс֬u-_-4|1V
5|M?C 9j^9\> HfAd IkFC/g TM<!+R*hs>h?fi@ \i 6#eF 838\VN kQ ޑYT.J {)y( B3ڴӐ305c )'o~fx D韺cZA, ]7Rد(ZiQQxΏż%k+: ڛ
+aǍXuFYQ!;l9Gp?i< ,_9L6HA,r3 E
+"z;
-dLOTD6B5sI ͋+ (l9pl[}tG I1]ьVVX3n^QӴXt yH)Gz3fL d
+*ƏmWJM#"͓| #tv
+Y>>g" J%ćv
+t]N0)sUҊhX3d
+|Yº`bDG"i%lۢ&
g#
!k 2*BQz7x퓆 ]}='&gӆ77/= `욧~ZHRk u|9!lvӞ0[וyӏNU\VaCtsȳ;O?*f?) C$1{! Nepr} !( Qf*}nx( N 9^$e7t߀QU\ Z4y9 m@+cup"eT2jRٺ #Y{' tɜe !1g`Z
Dm.;ΌA(ڴo6N,98 {er[LU
+mҰBx%&ʶpy ДPnGy
+D~mO.q 8rp3yطh^'q>'%|4#oeJqo jPQ cUU$qߖ]9_Kn34bL|TRYT$dѷ' s~ 蹆~K__zQ;EynHʆ]pڧ7YH
+A:/p LO6o.B כ ؑ;U-r
13^XbUs6*ai~?3wK2'HP! ;UWm, v {=wb )2l@1*U$YΈ48 M$h K/3Ć^ħɨ?ʦ{ 'qƉ ]^ 0;礻ȝ2,~*nvbDBd8zl4$pc{V| q¯%N)8Ǜ,I}h!dY pMPWSUZr/ 0Ip~؍|`3v8 UऑdzF 𩻻#n: *Gȷ|FjP hVZ}zDZD9Ӟ8 nsB x!% FJa畆[&ŷ<,ε]PF QaЯPS4䔸wӵ]o8䄭#=e帑%,g-%JaOZz%L)kЛLUB 9dvߧڍ}|(^4fBbH[Be+in@ SAMij#M 8v!n%[v\zfV(
+yݓ w^S lG:4^]o",Za՟f#Jk`㢍B j
!ih{Qom\
EzIȢza8QekMAP0[`xLfYT?$ .I;>&G)/fW$v1U5}iM2MC-,KHU`F3alb.S),p@=U#FbGnOӓ!\ ZȮ˔ʫ5~{ƻe=a:Nii5Hv\ Y9z -#y[%k0f)|S&B]@
@ Ś(~rD$RE +3b`nv@5v.*3D$ 2+;͇eLi2tEY:!<ŇG
+ŎK,J]lrchATOTܫhSӾG q / y;٩sdvFS
+.Ճho~~:n~lsj1 cIdW}i1q S#~ (Ȋ0 %_
+z!LUr0l}l&q#3=BDE W ؖL#C" i[
+lrT!<HǏ`&g)&dR>
endobj
xref
+0 28
+0000000004 65535 f
+0000000016 00000 n
+0000000147 00000 n
+0000021206 00000 n
+0000000000 00000 f
+0000021257 00000 n
+0000000000 00000 f
+0000024128 00000 n
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000024201 00000 n
+0000024342 00000 n
+0000025962 00000 n
+0000000000 00000 f
+0000023828 00000 n
+0000053926 00000 n
+0000021638 00000 n
+0000024015 00000 n
+0000022956 00000 n
+0000023266 00000 n
+0000023314 00000 n
+0000023899 00000 n
+0000023930 00000 n
+0000053951 00000 n
+trailer
+<]>>
+startxref
+54149
+%%EOF
diff --git a/program icons/Vegas_Pro_15.0.png b/program icons/Vegas_Pro_15.0.png
new file mode 100644
index 0000000..d52faeb
Binary files /dev/null and b/program icons/Vegas_Pro_15.0.png differ
diff --git a/program icons/substance_designer.png b/program icons/substance_designer.png
new file mode 100644
index 0000000..df341ed
Binary files /dev/null and b/program icons/substance_designer.png differ
diff --git a/program icons/substance_painter.png b/program icons/substance_painter.png
new file mode 100644
index 0000000..f62ddd2
Binary files /dev/null and b/program icons/substance_painter.png differ
diff --git a/src/app.rs b/src/app.rs
index 9a1dec0..428191e 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1,10 +1,13 @@
+use crate::program_status::get_running_windows_titles;
+use lazy_static::lazy_static;
+use regex::Regex;
+extern crate lazy_static;
#[derive(Debug)]
pub struct App {
pub kind: AppKind,
pub default_project_name: String,
pub drp_client_id: String,
pub process_search_string: String,
- pub config_search_string: String,
}
#[derive(Debug, PartialEq, Eq)]
pub enum AppKind {
@@ -19,9 +22,14 @@ pub enum AppKind {
DavinciResolve,
Clarisse,
Marvelous,
- Calvary,
+ Cavalry,
Ableton,
FL,
+ Blender,
+ Audition,
+ SubstancePainter,
+ SubstanceDesigner,
+ Vegas,
}
pub struct Apps {
@@ -36,13 +44,18 @@ pub struct Apps {
DavinciResolve: App,
Clarisse: App,
Marvelous: App,
- Calvary: App,
+ Cavalry: App,
Ableton: App,
FL: App,
+ Blender: App,
+ Audition: App,
+ SubstancePainter: App,
+ SubstanceDesigner: App,
+ Vegas: App,
}
impl Apps {
- pub fn as_iter(&self) -> [&App; 14] {
- let APPS: [&App; 14] = [
+ pub fn as_iter(&self) -> [&App; 19] {
+ let APPS: [&App; 19] = [
&self.C4d,
&self.Maya,
&self.ThreeDsMax,
@@ -54,16 +67,21 @@ impl Apps {
&self.DavinciResolve,
&self.Clarisse,
&self.Marvelous,
- &self.Calvary,
+ &self.Cavalry,
&self.Ableton,
&self.FL,
+ &self.Blender,
+ &self.Audition,
+ &self.SubstancePainter,
+ &self.SubstanceDesigner,
+ &self.Vegas,
];
APPS
}
}
impl AppKind {
- pub fn as_iter() -> [AppKind; 14] {
- let APPKINDS: [AppKind; 14] = [
+ pub fn as_iter() -> [AppKind; 19] {
+ let APPKINDS: [AppKind; 19] = [
AppKind::C4d,
AppKind::Maya,
AppKind::ThreeDsMax,
@@ -75,9 +93,14 @@ impl AppKind {
AppKind::DavinciResolve,
AppKind::Clarisse,
AppKind::Marvelous,
- AppKind::Calvary,
+ AppKind::Cavalry,
AppKind::Ableton,
AppKind::FL,
+ AppKind::Blender,
+ AppKind::Audition,
+ AppKind::SubstancePainter,
+ AppKind::SubstanceDesigner,
+ AppKind::Vegas,
];
APPKINDS
}
@@ -89,100 +112,116 @@ impl Apps {
default_project_name: "Cinema 4D Project".to_string(),
drp_client_id: "936296341250904065".to_string(),
process_search_string: "Cinema 4D R".to_string(),
- config_search_string: "c4d".to_string(),
kind: AppKind::C4d,
},
Maya: App {
default_project_name: "Autodesk Maya Project".to_string(),
drp_client_id: "1016369550276694106".to_string(),
process_search_string: "Autodesk Maya".to_string(),
- config_search_string: "maya".to_string(),
kind: AppKind::Maya,
},
ThreeDsMax: App {
default_project_name: "3ds Max Project".to_string(),
drp_client_id: "1016395801402036315".to_string(),
process_search_string: " Autodesk 3ds Max".to_string(),
- config_search_string: "threedsmax".to_string(),
kind: AppKind::ThreeDsMax,
},
AfterEffects: App {
default_project_name: "After Effects Project".to_string(),
drp_client_id: "1016395319522623539".to_string(),
process_search_string: "Adobe After Effects".to_string(),
- config_search_string: "after_effects".to_string(),
kind: AppKind::AfterEffects,
},
PremierePro: App {
default_project_name: "Premiere Pro Project".to_string(),
drp_client_id: "1016396017832300555".to_string(),
process_search_string: "Adobe Premiere Pro".to_string(),
- config_search_string: "premiere_pro".to_string(),
kind: AppKind::PremierePro,
},
Illustrator: App {
default_project_name: "Illustrator Project".to_string(),
drp_client_id: "1017491707819991071".to_string(),
- process_search_string: "Adobe Illustrator".to_string(),
- config_search_string: "illustrator".to_string(),
+ process_search_string: "Illustrator.exe".to_string(),
kind: AppKind::Illustrator,
},
Photoshop: App {
default_project_name: "Photoshop Project".to_string(),
drp_client_id: "1017493347415371917".to_string(),
- process_search_string: "Photoshop".to_string(),
- config_search_string: "photoshop".to_string(),
+ process_search_string: "Photoshop.exe".to_string(),
kind: AppKind::Photoshop,
},
Indesign: App {
default_project_name: "Indesign Project".to_string(),
drp_client_id: "1017493794456862781".to_string(),
process_search_string: "Indesign".to_string(),
- config_search_string: "indesign".to_string(),
kind: AppKind::Indesign,
},
DavinciResolve: App {
default_project_name: "Davinci Resolve Project".to_string(),
drp_client_id: "1016371757722128516".to_string(),
- process_search_string: "Davinci Resolve".to_string(),
- config_search_string: "davinci_resolve".to_string(),
+ process_search_string: "DaVinci Resolve - ".to_string(),
kind: AppKind::DavinciResolve,
},
Clarisse: App {
default_project_name: "Isotropix Clarisse Project".to_string(),
drp_client_id: "1016372248128532500".to_string(),
process_search_string: "Isotropix Clarisse".to_string(),
- config_search_string: "clarisse".to_string(),
kind: AppKind::Clarisse,
},
Marvelous: App {
default_project_name: "Marvelous Designer Project".to_string(),
drp_client_id: "1016372646046351423".to_string(),
process_search_string: "Marvelous Designer".to_string(),
- config_search_string: "marvelous".to_string(),
kind: AppKind::Marvelous,
},
- Calvary: App {
+ Cavalry: App {
default_project_name: "Cavalry Project".to_string(),
drp_client_id: "1016374130037243974".to_string(),
- process_search_string: "calvary.exe".to_string(),
- config_search_string: "calvary".to_string(),
- kind: AppKind::Calvary,
+ process_search_string: "Cavalry.exe".to_string(),
+ kind: AppKind::Cavalry,
},
Ableton: App {
default_project_name: "Ableton Project".to_string(),
drp_client_id: "1016375030227161150".to_string(),
process_search_string: "Ableton Live".to_string(),
- config_search_string: "ableton".to_string(),
kind: AppKind::Ableton,
},
FL: App {
default_project_name: "FL Studio Project".to_string(),
drp_client_id: "1016393561140375712".to_string(),
process_search_string: "FL Studio".to_string(),
- config_search_string: "fl".to_string(),
kind: AppKind::FL,
},
+ Blender: App {
+ kind: AppKind::Blender,
+ default_project_name: "Blender Project".to_string(),
+ drp_client_id: "1017878734746963978".to_string(),
+ process_search_string: "BlenderGLEW".to_string(),
+ },
+ Audition: App {
+ kind: AppKind::Audition,
+ default_project_name: "Audition Project".to_string(),
+ drp_client_id: "1017879756282286153".to_string(),
+ process_search_string: "Adobe Audition.exe".to_string(),
+ },
+ SubstancePainter: App {
+ kind: AppKind::SubstancePainter,
+ default_project_name: "Substance Painter Project".to_string(),
+ drp_client_id: "1017881633296232578".to_string(),
+ process_search_string: "Substance 3D Painter".to_string(),
+ },
+ SubstanceDesigner: App {
+ kind: AppKind::SubstanceDesigner,
+ default_project_name: "Substance Designer Project".to_string(),
+ drp_client_id: "1017881386583080971".to_string(),
+ process_search_string: "Substance Designer".to_string(),
+ },
+ Vegas: App {
+ kind: AppKind::Vegas,
+ default_project_name: "Vegas Project".to_string(),
+ drp_client_id: "1017882355723153448".to_string(),
+ process_search_string: "Vegas Pro".to_string(),
+ },
}
}
}
@@ -196,14 +235,6 @@ impl Apps {
}
None
}
- pub fn find_config_app(&self, str: &str) -> Option<&App> {
- for app in self.as_iter() {
- if str == app.config_search_string {
- return Some(app);
- }
- }
- return None;
- }
}
impl App {
@@ -218,8 +249,8 @@ impl App {
match window_title.find(".c4d]") {
Some(i) => end_i = i as usize,
None => match window_title.find(" - Main") {
- Some(i) => end_i = i as usize - 1,
- None => end_i = window_title.len() - 1,
+ Some(i) => end_i = i as usize,
+ None => end_i = window_title.len(),
},
};
}
@@ -228,11 +259,11 @@ impl App {
}
AppKind::Maya => {
let match_index = match window_title.as_str().find(".mb* - Autodesk Maya") {
- Some(i) => i,
+ Some(i) => i + 5,
None => match window_title.as_str().find(".mb - Autodesk Maya") {
Some(i) => i + 4,
None => {
- return String::from("Autodesk Maya Project");
+ return self.default_project_name.clone();
}
},
};
@@ -253,17 +284,160 @@ impl App {
}
proj_name
}
- AppKind::ThreeDsMax => self.default_project_name.clone(),
- AppKind::PremierePro => self.default_project_name.clone(),
- AppKind::Illustrator => self.default_project_name.clone(),
- AppKind::Photoshop => self.default_project_name.clone(),
+ AppKind::ThreeDsMax => {
+ let match_index = match window_title.as_str().find(".max* - Autodesk 3ds Max") {
+ Some(i) => i + 5,
+ None => match window_title.as_str().find(".max - Autodesk 3ds Max") {
+ Some(i) => i + 4,
+ None => {
+ return self.default_project_name.clone();
+ }
+ },
+ };
+ return window_title[..match_index as usize].to_string();
+ }
+ AppKind::DavinciResolve => {
+ let match_index = match window_title.as_str().find("DaVinci Resolve -") {
+ Some(i) => 17 as usize,
+ None => 0 as usize,
+ };
+ let mut with_project_extention = window_title.clone();
+ with_project_extention.push_str(".drp");
+ return with_project_extention[match_index as usize..].to_string();
+ }
+ AppKind::PremierePro => {
+ let mut proj_name = String::new();
+ for i in (0..window_title.len() - 2).rev() {
+ if window_title.chars().nth(i).unwrap() == '\\' {
+ for char in window_title.chars().skip(i + 1) {
+ proj_name.push(char);
+ }
+ return proj_name;
+ }
+ }
+ if proj_name == "" {
+ proj_name = window_title.clone();
+ }
+ proj_name
+ }
+ AppKind::Illustrator => {
+ let running_windows_titles = unsafe { get_running_windows_titles() };
+ lazy_static! {
+ static ref REG_AI: Regex =
+ Regex::new(r".{0,} @ (\d{0,}\.\d{0,}|\d{0,}) % \(\w{3,4}\W\w{0,}\b\)")
+ .unwrap();
+ }
+ let mut match_index = self.default_project_name.len();
+ let mut matching_title = self.default_project_name.clone();
+
+ for titles in running_windows_titles {
+ if REG_AI.is_match(&titles) {
+ if let Some(i) = titles.find("@") {
+ matching_title = titles.clone();
+ match_index = i;
+ }
+ }
+ }
+ let out_string = matching_title[..match_index].to_string();
+ out_string
+ }
+ AppKind::Photoshop => {
+ let running_windows_titles = unsafe { get_running_windows_titles() };
+ lazy_static! {
+ static ref REG_PSD: Regex =
+ Regex::new(r".{0,}@ (\d{0,}|\d{0,}.\d{0,})% \(.{0,}, \w{0,}\W.{0,}\)")
+ .unwrap();
+ }
+ let mut match_index = self.default_project_name.len();
+ let mut matching_title = self.default_project_name.clone();
+
+ for titles in running_windows_titles {
+ if REG_PSD.is_match(&titles) {
+ if let Some(i) = titles.find("@") {
+ matching_title = titles.clone();
+ match_index = i;
+ }
+ }
+ }
+ let out_string = matching_title[..match_index].to_string();
+ out_string
+ }
AppKind::Indesign => self.default_project_name.clone(),
- AppKind::DavinciResolve => self.default_project_name.clone(),
- AppKind::Clarisse => self.default_project_name.clone(),
+ AppKind::Clarisse => {
+ let match_index = match window_title.as_str().find(".ple* - Isotropix Clarisse") {
+ Some(i) => i + 5,
+ None => match window_title.as_str().find(".ple - Isotropix Clarisse") {
+ Some(i) => i + 4,
+ None => match window_title.as_str().find(" - Isotropix Clarisse") {
+ Some(i) => i,
+ None => {
+ return self.default_project_name.clone();
+ }
+ },
+ },
+ };
+ return window_title[..match_index as usize].to_string();
+ }
AppKind::Marvelous => self.default_project_name.clone(),
- AppKind::Calvary => self.default_project_name.clone(),
- AppKind::Ableton => self.default_project_name.clone(),
- AppKind::FL => self.default_project_name.clone(),
+ AppKind::Cavalry => {
+ let running_windows_titles = unsafe { get_running_windows_titles() };
+ lazy_static! {
+ static ref REG_CV: Regex =
+ Regex::new(r"Project: .{0,}Scene: .{0,}\.cv ").unwrap();
+ }
+ let mut match_index = 0;
+ let mut matching_title = self.default_project_name.clone();
+
+ for titles in running_windows_titles {
+ if REG_CV.is_match(&titles) {
+ if let Some(i) = titles.rfind(r"/") {
+ matching_title = titles.clone();
+ match_index = i + 1;
+ }
+ }
+ }
+ let out_string = matching_title[match_index..].to_string();
+ out_string
+ }
+ AppKind::Ableton => {
+ let match_index = match window_title.as_str().find(" - Ableton Live") {
+ Some(i) => i,
+ None => return self.default_project_name.clone(),
+ };
+ return window_title[..match_index as usize].to_string();
+ }
+ AppKind::FL => {
+ let match_index = match window_title.as_str().find(" - FL Studio") {
+ Some(i) => i,
+ None => return self.default_project_name.clone(),
+ };
+ return window_title[..match_index as usize].to_string();
+ }
+ AppKind::Blender => {
+ let running_windows_titles = unsafe { get_running_windows_titles() };
+ lazy_static! {
+ static ref REG_BL: Regex =
+ Regex::new(r"Blender \[.{0,}\\\w{0,}\.blend]").unwrap();
+ }
+ let mut match_index = 0;
+ let mut matching_title = self.default_project_name.clone();
+
+ for titles in running_windows_titles {
+ if REG_BL.is_match(&titles) {
+ if let Some(i) = titles.rfind(r"\") {
+ matching_title = titles.clone();
+ match_index = i + 1;
+ }
+ }
+ }
+ let end_i = matching_title.len();
+ let out_string = matching_title[match_index..end_i - 1].to_string();
+ out_string
+ }
+ AppKind::Audition => self.default_project_name.clone(),
+ AppKind::SubstancePainter => self.default_project_name.clone(),
+ AppKind::SubstanceDesigner => self.default_project_name.clone(),
+ AppKind::Vegas => self.default_project_name.clone(),
}
}
}
diff --git a/src/main.rs b/src/main.rs
index d541493..62b6a88 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,4 @@
-#![windows_subsystem = "windows"]
+//#![windows_subsystem = "windows"] //UNCOMMENT ONLY WHEN BUILDING FOR RELEASE TO NOT SHOW TERMINAL WINDOW!
pub mod app;
pub mod config;
pub mod program_status;
diff --git a/src/program_status.rs b/src/program_status.rs
index f7134fe..7084cbd 100644
--- a/src/program_status.rs
+++ b/src/program_status.rs
@@ -5,10 +5,13 @@ use windows::Win32::{
};
pub fn get_running_program(apps: &Apps) -> Option<(&App, String)> {
let running_window_names = unsafe { get_running_windows_titles() };
-
for window_name in running_window_names {
+ dbg!(&window_name);
if let Some(app) = apps.find_app(&window_name) {
- return Some((&app, app.parse(&window_name)));
+ if !window_name.contains("- Google Chrome") {
+ //So googling it won't affect the DRP lol
+ //return Some((&app, app.parse(&window_name)));
+ }
}
}
return None;
@@ -17,15 +20,17 @@ pub fn is_program_still_running(app: &App) -> Option {
let running_window_names = unsafe { get_running_windows_titles() };
for window_name in running_window_names {
- //dbg!(&window_name);
if window_name.contains(&app.process_search_string) {
- return Some(app.parse(&window_name));
+ if !window_name.contains("- Google Chrome") {
+ //So googling it won't affect the DRP lol
+ return Some(app.parse(&window_name));
+ }
}
}
return None;
}
-unsafe fn get_running_windows_titles() -> Vec {
+pub unsafe fn get_running_windows_titles() -> Vec {
let mut running_windows_names: Vec = Vec::new();
unsafe extern "system" fn processhwd(hwnd: HWND, lparam: LPARAM) -> BOOL {
// Get the length of the window text
@@ -46,7 +51,8 @@ unsafe fn get_running_windows_titles() -> Vec {
for char in window_text_buffer {
window_text.push(char as char);
}
- //turn characters into strings
+ //turn characters into strings, but exclude last weird escape null char "\0"
+ window_text.pop();
let window_text = String::from_iter(window_text.iter());
//turn vector into pointer and push window_texts to it