From f660e5dbef775d17579eff8293431591bf5a9ae9 Mon Sep 17 00:00:00 2001
From: chendelin1982 <chendelin1982@126.com>
Date: Wed, 29 Sep 2021 18:24:23 +0800
Subject: [PATCH] model

---
 cli/__pycache__/model.cpython-36.pyc | Bin 4304 -> 4628 bytes
 cli/model.py                         |  30 ++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/cli/__pycache__/model.cpython-36.pyc b/cli/__pycache__/model.cpython-36.pyc
index 94ae1bef786cb888ea819a0dab5906161bd48d39..07db2f36b78899c18f5f49b602e2c20c0dcbe448 100644
GIT binary patch
delta 1128
zcmaJ<OK;Rj5bkcbJswZSGa--R8BGKP%p(H<0lORCPk{)pARq|AXxxFBOl;G3U^Vh=
zSPcg*2(5Z=a6rIqrIomFL*gI64arA@IC6ngPE>gU2oBh)uOIbwb=6n>X87MV*0y}!
z8d@@09q9STdP@hNzk9D`8R>pZz2>DnEs+kTB%%!#Q}v1eZ!nn$f_kDqwRD*50}BtR
zVLmdP7rMv@eHrPZn|-9YmYch)PnmAdIpWyrp7GcG*Z3M7%z_=n0P6uF5>uDD>^^(2
zq|G84vj*#=w_hNxc7~iK7h!}ryw&H=MZsKDo~}1Vx#oM3@S=n`G|714cC+q@2}et~
z9|%vDAhH|;aI|jXGnvY~X46*j2pm2Yj0UpqMaM(mTcE2K=<h&V2kgX<Vzw%05;GJ*
zRaPTW<FJjN36=v(6K}wzPTCxk@6ZQ_+WMd4v3`hL+1@sw1OsGa9q>@{b?(xcc}@1i
zQtOa*#$_>&GvnlDKmHfU_gZ7U!8-)Ck2wZdtbGs*z9r;h^^sr3<jaymCR5tj*w}=l
z%MGwdOHcT8-E$K?jAT7X^jgyog)?uaQly2-3R1TKB;2jnqA50gBjKo_T#lZeZ(t+G
zLdhq6ymBY3!+rpwacWVE+0>>cj77j!@1nfl`4bM4n}IDy@!dFC^|&xFP{56~2%8WL
zgdOTkZmGI#_ESRz<_mg4t;>GylUvb;?Og1n+@&g(LnqWFD_-^+?lU?5jnjRm!1-vc
zpcj>u+i#@K-59)txgP@yv6&|2%+zd4?o@YjFKJEf>3Nmw3q@20)qL-|V);Ay8D!(z
z<)pP<{aqMP&+?Ni55q=6Yd@(ZF?3V4?Smt8K_Da~hD3QB;YUGJ>MT%C4E>VgsSoz~
zO$YEgGpL5)ZC|=+D2K|U7`EFTS@m3h_B0Tt)%C(Qx?epkEHCauLMrVZoSjDrHtvP#
zHLwsJT?r)awR%S@4d0(_Rx6{zyLGkNY^sIAirzoKm+%HOUgFD_C)G&tN-qkT9!q#6
UKrZZEN&QzG%B-@N+I<H50<*31HUIzs

delta 694
zcmaKpO>5Lp6o&6fG9O8kbjBGvGg=A-zoK<UTB{vvZM7(L#IaK=<HA-36D32N3^&n2
znL?o(K~&_paG~HYP`VLB1^<D%5~3?{<3e2M5AfWy3T_OX_r4sS^XA;-;qLc?+K6Fj
z2R_ZUKC2J3k5JtF@>N!WZ9RbRl!CzuYy*IW(3ZLke=5&p;DgvOa`-xN59^@fD|H+n
zC)b=ma}tfKRMS+!ev*)NnGLpdSGvDr4MONr)<&G#WHxKCId+-Oi_DVi5wjpldCtm`
z>p7MjDSpTCc!5HAABiR5qf{jaCah-8x=YT5PPxNfFRTT)nLG&l#9qV3HQ&4C@NnL*
z1->^bwh${ZSj}(G`~%djG=5K%biRieJ|yH2uIoj-qvk=ur|JthflcjKK2ol`o*ge^
z$=ncN1s8iPn8e#X-O^!dSQ0-X`eI@7+f2jArvoRP^?5jhRsB>lW=6$J3S}azR6&{~
z4T_YOO^uiFx&8*`aoKpQ=roFB<~m%#m*!2Fz)EjlVv6Vmto5E7m>|bb3(^0IDclsv
zA|cazZTE&7(mMY|uVR1Z($H}liqf4{5Ulvzjw3DLlOj)qMjCH<w!b_}Kog&2Mxcrx
zGCMP40!RuuD&#y}t-sVD8;IuCwfHfz-%2ESGP^4~OeRv=^oRI3S$+oF*@dk595EOv
Up%a90QUQNt2U4b4G;>MmHz&-SWB>pF

diff --git a/cli/model.py b/cli/model.py
index 1063373d..4d5dd679 100644
--- a/cli/model.py
+++ b/cli/model.py
@@ -31,7 +31,7 @@ class GitOp:
     def __init__(self):
         pass
     
-    def gitClone(cmd: str):
+    def gitClone(self, cmd: str):
         '''git clone'''
         try:
             print("Command is： "+cmd)
@@ -46,12 +46,28 @@ class FileOp:
     def __init__(self):
         pass
     
-    def printJson(path: str):
+    def printJson(self, path: str):
+        '''output file content'''
+        
         with open(path,newline='') as file:
             print(file.read())
     
-    def convertToJson(path: str):
-        pass
+    def fileToJson(self, path: str, remark: Optional[str] = "#", separate: Optional[str] = "="):
+        ''' convert file to Json '''
+        
+        dict = {}
+        with open(path) as fh:
+            for line in fh:
+                
+                print(line.find(remark))
+                if line.find(remark) != 0:
+                    item, value = line.strip().split(separate, -1)
+                    item = line.strip()
+                    dict[item] = value
+                else:
+                    continue
+        fh.close()        
+        print (dict)
             
 
 class NetOp:
@@ -85,7 +101,7 @@ class SecurityOp:
         pass
     
     def randomPass(self, length: Optional[int] = 16):
-        '''set password'''
+        '''set strong password'''
         
         alphabet = string.ascii_letters + string.digits
         while True:
@@ -97,6 +113,6 @@ class SecurityOp:
         print(password)
     
      
-test=SecurityOp()
+test=FileOp()
 #test.setPort(9001)
-test.randomPass(25)
\ No newline at end of file
+test.fileToJson('./joomla/.env_all')
\ No newline at end of file