From ac2eb31869ecd9e5a86623d3b6ab8b1babc09db6 Mon Sep 17 00:00:00 2001 From: Stewie Date: Sat, 21 May 2022 23:08:00 -0400 Subject: [PATCH 1/8] Adding first version of get_pull_requests function --- RepoFunctions.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/RepoFunctions.py b/RepoFunctions.py index a6c1529..ebe8392 100644 --- a/RepoFunctions.py +++ b/RepoFunctions.py @@ -2,6 +2,7 @@ import os import requests import json import subprocess +import pandas as pd def get_Releases(org, repo_name, latest=False): @@ -29,3 +30,20 @@ def refresh_repo(repo_name): ["git", "pull"], cwd=base_path ) + +def get_pull_requests(org, repo_name): + api_url = "https://api.github.com/repos/{}/{}/pulls?state=all".format(org, repo_name) + + header = { + "Accept":"application/vnd.github.v3+json" + } + + res = requests.get(api_url) + json_res = json.loads(res.text) + + #Taking Top 5 PR + top5 = json_res[0:5] + + top5_infos = pd.DataFrame([ [ele['created_at'], ele['title'], ele['state'], ele['user']['login'], ele['url']] for ele in top5], columns = ['Created', 'Title', 'Status', 'User', 'Url']) + + From 00895f800a88b16281e12bae0bdbb6776cc40b94 Mon Sep 17 00:00:00 2001 From: Stewie Date: Sat, 21 May 2022 23:09:50 -0400 Subject: [PATCH 2/8] Create message before calling send_message function --- GoogleAPI.py | 7 +------ ToolsTales_Executable.py | 8 +++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/GoogleAPI.py b/GoogleAPI.py index 9722747..1235faa 100644 --- a/GoogleAPI.py +++ b/GoogleAPI.py @@ -31,15 +31,10 @@ def get_credentials(): # Gets valid user credentials from disk. return credentials -def send_message(sender, to, commiter_name, subject, xdelta_link): +def send_message(sender, to, subject, xdelta_link, message_text): - message_text = """ -Hi {}, -here is your xdelta patch : -{} -""".format(commiter_name, xdelta_link) credentials = get_credentials() #print (credentials) diff --git a/ToolsTales_Executable.py b/ToolsTales_Executable.py index 65c133b..88bf367 100644 --- a/ToolsTales_Executable.py +++ b/ToolsTales_Executable.py @@ -216,7 +216,13 @@ if __name__ == "__main__": file_link = GoogleAPI.upload_xdelta(xdelta_name, "Stewie") #Need to add user for the folder - GoogleAPI.send_message('fortiersteven1@gmail.com', 'fortiersteven1@gmail.com', "Stewie", game_name + " Patch", file_link) + message_text = """ +Hi {}, + +here is your xdelta patch : +{} +""".format('fortiersteven1@gmail.com', file_link) + GoogleAPI.send_message('fortiersteven1@gmail.com', 'fortiersteven1@gmail.com', game_name + " Patch", file_link) From a8d8533174ca5e4b5f340941bd3c256604d2c790 Mon Sep 17 00:00:00 2001 From: Stewie Date: Sat, 21 May 2022 23:10:23 -0400 Subject: [PATCH 3/8] Adding message_text to parameters --- ToolsTales_Executable.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ToolsTales_Executable.py b/ToolsTales_Executable.py index 88bf367..f615f41 100644 --- a/ToolsTales_Executable.py +++ b/ToolsTales_Executable.py @@ -222,7 +222,7 @@ Hi {}, here is your xdelta patch : {} """.format('fortiersteven1@gmail.com', file_link) - GoogleAPI.send_message('fortiersteven1@gmail.com', 'fortiersteven1@gmail.com', game_name + " Patch", file_link) + GoogleAPI.send_message('fortiersteven1@gmail.com', 'fortiersteven1@gmail.com', game_name + " Patch", file_link, message_text) From 710583bb956c75f536179d58d1d96add2d0f5323 Mon Sep 17 00:00:00 2001 From: Stewie Date: Sat, 21 May 2022 23:12:01 -0400 Subject: [PATCH 4/8] Adding function to convert the PRs infos to message text for the temail --- RepoFunctions.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RepoFunctions.py b/RepoFunctions.py index ebe8392..3c0deea 100644 --- a/RepoFunctions.py +++ b/RepoFunctions.py @@ -47,3 +47,10 @@ def get_pull_requests(org, repo_name): top5_infos = pd.DataFrame([ [ele['created_at'], ele['title'], ele['state'], ele['user']['login'], ele['url']] for ele in top5], columns = ['Created', 'Title', 'Status', 'User', 'Url']) +def get_pull_requests_message(org, repo_name): + + #Get Datas + get_pull_requests(org, repo_name) + + + \ No newline at end of file From b4cf41dc4c50d6195a714379817d500adffef6f5 Mon Sep 17 00:00:00 2001 From: Stewie Date: Sat, 21 May 2022 23:20:56 -0400 Subject: [PATCH 5/8] Changing to a List and finishing get_pull_requests_message --- RepoFunctions.py | 17 ++++++++++++++--- __pycache__/ApacheAutomate.cpython-38.pyc | Bin 3246 -> 3354 bytes __pycache__/GoogleAPI.cpython-38.pyc | Bin 4701 -> 4618 bytes __pycache__/RepoFunctions.cpython-38.pyc | Bin 868 -> 1492 bytes __pycache__/ToolsTOR.cpython-38.pyc | Bin 9664 -> 9664 bytes __pycache__/ToolsTales.cpython-38.pyc | Bin 23755 -> 23755 bytes 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/RepoFunctions.py b/RepoFunctions.py index 3c0deea..2edb078 100644 --- a/RepoFunctions.py +++ b/RepoFunctions.py @@ -44,13 +44,24 @@ def get_pull_requests(org, repo_name): #Taking Top 5 PR top5 = json_res[0:5] - top5_infos = pd.DataFrame([ [ele['created_at'], ele['title'], ele['state'], ele['user']['login'], ele['url']] for ele in top5], columns = ['Created', 'Title', 'Status', 'User', 'Url']) - + return top5 def get_pull_requests_message(org, repo_name): #Get Datas - get_pull_requests(org, repo_name) + top5_prs = get_pull_requests(org, repo_name) + + message ='Here are the PRs recently : ' + + for pr in top5_prs: + + message = message + "\n" + message += '{} - {} by {}'.format(pr['created_at'], pr['title'], pr['user']['login']) + + return message + + + \ No newline at end of file diff --git a/__pycache__/ApacheAutomate.cpython-38.pyc b/__pycache__/ApacheAutomate.cpython-38.pyc index b6b764cbf0f2a202369d49ed2bc3eab533074b04..7aa62bf275d496708e3b173603fdac77e086c096 100644 GIT binary patch delta 1557 zcmZ1{IZKK+l$V!_fq{X6FQ7B2bRzGY`fm&j3?&RHjLnRU3?+>$-Oj9IJ;*cLJ{GL*2VaDYTg7*aSvbPZz`M;2!aR|CH<;+dHf4f^AsEl5|cAhjVIq@bn%i4C`v6ZR&dQLNi9-H zOv*1UQE)3tO;zy8Ois-!POW0EcJ&K!4XUk@$5iN2lv$RlkegXtoSBy%HCda=R2qyFS&%rR;TplD;_U=(5!Vdh}uV&q`vU=(2FVB}yjVHRQ*ViaJOVk$D6ti)1c z7RBL{SzO{-lA2q@%fP^Ji?t{-J)>kL(=E27(vp(=yjyI^`T0dD#hP42@*sDCj4sli ze1=7#UJk@(0TG%Y$FknyOv}tkjn7NWO)b&`nZ=S>lA0UET998HUjd;ii}XS2!Gr-w ziBL{{a$-qpJlNLwjQ2Kfq#nHd-+XR|J= z=LZ?W;+vXRS|rH8z)-~<>=O_iZ)9qsXKE0|VrXD#S|kh-=W@%;NmT$j&8kS0fq@~4 z#Wf|fq(~Cv8Zi(d4k9E#N_m1(3vv>ZQx!m3z-E|e@)Rk8}xOq_PTIVQGR)GYJ3sIx_D6F8NvO|tj8$A zD8nelT;woWjQx2e$fHF9AY;J(6ool5I5j6Vxg<3O;#yW?BXbL*TO6PO0mmuGgSS|6 zQqxL`j6t5`3N1)UEJ;-e@plG$%_wSe7>9a2m~E^ng2S6Az68a^Eq3Spypq(4k|Knk z%|MPb2NCczQDgz)T7n2r;)xQ5<{ePTLOoDaa&XXq6M1}Eeo<~>Ns$#O3I&iuF1{eYxX2D<6F7vy1UQ&^kyRCgR1^z=5)qRQ zBL_1VvmB!s69+r91fvL3k?Z6p&aYDNkdET;FUm~M%uCEE0_i9coIH_hYCR|oXbPYQ zlq$$(4GKGb@!*KcuvLZUz=u_ObWyU=qIS0cDviqFbV3YmPGTbZl$V!_fq{YH?d*so#)-Ud>hCcyFqAN4F{Uu4F!eGnU`k}Yg*}BMg|nBbmZ^pbRlbBXi)#Tl znB*zpT)?}Kp@cJwPaH(@i!&@_OyR1jXGq~r;Ys0LAW*}wkZ~bfEi=?mz7+mm#sz{P z>uMOYgt9nN1i&J~3mIxzYFHMCqzEn$s9|2nxDetHkP4v`;S`Y+(O%{S!V4K-dV?7> z#r$qDmu4oeWW2?ml$e~InwL_=omh~VoRMlgS(ZtglfBy2FT^#d_SWP{Om>X7CSPPS z<`!dMU?}2eU|`S`oh-(z#CU76CG%>7Tf8YnnPsW*xtYbqnR)5AI5La#;|mf?GHwZ$ zq*j!~C*@bfr)B1(<|XE)u4E`OnJmH*qaXzea3&!}5oRt%4i*7M4n__p6J{Z1Aw~ga zDW)Q`$Uu- z#e-}rGGJg}xW$rLlA3#qwIIJZz5+s37MXz5g9+2g3s}WPH5eEeiopqhQG}6?k&ls! zvB+ie8P=Wk0$?M2Q}arTgcukYsOilDm4Q{a*8d#bZiGswr+%j`g6+pIH z6^VoOxTa*56iI_Dk^m8sAOhs&DxRR!f}F(UR0WV0uo)(rJVnYNc@+?$3L?}%ggS!~ z149wWaYdRSKE&G~7RawfIv|$bWHokm0euh?>>)5=IyshILKGwj@fEWkqX?r6qZD(I z_v9}2=iDG)6$yg$2u-fxkTSW&YHVa~VRVZF7gB*T~B_}nlq{tHNztDn|#FA8n z5PxT|lZ|doKE6rCJtrGu z_~dV#U!~wddW*xqC^J1XFEOV`7-X!_WLEB}^`My56hIFqb&vurkZr65MVWaex7dm^ zN=q_xZm}fi7gQE8fuvn z1HfLt#gUg|Fi;E$agQ61@2Mk3ZXB2^SAsGz`$I0(_RM}-Y*g1GO!~j@zN!9=W diff --git a/__pycache__/GoogleAPI.cpython-38.pyc b/__pycache__/GoogleAPI.cpython-38.pyc index 57082b470d8b34e6ce0b13a68cac9bf0097583a0..98d16215781ee7e45e36ceab9c768eeb19f236d1 100644 GIT binary patch delta 1331 zcmcbs(xt*1%FD~ez`(!|ys|UNY9sGHCdR1AXPBfJqb9##(zK4^C@Rg1Ps_}+@Bm)COGV5eJehDup1_p)_hGvFZ)*99Yj3rD9m=`iEWUOT?VaZ}m zVN7AFVM}4|Wv*o}VXI-NVXR@QVQFTm-NWJqBMX3%8yi<;cWA}+&G z1Ts5{GqJQJBfluKD)kmeMoCFQPG*u()Z~*ami3&s*oss0Qc{ayCL};ActB>yLuHj17#NDdfy&Cp#K$PW$j4a3sJ3|~>qbV#sL9^!hKx~@YuQ!g zqc}ZEN(x+yit>wYu@)3%=9S!HE-oq3WGPZ*U|@)ve1Kh218fDD0NGQdz`($u2RELF ziBXD~jZuiPNMSQ0$9YB`kj=MP(u(qPiv;1v!o_H7_|oCG{3tN-BufWGhkx zxgMmrNEyUZ0TCc$Z!zZ16>6lIpB7THhs z=FyP^n_>sD9^}1S9OdPhP=ug3SsfZ9Tb+*Ui8N>xR0(WJ!U)FKX$=;Vol zA{tRV1(o0wr3Z3y5jRMJ7bXOjC<28{)a0{*%Eq8FqDT$o5Ku+}r|cq7AQXYa4dhU8 X%0eO}CMydWa`JG9a42%{aYz9Gzr<6# delta 1516 zcmeBDxvRn(%FD~ez`(#Tr!F#S=|_;@-yhIsn>#rrw>y55@X!>qz} ziv^^2B}0+?in zWEM+WQGRZb!Q?hhpG13*09$Haa(+tcEw+?Y5Ut5pqzm!{NO6$?h-CyK96?H%bBoi_ z?bK#qU~mWdj1S~9J~l=U5M<(F~$QvLIu!Esr>3?Br0M6WqQaX;3n~#W49Um(*k@ zUUdV1knv2JDPT8fG8F}Y_{^y}sVfxod|G}^N@`J2G)OZKgcF~ZUz(S4ix=dt_}tWz#1w_Zl0;DI1}g=- zG!bMX*tsDL3=CzH5AdlnhD?6Oca1*q4 zYA*t(Zyt~ikTFH6AQmWYi}*pTP>`eef>TSJ^Ycnl^GZOzDoO*%#Db!R^A_66YP`10pTAZ9;kP7j4G=mWX!!6cykgY{QAl;yp0gea=0rJKz-coR2#Y0S-FnPLw zqF^z|7WpC#kRFh$ZcRQZAY1PNausVTs0=6ql}finz-+zT%-mGH+|rzq%!0(Ck|H*c zGJYhflGKWlB6f7qq{QOXA`Xx!XJSESa!zJyUP%!r$VO1Uy2Vpa2~K``Aa50MGcYiS z-r|Lcfn|z7!FOwNm7uaQsN5+s1?dH4&LU85DFTI55jb!`zJYic9D`s&Ve$n*Lry^s L5e`KTJ`O1W9^#k; diff --git a/__pycache__/RepoFunctions.cpython-38.pyc b/__pycache__/RepoFunctions.cpython-38.pyc index 0a420d262e58c9e9600520e5b8ebd08a1c4d491b..a24521efdb04d2ab8f3bc912bf6126e7616c013c 100644 GIT binary patch delta 880 zcmaFDc7>ZSl$V!_fq{YH>gvuUeYS~wGK_u`wN>;PQW$esqF7V7Qi zS{S0(Q`l2DS{R}@QaDq%S{R}@Qy7C8G-gQEIR`OL$MIZAzleOBU-w##+`I))bZ$)>bA-hFZ27wqOQLHoq#P ziKmq73rcfxitUR_5=&BT6LWHkm_Tk|1`&)53=A(p4lZJ0U|`T>FX9G?f}C)RJ+UAY z6d*->AR&GbApr6jOG$o#DZ~c|ZwRKRmc)asi7!emEKMygDOLjc1*Cz2v7QGJNX$G; zMap0gfxHRDAO~eaH;FsCqyGt@HI zFsCptV60(DVUc90VM$>HlWdXQfaGi&7Oz zGEx-+f{GQ2Qj=5jN^&X{tQ2lBa#itG*DB~LRM#pbRVq~1-r`CwN=+0(UwdfXWPJVi3o+iZkMIa|@vLXc+2PjzL3yO+wvFD~17bm8t-eM{!0*6yQ zm@ERvw8Wb07 z1&MhniN&{=3Q~%MK~kW!0uEoWMu@$F1|S(kTyfas=BJeAq}qWZzZeun9E?!N#3jVR H$-xf*S7gZz delta 258 zcmcb@{e+D#l$V!_fq{V`?_@}l0P{pX8Ah{-+A8AgDaEsRktDXb}MEeuhtDU87k znj91B7BE&#mS>b_)SPV3Xv-Kixt39uFN!0pI6p7GD7APcLlN)f6^ucQY?FU8N;C3L z7H3+?$UONVlejs^mRp=jiN&e$1&JjYw>WY#i%Z-xb5e_V85kHK1Rnzf!!4eo)U=}1 z;*9vB)Pj78$^6Ws5z-6{44RB?nruZvAhj$Yf(=B7g9v^Q0a5}n1kE@Oo80`A(wtN~ SMg|6kVvs917{QQ=n5=ZkahyU)qDz3xEju&3e3-80{c|0}@~a5so0j1r(AT5xzbO zRtnX%MOt9XUGqwcDx-J<@-y>FQj7f4(uz|{ZcVo1SE;|n;*y`2`Wd93;TNNhrr0f( zl+5H3h$kWb1DgN|J}Hn5{vZLiwEUvn#F8R65QnuOv8Xup7JGVXNl|`&Ns%{5kR`Ju zwdfX0Nor2cEta&*yp$qO1_p*GUQnRMm*mGMRhFa{GZh6+e$208=KwO;93(H0ms%bV zR+A5QW^qw4*fdbc++qPmR#6a0fGZW`r}(`5l+;_3T?H}}ZgGNimL=wtrru&NfcO-W zIv`18^I3tJOqxQV1i)ORom8X>vJxDEAkP{zw#3DbCgaL>M1QA&vQ#sO8OUe=jb4pV+g`o)tBxg3cLqv|v62#1(yhcQl=N4;m zW>sqOEynz!kjWQCL?x|3At?wlH@-9vW>0ELk;CNwB2tpKI6xr<(sGM24JC+-L@SuY zZ9xWuLjn{qRV=CorYRvsnv)NT%QCu7zAx@ATn=&^TTw1JHY7pHy(ZgA7}bOQ01A{_ z96tWx@lKv0!M8X)Jl#FOOmMP*BrI^CAOaH}Jhyn$Q%mAgD@s!HiZk=`iYh@Cv6dDT zq!yuNs3LGEC4l9VbMlK*iz*lb85nM{6{Y6pm!)b7Lc*&Fq<{mO8j7R1OY%z+bK*g1 zskjIffVVh{QgahC^HNfaZm|}ZBo>tvwSly-fI_FpYO=kg45Rhr7)gDUa%-C8DrQAc zs?uaE0_BDxP|;KbF6%&|Mc_OtF*#8-g3)#IF4-^>kfXLmaxy{L;}%C!VsUC-Vs0wLcCbz`0k!?2oGhc($X4qncb#1f~>JipZPB5+0k zyK^QukjfKtvcYi#PQAC-z!8^ni>)}ns3bK75;U0%liTFwb#Aey7v+~06oFHCGstjo z1cGxFIQnZqVxWXoR5AIYyrd{7j}&!+1VIU^2%K25CjXaDsK3QlT$+@USp+F9K_O5a z#hH^?ToPZBT3m9Aqo63YEHl5f_!fIgX>M+2YH<-Lgo`GF%$f*tH+ynvQ4y&4m;w^A z0ukVJ!jxtd#RngIa8w>0Sh delta 2235 zcmX@$eZZS5l$V!_fq{YHW#vY$-OP+pn~yOEF|zS7FfbJHPnKitVHBFYn$?yYEFcCJ z-Tax=iiuHvvL1&EL>Mf`zqyu!pGidxq(q&8fuTysFJB?V!__k=*x6MfBQ-H4wWvrH zBఖP=uFara_N~R)i1_p*(93>g4nMK9PsYMW@K&r$U7#JEDCdVs@O?KkeV7xUs zn_E6Pil?9`wWOpnzMv>GucSzTfq~%{i(W-;&Ml_$Bu$B1tf?hMsi{%yt~sf>sd*() zT*0MDQ1&gBlGKWlTP*nnsd+`#AX{0AQ&Y2xv_O_=g9sfEp*#64w>zWcWK$kx%_xqN z{Nj?L%)Im>DUh5Dh>!(oWi2ntEJ@WA06V|PY;q%yIGZU*)_n3j9uLN-$%niq{@=iVx}VB$&dL}?Ce1Xn}Os7@>0v= z!D{ls&MYqS2b%^8nJ5-eWEJ^=)N!SP{1l&;pOP9i*;ODzA&L{Evn(;EG&PF70OC_f z>VPDX&1VH>GHD8e5&(0Nc2bcF$VzYsf;?ZO0pfx}s|b=HC-(~*GP+DYC~RKu4w3@L zIy^v%!a!nrAR-FnJWh~r5{rrwD~pUlf+ip$21FQu2tyEI1R|0^1UP(nlk;;6ic*V< z<5Ln#5{tY+68a#*7evH^Oyx*VEh$SB%qdOP6ow`okeun{4iPyv3lKAL@){9Io+#Gh z%&OGlTa5Wd0h2F^h)P<4LP!u~ZhUDT%%0SgBKyhzMWiI7I6xr<(sGM24JC+-L@SuY zZ9oQtLjn{qRV=CorYRvs8j}x-%QCu5zAx@AoDMRcttb~98xkPp?vrgLjOxLD00qh| z4j=#Ucqh-0;9Hy?p6(uCCOBC@5*9d65P=B~o+#e*)ROqrijvg4;>`TKqD)XIu$C4S zq!yuNs3LGEg@fgjbMlK*i!vAj85nM{6{Y6pm!)b7Lc*&6z1(GI^J5mcAVCwyFu6@$UMGq*y(qu5pa`783qgj1BM_Xc zz|o%r5(6cyqKwHG*vM?q0)S!RA|aTI$>X>M+2YH<-Lgp2AxX4Qbw1AB65Q4y&4s0RsIf(TGL zxy6)b6vYY3E%7Cl1*uV7`K2WVr6uvHIceau0?sL#Ogu&45CBy}Mf{szDFiaggM%GR zfD;0k1ty?T5v3Gu1qw@~pv?l=3J!+|P!uymlB)tpR1rjgwSx)%$?uh_MJIy<5h)BR zQ?DFT4+^6wo&bMOzYy1;;CNR*m!b-g;&KpC3L-i|L_dg_0P;R>aY=qrWqgFMPkdf# zc@d~gkK!xN&MW~76(p7n#@5d4$7 GRLuZsbRTR0 diff --git a/__pycache__/ToolsTales.cpython-38.pyc b/__pycache__/ToolsTales.cpython-38.pyc index 0c9a196c5432df1af12ea9d2f3e462e868f44325..b43e7fc0ad336730671a349dba2565fa8ce86efa 100644 GIT binary patch delta 5730 zcmX@TlkxOUM($8vUM>a(1_s05^&7c=v2fpF$~L;iRA#i2@z!Jk)v$!A%g2!Q#*AU;&^Ae*qf7>F+pA|yeCG>8BzgsS<>R?7|6 z113Z!SF<Kf z2Z^)hW~XEpX)+a=f_RK65LIBMU`JbSp22mUQ4u7tlBtLfq=-2+Cly_p(&Py|C5-Bm zS$TaWv_O8>2CK|3O1Z^Sl$w~L$y;PPIg3}9@z&%Syt*=uAX(PrlFEYAA~TS3kogcZ zMJ7MwoyTY~xq(lT4dkYxz{&IZL?v%=r=%8_WacH7Waj5VRD$)0Og_uEFwvQTfuV{; zuPC*+$ccf0L6fD(8)T{vhyXjsA0)~S@gzrDW=^VKVs2_tAV@wKM1+6{kV|f{q$HLk zB3l5Gah`mhe}x#x=psf228LfuHa;&wF{H^=q&2x$Ks#6#>`k5x7ZR3 z3R3e@Zm}lk8C%taq=aR7^eCv1_p-DpkQJwss>rW1P-$zu#E`2b3qQsV_;x- z`S1V#|9+ZWMW8S&Y6A%uf`|f;rEIAcC8>ESMRFh!P$(3&f`mCi;T)ftSCU^;01=Cnpww-Ck4<(q0DA$&#F#Qe0FIW~SvNrWZAVq?#u`6c zCoy`0o!kymkOlJ-gC=`XB1i-r$^6A7`9+oSpooc2&QD2&_#qi2p8z62F4p8OGM&6i zGF0alOJYh&(Jk)e(xRf&yps5W{NgC?q_D)C%oL1Ny;)mIo{2GTvbT&rWA@}~87H<| zOvQyoGLsL>s7TymN=o_6!N9-};^FEU6zuF;G#O-B&gB0x-i%q3y=9$Ez##|@P>^FZ zSrFk9#gV%?VP(1MWL{hW)pg6O)Qj z!htunq98T7BsC=-6cACIC5f3i@#vX(tKaZvekizOtr zqNJFKfq}umsAwX{oXM%GYCN|%yb=o%^HPgbi)K>jF7nEX&x zgd3DZZ!u@2Rup+mQd6x5CDx);kYOAp`NbtgnR)5ASj&qtOHwuYAyEKP1A6 zPJ^rjc@63f5clxr|2iL-*sg)t&nAD>w^oHK(1cd$OvM=x4PY5?K2w?;YTzhv7o-W4 z%^)!#Gx?Xk88+?7nA#Z)#XP~~2snyBu~P(&yL%ubK_Oez0V)#si(Ehgpwi+NQ&H+I zb`RHx_z*|;TdcW>CCM3(K$V-EU?{3)2vYa~L>PexV-R5gA|`+g;sXb4(b37X4W)%{ zG36yiae>O^VmDBr7Aa0XVW=Pp3P-Sgx0sTRkexi4(P$MvC|zhW7BMq2Fo3i7E+Z9` z?ETW{G~>?6Ta5$74}fev0wUgk2v9cAWG^zEENi08cyzL-i43y7%>^c6j7p%8g#|ZD zW=U!;vh^TClqRn*?Try&gyj_n1_p+ej72=$m zg4QM3&t21YnuaN32IP(=(N8^Mxb0-6xldc?AU z+E_(4lLb7Rz==eY8Jww$;86uN;TC&pPHJvyUdc+vB3`&*5OWw97!;V1iZBs|B5;}n zr$lff1gFm33=9k*MSDQ5-UsrgFgVHF;so_4b29T%ql$|ZK_-Kv{WnONDToX9ya$L2 z%J-0>(Fi1A3?e|O3!IP;E{25OF^~>Wg3=T$GM$|5B^3?s4zhx5DlSq5=>=uATdd$7 zT+w%sa%qq#IH)W@EK3jpDqo{GQ*%<|)ACF6Qi{%k6rKYS;E?nKsS(-y!0QGhAE>*V!eQj;I}C@X`SIhu@+8~`c)Ak8qaen<#TR`d1Y1gQfz$|oCgNKKyVt0<4C zJfuL@fHi;#sIIHNu1KQ@AhU~P;R>N@Ed8A8!Fs?1NR1}rEk0Nu71GXw6g3bH3=9l0 zpvZ(3z?!^8@gUzKvNyQV1Zw_6@+PQ50%=2afz*L2{vvQpf!e3w7-a!9N+(j_u^yZ^8HTg(NC z*;P!sDOJq6)wM+zKuJoI1HDuNWnf4_1}dM5OhEd>K}inMZ;Ijt7x?)_nd#uR1gNbX z#R;wn5S0KpxIjU2OR%6QwIH!5HQqOMvq9hzMkxc3d72;s9OHT*7Ptz~pZqS!fk~Kg zvO%!FE-3Oe8H)~s0tHl_uVgL)dmoexAtf2yiXx@SYl3~*p&4XSh-M-!1-LaAB$m=}6z=2YWarH7zqQ6Vy&9QkdKoBITz7 zG9VH}fNRZgP;JBk>fywL`snbmzr_j?D=rcPsRZQ*^h^*3k`USaDI}Ir-VnqF`wZl1 zaAZOVP*@fzP0kA|1E)t##-dn|Qm`sSSqM?Zz`(E!IT2Q|>gnlK*A{^SU6T_MB9@?l zMR->kWEiMIyTy@Kl%JcOT3K8KuG$hoEe>eJ3xL9*cye;Mpg=rGJ=mRK%S9%)gm>a7 z!<8b+amcKTXkfIMtRJZ@nhG)wY!cW^Fd;HIKQciET>3K>d0|!XI?|90l!%KaPF9LC z;r<8m(;pD=d2(WuQvEINg3`R?l2XWc!Y5F@${*(FpK z7e#@%pz*V!Ob`p)X910|6oDGmMYBO-t3kv{5U~+NYz7hF8vi_q1x~Qw`kA#JdU M2Er1VJUPY!0B+^hcmMzZ delta 5730 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 From f41cedfbbd843e0f4f4ca47f8f9ad48f883b6a34 Mon Sep 17 00:00:00 2001 From: Stewie Date: Sat, 21 May 2022 23:25:45 -0400 Subject: [PATCH 6/8] Adding variables and changing \n to
--- RepoFunctions.py | 2 +- ToolsTales_Executable.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/RepoFunctions.py b/RepoFunctions.py index 2edb078..2c9a9d2 100644 --- a/RepoFunctions.py +++ b/RepoFunctions.py @@ -55,7 +55,7 @@ def get_pull_requests_message(org, repo_name): for pr in top5_prs: - message = message + "\n" + message = message + "
" message += '{} - {} by {}'.format(pr['created_at'], pr['title'], pr['user']['login']) return message diff --git a/ToolsTales_Executable.py b/ToolsTales_Executable.py index f615f41..27f36d7 100644 --- a/ToolsTales_Executable.py +++ b/ToolsTales_Executable.py @@ -186,6 +186,10 @@ if __name__ == "__main__": game_name = args.game tales_instance = getTalesInstance(game_name) + org = 'SymphoniaLauren' + repo_name = 'Tales-of-Rebirth' + + #Utility function if args.action == "utility": @@ -199,20 +203,20 @@ if __name__ == "__main__": if args.action == "pack": #RepoFunctions.refresh_repo("PythonLib") - RepoFunctions.refresh_repo("Tales-Of-Rebirth") + RepoFunctions.refresh_repo(repo_name) if args.file == "SLPS": #SLPS tales_instance.pack_Menu_File("../Data/Tales-Of-Rebirth/Disc/Original/SLPS_254.50") - ApacheAutomate.apache_job(['SLPS_254.50'], "Tales-Of-Rebirth") + ApacheAutomate.apache_job(['SLPS_254.50'], repo_name) xdelta_name = "../Data/Tales-Of-Rebirth/Disc/New/Tales-Of-Rebirth_patch.xdelta" - generate_xdelta_patch("Tales-Of-Rebirth", xdelta_name) + generate_xdelta_patch(repo_name, xdelta_name) file_link = GoogleAPI.upload_xdelta(xdelta_name, "Stewie") #Need to add user for the folder @@ -222,6 +226,8 @@ Hi {}, here is your xdelta patch : {} """.format('fortiersteven1@gmail.com', file_link) + + message_text = message_text + "
" + RepoFunctions.get_pull_requests_message(org, repo_name) GoogleAPI.send_message('fortiersteven1@gmail.com', 'fortiersteven1@gmail.com', game_name + " Patch", file_link, message_text) From 1ae232b6265835d17b41422fe103e5a3922e9696 Mon Sep 17 00:00:00 2001 From: Stewie Date: Sat, 21 May 2022 23:27:14 -0400 Subject: [PATCH 7/8] Adding PR Url to the message --- RepoFunctions.py | 2 +- __pycache__/RepoFunctions.cpython-38.pyc | Bin 1492 -> 1495 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/RepoFunctions.py b/RepoFunctions.py index 2c9a9d2..d507265 100644 --- a/RepoFunctions.py +++ b/RepoFunctions.py @@ -56,7 +56,7 @@ def get_pull_requests_message(org, repo_name): for pr in top5_prs: message = message + "
" - message += '{} - {} by {}'.format(pr['created_at'], pr['title'], pr['user']['login']) + message += '{} - {} by {} ... {}'.format(pr['created_at'], pr['title'], pr['user']['login'], pr['url']) return message diff --git a/__pycache__/RepoFunctions.cpython-38.pyc b/__pycache__/RepoFunctions.cpython-38.pyc index a24521efdb04d2ab8f3bc912bf6126e7616c013c..b48b2168d834cc506d62594201ffdce85ac86d79 100644 GIT binary patch delta 227 zcmcb@eVv;(l$V!_fq{WRWo>7Y;YQwaM#fu{TN#xYg(k0H%wrUpEY4KLcx&<`rUY&w z1_p*AFd;noFOxc>;$&6kg9`j0Q2`Jk$iTpGi=`yLz!ahis+5hzfKhd_IZFpy6^l($ zk=^7&EJlo~lfSa)pqQw`YT~EMz`&r%=%&e4Bmpvz4McE&2w9NPYz2vVDT&3mmgvuU{f)fkjEqr}TN#xY1t+gy%wrUuEY4KL7&UnkQv$aj z0|P@5m=K!$mr0#bezGd_K?OdLC_ji0U|?Xl#Zr=AUL79-c> zqbx>@%9DSv=%5&<&uZeQ!@$6x$>^rZRU`&7jSWO_fCy=jxoicAc`1p-x0ni2iiAO; T@*qMPM1V9R*$B0EBdZz!PFgI< From 87ffc24f95b5de94da3172967d25bd093021bca7 Mon Sep 17 00:00:00 2001 From: Stewie Date: Sat, 21 May 2022 23:30:52 -0400 Subject: [PATCH 8/8] Replace with a better PR link --- RepoFunctions.py | 2 +- __pycache__/RepoFunctions.cpython-38.pyc | Bin 1495 -> 1536 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/RepoFunctions.py b/RepoFunctions.py index d507265..16f31e3 100644 --- a/RepoFunctions.py +++ b/RepoFunctions.py @@ -56,7 +56,7 @@ def get_pull_requests_message(org, repo_name): for pr in top5_prs: message = message + "
" - message += '{} - {} by {} ... {}'.format(pr['created_at'], pr['title'], pr['user']['login'], pr['url']) + message += '{} - {} by {} ... {}'.format(pr['created_at'], pr['title'], pr['user']['login'], pr['_links']['html']['href']) return message diff --git a/__pycache__/RepoFunctions.cpython-38.pyc b/__pycache__/RepoFunctions.cpython-38.pyc index b48b2168d834cc506d62594201ffdce85ac86d79..a0747a83c0b93ec8553fc36e1845dbf87c0a3870 100644 GIT binary patch delta 156 zcmcc4-N3^e%FD~ez`(%3vaT~JY$LB7iy|ij1A{XI14D5L0|P?|Lk&X>V>44NQwn1( za}ARVL#)l@92Pa18kQ6eNrn_oNrn_INrr_i<_xvWg+evV!3>(*lNYe435itKD(EUy z*D54cf=E3*y~!6@ltrT0;&U?dvWsuAWR&FQ++xWnN==*mg(Zi@h^a__atf;jqyFT% GtX2SC*(Tlq delta 114 zcmZqRxz5cS%FD~ez`($uvbHnHa3ilBiy{XD1A{XI14FSJ0|P?|Lk&X>V>44NQwn1( za}ARVL#*E992Pach0Nv*wakS=HO#>bnjDkYv8ZwLR@W-%Dpc1hBvnp+#-cn~mNkb( Sg{eq)axbd|qweHmtX2S3z#2*b