Merge pull request #25 from fenix-hub/v0.7.5

V0.7.5

Author: fenix-hub

README.md

@@ -28,8 +28,11 @@ If you want to see some screenshots you can find them here `addons/github-integr
 For my first donation I decided to add a SUPPORTERS.md file where there is a list of people who decided to financially support this plugin. I will never ask for anything in return for the free service I want to offer to  Godot's community, but it will always be an act of kindness that will encourage me to keep my plugins and projects updated.
 Here's the [Supporters List](./SUPPORTERS.md)
 
-### What do I want for a v-1.0.0 ?
-The first complete and released version will be set once the main operations you can do on GitHub browser and app will be available in this addon (ex. Committing and Pushing, Branching, Pulling) placed side by side with a full error handling.
+### About Updates
+**Since v0.7.5 I've decided to not update this plugin anymore.**  
+It doesn't mean this plugin won't be supported anymore, or I will abandon it: I'm planning to fully migrate this project from a simple GDScript addon to a C++ module for Godot.  
+Eventual bugfixes and additional little features will still be implemented if they are needed to support all platforms and to stay updated to Godot Engine's new version, but due to GDScript and Godot limits, I'll migrate the whole code to a C++, fully implemented and optimized GitHub module.  
+Please, watch this project or join Discord groups I've mentioned in this page to get all updates.
 
 # Disclaimer  
 This addon was built for a **personal use** intention. It was released as an open source plugin in the hope that it could be useful to the Godot Engine Community.  
@@ -38,5 +41,3 @@ I don't assume any responsibility for possible corruptions of your project. It i
 
 -----------------
 > This text file was created via [TextEditor Integration](https://github.com/fenix-hub/godot-engine.text-editor) inside Godot Engine's Editor.
-
-

addons/github-integration/github-logo.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/github-logo.png-47e01e9fc59994c0db55903788d0795b.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/github-integration/github-logo.png"
+dest_files=[ "res://.import/github-logo.png-47e01e9fc59994c0db55903788d0795b.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

addons/github-integration/resources/github-logo.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/github-logo.png-ecbc9f6d20796b46b889486439e860bc.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/github-integration/resources/github-logo.png"
+dest_files=[ "res://.import/github-logo.png-ecbc9f6d20796b46b889486439e860bc.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=false
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

addons/github-integration/resources/loading/throbber.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/throbber.png-ae03ce9c717cd2fb342f9f5d37de98d0.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/github-integration/resources/loading/throbber.png"
+dest_files=[ "res://.import/throbber.png-ae03ce9c717cd2fb342f9f5d37de98d0.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

addons/github-integration/resources/proxy.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/proxy.png-eb05e86e1b09889d8d9cb4eff7df2f1b.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/github-integration/resources/proxy.png"
+dest_files=[ "res://.import/proxy.png-eb05e86e1b09889d8d9cb4eff7df2f1b.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

addons/github-integration/scenes/GitHub.tscn.tmp

@@ -113,7 +113,7 @@ func request_completed(result, response_code, headers, body ):
 			REQUESTS.UPLOAD:
 				if response_code == 201:
 					hide()
-					get_parent().print_debug_message("commited and pushed...")
+					print(get_parent().plugin_name,"commited and pushed...")
 					get_parent().UserPanel.request_repositories(get_parent().UserPanel.REQUESTS.UP_REPOS)
 				elif response_code == 422:
 					error.text = "Error: "+JSON.parse(body.get_string_from_utf8()).result.errors[0].message
@@ -123,46 +123,46 @@ func request_completed(result, response_code, headers, body ):
 					pass
 			REQUESTS.COMMIT:
 				if response_code == 201:
-					get_parent().print_debug_message("file committed!")
-					get_parent().print_debug_message(" ")
+					print(get_parent().plugin_name,"file committed!")
+					print(get_parent().plugin_name," ")
 					emit_signal("file_committed")
 				if response_code == 200:
-					get_parent().print_debug_message("file updated!")
-					get_parent().print_debug_message(" ")
+					print(get_parent().plugin_name,"file updated!")
+					print(get_parent().plugin_name," ")
 					emit_signal("file_committed")
 				if response_code == 422:
-					get_parent().print_debug_message("file already exists, skipping...")
-					get_parent().print_debug_message(" ")
+					print(get_parent().plugin_name,"file already exists, skipping...")
+					print(get_parent().plugin_name," ")
 					emit_signal("file_committed")
 			REQUESTS.LATEST_COMMIT:
 				if response_code == 200:
 					sha_latest_commit = JSON.parse(body.get_string_from_utf8()).result.object.sha
-					get_parent().print_debug_message("got last commit")
+					print(get_parent().plugin_name,"got last commit")
 					emit_signal("latest_commit")
 			REQUESTS.BASE_TREE:
 				if response_code == 200:
 					sha_base_tree = JSON.parse(body.get_string_from_utf8()).result.tree.sha
-					get_parent().print_debug_message("got base tree")
+					print(get_parent().plugin_name,"got base tree")
 					emit_signal("base_tree")
 			REQUESTS.BLOB:
 				if response_code == 201:
 					list_file_sha.append(JSON.parse(body.get_string_from_utf8()).result.sha)
-					get_parent().print_debug_message("blobbed file")
+					print(get_parent().plugin_name,"blobbed file")
 #					OS.delay_msec(1000)
 					emit_signal("file_blobbed")
 			REQUESTS.NEW_TREE:
 				if response_code == 201:
 						sha_new_tree = JSON.parse(body.get_string_from_utf8()).result.sha
-						get_parent().print_debug_message("created new tree of files")
+						print(get_parent().plugin_name,"created new tree of files")
 						emit_signal("new_tree")
 			REQUESTS.NEW_COMMIT:
 				if response_code == 201:
 					sha_new_commit = JSON.parse(body.get_string_from_utf8()).result.sha
-					get_parent().print_debug_message("created new commit")
+					print(get_parent().plugin_name,"created new commit")
 					emit_signal("new_commit")
 			REQUESTS.PUSH:
 				if response_code == 200:
-					get_parent().print_debug_message("pushed and committed with success!")
+					print(get_parent().plugin_name,"pushed and committed with success!")
 					get_parent().loading(false)
 					Loading.hide()
 					emit_signal("pushed")
@@ -193,7 +193,7 @@ func _on_Button_pressed():
 	get_parent().loading(true)
 
 	load_gitignore()
-	get_parent().print_debug_message("fetching all files in project...")
+	print(get_parent().plugin_name,"fetching all files in project...")
 
 
 	request_sha_latest_commit()
@@ -205,10 +205,10 @@ func load_gitignore():
 	var dir = Directory.new()
 	if not dir.dir_exists(gitignore_filepath):
 		dir.make_dir_recursive(gitignore_filepath)
-		print("[GitHub Integration] >> ","made directory in user folder for this .gitignore file, at ",gitignore_filepath)
+		get_parent().print_debug_message(0,"made directory in user folder for this .gitignore file, at %s"%gitignore_filepath)
 
 	var ignorefile = File.new()
-	var error = ignorefile.open(gitignore_filepath+".gitignore",File.WRITE)
+	var error = ignorefile.open(gitignore_filepath+"gitignore.txt",File.WRITE)
 	for line in range(0,Gitignore.get_line_count()):
 		var gitline = Gitignore.get_line(line)
 		ignorefile.store_line(gitline)
@@ -220,7 +220,7 @@ func load_gitignore():
 			pass
 	ignorefile.close()
 
-	files.push_front(gitignore_filepath+".gitignore")
+	files.push_front(gitignore_filepath+"gitignore.txt")
 
 	var filtered_files : Array = []
 
@@ -239,7 +239,7 @@ func load_gitignore():
 
 	files.clear()
 	files = filtered_files
-	files.push_front(gitignore_filepath+".gitignore")
+	files.push_front(gitignore_filepath+"gitignore.txt")
 	emit_signal("files_filtered")
 
 # |---------------------------------------------------------|
@@ -283,9 +283,11 @@ func request_blobs():
 			f.open(file,File.READ)
 			content = Marshalls.raw_to_base64(f.get_buffer(f.get_len()))
 
-		get_parent().print_debug_message("blobbing ~> "+file.get_file())
-		
+#		for content in branches_contents:
+#			if content.path == file[0].lstrip(DIRECTORY+START_FROM+"/"):
+#				sha = content.sha
 
+		print(get_parent().plugin_name,"blobbing ~> "+file.get_file())
 
 		var bod = {
 			"content":content,
@@ -297,15 +299,15 @@ func request_blobs():
 
 		Progress.set_value(range_lerp(files.find(file),0,files.size(),0,100))
 
-	get_parent().print_debug_message("blobbed each file with success, start committing...")
+	print(get_parent().plugin_name,"blobbed each file with success, start committing...")
 	Progress.set_value(100)
 	request_commit_tree()
 
 func request_commit_tree():
 	requesting = REQUESTS.NEW_TREE
 	var tree = []
 	for i in range(0,files.size()):
-		if files[i].get_file() == ".gitignore":
+		if files[i].get_file() == "gitignore.txt":
 			tree.append({
 					"path":".gitignore",
 					"mode":"100644",
@@ -479,4 +481,3 @@ func on_nothing_selected():
 
 func about_gitignore_pressed():
 	OS.shell_open("https://git-scm.com/docs/gitignore")
-

addons/github-integration/scripts/Commit.gd

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/placeholder.png-55fb8c8b5ea4590d4708ea0062eb2426.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/github-integration/user/placeholder.png"
+dest_files=[ "res://.import/placeholder.png-55fb8c8b5ea4590d4708ea0062eb2426.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0