Merge pull request #39 from fenix-hub/v0.8.4

minor updates

Author: fenix-hub

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/icons.pngs/git_lfs.png.iconpng

@@ -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/github-logo.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/loading/throbber.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/resources/proxy.png.import

@@ -143,10 +143,12 @@ func request_completed(result, response_code, headers, body ):
 					get_parent().print_debug_message("got base tree")
 					emit_signal("base_tree")
 			REQUESTS.BLOB:
-					list_file_sha.append(JSON.parse(body.get_string_from_utf8()).result.sha)
-					get_parent().print_debug_message("blobbed file")
-#					OS.delay_msec(1000)
-					emit_signal("file_blobbed")
+					print(response_code)
+					if response_code == 201:
+						list_file_sha.append(JSON.parse(body.get_string_from_utf8()).result.sha)
+						get_parent().print_debug_message("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
@@ -301,6 +303,7 @@ func request_blobs():
 		if list_file_size[files.find(file)] < 104857600:
 			var content = ""
 			var sha = "" # is set to update a file
+			var encoding = ""
 
 			## this cases are not really necessary, will be used in future versions
 
@@ -309,32 +312,36 @@ func request_blobs():
 				var img_src = File.new()
 				img_src.open(file,File.READ)
 				content = Marshalls.raw_to_base64(img_src.get_buffer(img_src.get_len()))
-				
+				img_src.close()
+				encoding = "base64"
 			elif file.get_extension()=="ttf":
 				## for fonts
 				var font = File.new()
 				font.open(file,File.READ)
 				content = Marshalls.raw_to_base64(font.get_buffer(font.get_len()))
+				encoding = "base64"
+				font.close()
 			else:
 				## for readable files
-				var f = File.new()
+				var f : File = File.new()
 				f.open(file,File.READ)
-				content = Marshalls.raw_to_base64(f.get_buffer(f.get_len()))
+				content = f.get_as_text()
+				encoding = "utf-8"
+				f.close()
+			
 
-	#		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,
-				"encoding":"base64",
+				"encoding":encoding,
 			}
 
 			new_repo.request("https://api.github.com/repos/"+UserData.USER.login+"/"+repo_selected.name+"/git/blobs",UserData.header,false,HTTPClient.METHOD_POST,JSON.print(bod))
 			yield(self,"file_blobbed")
 		else:
+			get_parent().print_debug_message("pointing large file, please wait...")
 			var output = []
 			OS.execute( 'git', [ "lfs", "pointer",'--file',ProjectSettings.globalize_path(file)], true, output )
 			var oid : String = output[0].split(":",false)[2]

addons/github-integration/scenes/GitHub.tscn

@@ -504,6 +504,8 @@ func _on_extension_choosing_confirmed():
 	get_parent().loading(false)
 	request.set_download_file("")
 
+#	var extracted = ProjectSettings.load_resource_pack(current_repo.name+"-"+current_branch.name+archive_extension)
+#	print(extracted)
 	ExtractionRequest.popup()
 
 func setup_git_lfs():

addons/github-integration/scripts/Commit.gd

@@ -8,7 +8,7 @@ onready var Gists = $Panel/List/HBoxContainer3/gists
 onready var RepoList = $Panel/List/Repos
 onready var GistList = $Panel/List/Gist
 onready var NewRepo = $Panel/List/repos_buttons/repo
-
+onready var ReloadBtn = $ReloadBtn
 
 
 onready var NewGist = $Panel/List/gist_buttons/gist
@@ -36,6 +36,8 @@ func _ready():
 	NewGist.connect("pressed",self,"new_gist")
 	RepoList.connect("item_activated",self,"repo_selected")
 	GistList.connect("item_activated",self,"gist_selected")
+	
+	ReloadBtn.connect("pressed",self,"_reload")
 
 func load_panel() -> void:
 	Avatar.texture = UserData.AVATAR
@@ -48,6 +50,7 @@ func load_panel() -> void:
 func load_icons():
 	$Panel/List/HBoxContainer3/gists_icon.texture = IconLoaderGithub.load_icon_from_name("gists")
 	$Panel/List/HBoxContainer2/repos_icon.texture = IconLoaderGithub.load_icon_from_name("repos")
+	ReloadBtn.icon = IconLoaderGithub.load_icon_from_name("reload")
 
 func request_completed(result, response_code, headers, body ):
 	if result == 0:
@@ -181,3 +184,6 @@ func gist_selected():
 func new_gist():
 	GistDialog.popup()
 
+func _reload():
+	get_parent().print_debug_message("Reloading, please wait...")
+	request_repositories(REQUESTS.REPOS)

addons/github-integration/scripts/Repo.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