Update app.py

app.py

@@ -41,7 +41,7 @@ def GetList(data):
             newItemjson = {}
             newItemjson['type'] = 'string'
         return newItemjson
-    return ''
+    return 'error'
 
 
 def GetJson(data):
@@ -50,7 +50,7 @@ def GetJson(data):
     newJson['required'] = []
     propertiesJson = {}
     for key, value in data.items():
-        print(key,value)
+       # print(key,value)
         if type(value) == str:
             propertiesJson[key] = {'type': 'string'}
         elif type(value) == int:
@@ -64,8 +64,8 @@ def GetJson(data):
             newListJson = GetJson(value)
             propertiesJson[key] = newListJson
         else:
-            print(value, type(value))
-            propertiesJson[key] = None
+           # print(value, type(value))
+            propertiesJson[key] = {"type":None}
 
     newJson['properties'] = propertiesJson
     return newJson
@@ -79,22 +79,21 @@ def gerTtr(typeStr):
 
 def excuJson(html, jsonOuputPath):
     # jsonOuputPath='jsonOutput.json'
-
-    data = json.loads(html)
+    try:
+        data = json.loads(html)
+    except:
+        data = json.load(html)
     # print(data)
     # newJson==GetJson(data)
 
     listL = []
     dictL = {}
     jsonOutput = GetJson(data)
-    print(jsonOutput)
+   # print(jsonOutput)
     json.dump(jsonOutput, open(jsonOuputPath, 'w', encoding='utf-8'), indent=2, ensure_ascii=False)
 
     #  print(gerTtr(type('uk123')))
-    print(type('uk123') == str)
-    print(type(listL))
-    print(type(1))
-    print(type(dictL))
+
     return jsonOutput
 
 
@@ -114,11 +113,19 @@ def getHtml(url):
 
 def getITP(Request):
     # Request = 'curl -H "Host: pre-release.gravity.place" -H "User-Agent: okhttp/3.12.13" --compressed "http://pre-release.gravity.place/gravity/metaverse/starUserList?country=CN&product=gravity&star_id=23&sys_lang=ja&uwd=YRHBwL8DHv04H3JUkjFuiWFQgdmQxIy64bp7qHpU4JbPo1wW6IcEaMMp6LsT34op%0A&app_version=7.7.0&user_country=CN&sign=31caf01c033f194abc5287df89ff80bb&source=star_detail&pkg=anonymous.sns.community.gravity&token=1QZVaDtlJ21T9CYEPRAKqC1X14y6xD5%252Bfetlx%252FTJE%252Bnl2lganNSgB9BSTNgdUCCN&languageV2=ja&referrer=Organic&zone=8&system_version=10&sdk_version=29&model=V2023A&device=android&brand=vivo&ts=1686842126"'
-    url = ReRequestUrl(Request)
-    html = getHtml(url)
-    jsonOuputPath = 'outputJson.json'
-    jsonOutput = excuJson(html, jsonOuputPath)
-    print(jsonOutput)
+    try:
+
+        dataJson=json.loads(str(Request))
+
+        jsonOuputPath = 'outputJson.json'
+        jsonOutput = excuJson(dataJson, jsonOuputPath)
+        url=''
+    except:
+        url = ReRequestUrl(Request)
+        html = getHtml(url)
+        jsonOuputPath = 'outputJson.json'
+        jsonOutput = excuJson(html, jsonOuputPath)
+
 
     return url, showJson(jsonOutput)
 
@@ -164,8 +171,8 @@ def showJson(jsondata):
             outPutJson = outPutJson + char1
 
             line += char1
-    print(len(lines))
-    print(''.join(lines))
+    #print(len(lines))
+    #print(''.join(lines))
     return ''.join(lines).replace('\'','\"').replace('None','null')+'\n'+'}'
 
 
@@ -174,15 +181,24 @@ def main():
     while True:
         try:
             Request = input('请输入从Charles中抓包的URLs:')
+            
            # Request = 'curl -H "Host: pre-release.gravity.place" -H "User-Agent: okhttp/3.12.13" --compressed "http://pre-release.gravity.place/gravity/metaverse/starUserList?country=CN&product=gravity&star_id=23&sys_lang=ja&uwd=YRHBwL8DHv04H3JUkjFuiWFQgdmQxIy64bp7qHpU4JbPo1wW6IcEaMMp6LsT34op%0A&app_version=7.7.0&user_country=CN&sign=31caf01c033f194abc5287df89ff80bb&source=star_detail&pkg=anonymous.sns.community.gravity&token=1QZVaDtlJ21T9CYEPRAKqC1X14y6xD5%252Bfetlx%252FTJE%252Bnl2lganNSgB9BSTNgdUCCN&languageV2=ja&referrer=Organic&zone=8&system_version=10&sdk_version=29&model=V2023A&device=android&brand=vivo&ts=1686842126"'
+
             url = ReRequestUrl(Request)
             print(url)
             html = getHtml(url)
             jsonOuputPath = 'outputJson.json'
+            with open('jsonUrl.json', 'r') as outfile:
+                html=str(json.load(outfile))
+                print(html)
+                
             jsondata = excuJson(html, jsonOuputPath)
-            print(jsondata)
+
             NewJsonStr = showJson(jsondata)
+            if NewJsonStr[0]==',':
+                NewJsonStr=NewJsonStr[1:]
             print(NewJsonStr)
+
         except Exception as e:
             print(e)
 
@@ -190,11 +206,11 @@ def main():
 def GradioMain():
     textbook = gr.Text(lines=2, placeholder='Requests Url')
     grd = gr.Interface(fn=getITP, inputs=textbook, outputs=['text', 'text'], title="ITP proudct Interface system ",
-                       description="将文件用charles 抓包得到的requests转化成 可以直接用的Url 和json", examples=[[
+                       description="将文件用charles 抓包得到的requests/json 转化成 可以直接用的Url 和json", examples=[[
                                                                                                                     'curl -H "Host: pre-release.gravity.place" -H "User-Agent: okhttp/3.12.13" --compressed "http://pre-release.gravity.place/gravity/metaverse/starUserList?country=CN&product=gravity&star_id=23&sys_lang=ja&uwd=YRHBwL8DHv04H3JUkjFuiWFQgdmQxIy64bp7qHpU4JbPo1wW6IcEaMMp6LsT34op%0A&app_version=7.7.0&user_country=CN&sign=31caf01c033f194abc5287df89ff80bb&source=star_detail&pkg=anonymous.sns.community.gravity&token=1QZVaDtlJ21T9CYEPRAKqC1X14y6xD5%252Bfetlx%252FTJE%252Bnl2lganNSgB9BSTNgdUCCN&languageV2=ja&referrer=Organic&zone=8&system_version=10&sdk_version=29&model=V2023A&device=android&brand=vivo&ts=1686842126"']])
     grd.launch()
 
 
 if "__main__" == __name__:
-    #main()
+   #  main()
     GradioMain()