Update app.py

app.py

@@ -97,33 +97,43 @@ def process_and_create_pull(icon_files,category, new_cateogry_check, new_categor
                 sha=index_file.sha,
                 branch=branch_name
             )
-        all_files = []
-        contents = site.get_contents("static/icons/{license}/{category}/{author}/")
-        while contents:
-            file_content = contents.pop(0)
-            if file_content.type == "dir":
-                contents.extend(site.get_contents(file_content.path))
-            else:
-                file = file_content
-                all_files.append(str(file).replace('ContentFile(path="','').replace('")',''))
-        print("files in directory:", all_files)
+        #all_files = []
+        #contents = site.get_contents("static/icons/{license}/{category}/{author}/")
+        #print(contents)
+        #while contents:
+        #    file_content = contents.pop(0)
+        #    if file_content.type == "dir":
+        #        contents.extend(site.get_contents(file_content.path))
+        #    else:
+        #        file = file_content
+        #        all_files.append(str(file).replace('ContentFile(path="','').replace('")',''))
+        #print("files in directory:", all_files)
         for file in icon_files:
             #get file content from filesystem
             with open(file.name, 'r') as fp:
                 file_content = fp.read()
             filename = os.path.basename(file.name).replace(" ", "_")
             git_file = f'static/icons/{license}/{category}/{author}/{filename}'
-            if git_file in all_files:
-                contents = site.get_contents(git_file)
-                site.update_file(contents.path, f'update {filename}', file_content, contents.sha, branch=branch_name)
-                print(git_file + ' UPDATED')
-            else:
+
+            try:
                 site.create_file(
                     path=git_file,
                     message=f'create {filename}',
                     content=file_content,
                     branch=branch_name
                 )
+            except GithubException:
+                print(git_file, "already exists, updating")
+                contents = site.get_contents(git_file)
+                site.update_file(
+                    path=git_file, 
+                    message=f'update {filename}', 
+                    content=file_content, 
+                    sha=contents.sha, 
+                    branch=branch_name
+                )
+                
+                
         pull = create_pull_request(site,branch_name, github_user)
         return f"""<link href="https://cdnjs.cloudflare.com/ajax/libs/flowbite/1.6.4/flowbite.min.css"  rel="stylesheet" />
 <div class="flex p-4 mb-4 text-sm text-green-800 rounded-lg bg-green-200 " role="alert">