Merge pull request #77 from fenix-hub/dev

fenix-hub · web-flow · commit 30020375315b · 2020-11-19T09:11:40.000+01:00
Dev
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,6 @@ screenshots/
 
 
 
+
+
+
diff --git a/README.md b/README.md
@@ -9,9 +9,9 @@ This plugin is now supported in [Godot Extended Library Discord](https://discord
 A complete GitHub integration for your Godot Editor! Manage your project without even opening your browser.
 
 Author: *"Nicolo (fenix) Santilio"*  
-Version: *1.3.0*  
+Version: *1.3.2*  
 Wiki: *[supported](https://github.com/fenix-hub/godot-engine.github-integration/wiki)*  
-Godot Version: *3.2.3beta1*  
+Godot Version: *3.2.3stable*  
 
 <img align="center" src="addons/github-integration/screenshots/banner.png">
 
diff --git a/addons/github-integration/plugin.cfg b/addons/github-integration/plugin.cfg
@@ -3,5 +3,5 @@
 name="GitHub integration"
 description="Plugin to integrate GitHub requests directly via Godot Engine Editor"
 author="Nicolo (fenix) Santilio"
-version="1.3.0"
+version="1.3.2"
 script="scripts/github-integration.gd"
diff --git a/addons/github-integration/resources/themes/GitHubTheme.tres b/addons/github-integration/resources/themes/GitHubTheme.tres
diff --git a/addons/github-integration/scenes/GitHub.tscn b/addons/github-integration/scenes/GitHub.tscn
@@ -63,5 +63,6 @@ margin_bottom = 48.0
 rect_clip_content = true
 
 [node name="loading" parent="." instance=ExtResource( 3 )]
+visible = false
 margin_top = 48.0
 color = Color( 0, 0, 0, 0.627451 )
diff --git a/addons/github-integration/scenes/Notifications.tscn b/addons/github-integration/scenes/Notifications.tscn
@@ -70,23 +70,24 @@ custom_styles/separator = SubResource( 1 )
 custom_constants/separation = 10
 
 [node name="Invitations" type="VBoxContainer" parent="NotificationsContainer/NotificationsTabs/Tabs"]
-visible = false
 margin_top = 14.0
 margin_right = 820.0
-margin_bottom = 430.0
+margin_bottom = 522.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="Label" type="Label" parent="NotificationsContainer/NotificationsTabs/Tabs/Invitations"]
 margin_right = 820.0
 margin_bottom = 22.0
-text = "There are %s invitations received"
+text = "There are 0 invitations received"
 
 [node name="Settings" type="VBoxContainer" parent="NotificationsContainer/NotificationsTabs/Tabs"]
+visible = false
 margin_top = 14.0
 margin_right = 820.0
-margin_bottom = 246.0
+margin_bottom = 266.0
 size_flags_horizontal = 3
+size_flags_vertical = 3
 custom_constants/separation = 20
 
 [node name="Notifications" type="VBoxContainer" parent="NotificationsContainer/NotificationsTabs/Tabs/Settings"]
@@ -146,6 +147,7 @@ text = "minutes"
 margin_top = 108.0
 margin_right = 820.0
 margin_bottom = 232.0
+size_flags_vertical = 3
 custom_constants/separation = 0
 
 [node name="Label" type="Label" parent="NotificationsContainer/NotificationsTabs/Tabs/Settings/Plugin"]
@@ -183,12 +185,36 @@ margin_bottom = 124.0
 rect_min_size = Vector2( 300, 0 )
 text = "Darkmode"
 
+[node name="ResetPluginBtn" type="Button" parent="NotificationsContainer/NotificationsTabs/Tabs/Settings/Plugin"]
+margin_top = 370.0
+margin_right = 127.0
+margin_bottom = 400.0
+size_flags_horizontal = 0
+size_flags_vertical = 10
+custom_colors/font_color = Color( 1, 0, 0, 1 )
+custom_colors/font_color_hover = Color( 0, 0, 0, 1 )
+text = "Reset this plugin"
+
 [node name="HSeparator2" type="HSeparator" parent="NotificationsContainer/NotificationsTabs/Tabs"]
-margin_top = 250.0
+margin_top = 526.0
 margin_right = 820.0
-margin_bottom = 260.0
+margin_bottom = 536.0
 custom_styles/separator = SubResource( 1 )
 custom_constants/separation = 10
 
 [node name="Timer" type="Timer" parent="."]
-wait_time = 60.0
+wait_time = 300.0
+
+[node name="ResetPluginDialog" type="ConfirmationDialog" parent="."]
+visible = true
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+margin_left = -327.5
+margin_top = -46.5
+margin_right = 327.5
+margin_bottom = 46.5
+window_title = "Reset this plugin"
+dialog_text = "Resetting this plugin will delete everything that was stored from the first time. 
+Continue only if you don't want to use this plugin anymore, or if it was suggested by the developer."
diff --git a/addons/github-integration/scenes/loading.tscn b/addons/github-integration/scenes/loading.tscn
@@ -27,7 +27,7 @@ void vertex() {
 
 [sub_resource type="ShaderMaterial" id=2]
 shader = SubResource( 1 )
-shader_param/speed = 5
+shader_param/speed = 0
 
 [node name="loading" type="ColorRect"]
 anchor_right = 1.0
diff --git a/addons/github-integration/scripts/GitHub.gd b/addons/github-integration/scripts/GitHub.gd
@@ -167,8 +167,11 @@ func logout():
 	Repo.hide()
 	Commit.hide()
 	Gist.hide()
+	Notifications._clear()
+	Notifications.hide()
 	SignIn.Mail.text = ""
 	SignIn.Token.text = ""
+	UserData.logout_user()
 
 # Set to darkmode each single Control
 func set_darkmode(darkmode : bool) -> void:
diff --git a/addons/github-integration/scripts/Header.gd b/addons/github-integration/scripts/Header.gd
@@ -50,7 +50,7 @@ func _on_add_notifications(amount : int):
 func set_notifications():
 	notifications_lbl.set_text(str(notifications))
 	notifications_btn.set_tooltip("You have "+str(notifications)+" unread notifications")
-	notifications_lbl.show()
+	notifications_lbl.show() if notifications > 0 else hide_notifications()
 
 func hide_notifications():
 	notifications_lbl.hide()
diff --git a/addons/github-integration/scripts/Notifications.gd b/addons/github-integration/scripts/Notifications.gd
@@ -36,6 +36,8 @@ func _connect_signals() -> void:
 	debug_messages_chk.connect("toggled", self, "_on_debug_toggled")
 	auto_login_chk.connect("toggled", self, "_on_autologin_toggled")
 	darkmode_chck.connect("toggled", self, "_on_darkmode_toggled")
+	$NotificationsContainer/NotificationsTabs/Tabs/Settings/Plugin/ResetPluginBtn.connect("pressed", self, "_on_reset_plugin_pressed")
+	$ResetPluginDialog.connect("confirmed", self, "_on_reset_confirmed")
 
 func load_settings():
 	var auto_update_notifications : bool = PluginSettings.auto_update_notifications
@@ -54,12 +56,21 @@ func _on_notification_request_failed(requesting : int, error_body : Dictionary):
 		RestHandler.REQUESTS.INVITATIONS_LIST:
 			get_parent().print_debug_message("ERROR: "+error_body.message, 1)
 
+func hide_notification_tab(tab : TreeItem) -> TreeItem:
+	if tab.get_text(0) != "Settings": tab.hide()
+	return tab.get_next()
+
 func load_notification_tabs() -> void:
 	var root : TreeItem = notification_tree.create_item()
 	for tab in notifications_tabs:
 		var invitations_item : TreeItem = notification_tree.create_item(root)
 		invitations_item.set_text(0, tab)
 
+func hide_notification_tabs():
+	var next_item : TreeItem = hide_notification_tab(notification_tree.get_root().get_children())
+	while next_item!=null:
+		next_item = hide_notification_tab(next_item)
+
 func set_darkmode(darkmode : bool) -> void:
 	if darkmode:
 		$BG.color = "#24292e"
@@ -81,6 +92,8 @@ func _on_timeout():
 	request_notifications()
 
 func request_notifications() -> void:
+	if not PluginSettings.auto_update_notifications:
+		return
 	get_parent().print_debug_message("loading notifications, please wait...")
 	emit_signal("add_notifications",-get_parent().Header.notifications)
 	RestHandler.request_invitations_list()
@@ -155,4 +168,16 @@ func _on_invitation_declined():
 	invitations-=1
 	set_invitations_amount(invitations)
 
+func _on_reset_plugin_pressed():
+	$ResetPluginDialog.popup()
+
+func _clear():
+	emit_signal("add_notifications",-get_parent().Header.notifications)
+	clear_invitations_list()
 
+func _on_reset_confirmed():
+	_clear()
+	hide()
+	get_parent().logout()
+	get_parent().SignIn.delete_user()
+	PluginSettings.reset_plugin()
diff --git a/addons/github-integration/scripts/PluginSettings.gd b/addons/github-integration/scripts/PluginSettings.gd
@@ -12,7 +12,15 @@ var darkmode : bool = false
 var auto_update_notifications : bool = true
 var auto_update_timer : float = 300
 
+func _check_plugin_path():
+	var dir = Directory.new()
+	if not dir.dir_exists(plugin_path):
+		dir.make_dir(plugin_path)
+		if PluginSettings.debug:
+			printerr("[GitHub Integration] >> ","made custom directory in user folder, it is placed at ", plugin_path)
+
 func _ready():
+	_check_plugin_path()
 	var config_file : ConfigFile = ConfigFile.new()
 	var err = config_file.load(plugin_path+setting_file)
 	if err == 0:
@@ -22,7 +30,6 @@ func _ready():
 		auto_update_notifications = config_file.get_value("settings","auto_update_notifications", auto_update_notifications)
 		auto_update_timer = config_file.get_value("settings","auto_update_timer",auto_update_timer)
 	else:
-		print("settings not found")
 		config_file.save(plugin_path+setting_file)
 		config_file.set_value("settings","debug",debug)
 		config_file.set_value("settings","auto_log",auto_log)
@@ -52,13 +59,15 @@ func set_auto_update_timer(timer : float):
 	save_setting("auto_update_timer", timer)
 
 func save_setting(key : String, value):
+	_check_plugin_path()
 	var file : ConfigFile = ConfigFile.new()
 	var err = file.load(plugin_path+setting_file)
 	if err == OK:
 		file.set_value("settings",key,value)
 	file.save(plugin_path+setting_file)
 
 func get_setting(key : String, default_value = ""):
+	_check_plugin_path()
 	var file : ConfigFile = ConfigFile.new()
 	var err = file.load(plugin_path+setting_file)
 	if err == OK:
@@ -67,3 +76,29 @@ func get_setting(key : String, default_value = ""):
 		else:
 			print("setting '%s' not found, now created" % key)
 			file.set_value("settings", key, default_value)
+
+func reset_plugin():
+	delete_all_files(plugin_path)
+	print("[Github Integration] github_integration folder completely removed.")
+
+func delete_all_files(path : String):
+	var directories = []
+	var dir : Directory = Directory.new()
+	dir.open(path)
+	dir.list_dir_begin(true,false)
+	var file = dir.get_next()
+	while (file != ""):
+		if dir.current_is_dir():
+			var directorypath = dir.get_current_dir()+"/"+file
+			directories.append(directorypath)
+		else:
+			var filepath = dir.get_current_dir()+"/"+file
+			dir.remove(filepath)
+		
+		file = dir.get_next()
+	
+	dir.list_dir_end()
+	
+	for directory in directories:
+		delete_all_files(directory)
+	dir.remove(path)
diff --git a/addons/github-integration/scripts/RestHandler.gd b/addons/github-integration/scripts/RestHandler.gd
@@ -152,9 +152,9 @@ func _on_request_completed(result: int, response_code: int, headers: PoolStringA
 				match requesting:
 					REQUESTS.USER: emit_signal("user_requested", parse_body(body))
 					REQUESTS.USER_AVATAR:
-						set_process(false)
-						client.set_download_file("")
 						emit_signal("user_avatar_requested", body)
+#						set_process(false)
+#						client.set_download_file("")
 					REQUESTS.CONTRIBUTOR_AVATAR: 
 						emit_signal("contributor_avatar_requested", body)
 						temp_contributor.contributor_avatar_requested(body)
@@ -197,11 +197,11 @@ func request_user(token : String) -> void:
 	client.request(api_endpoints.user, temp_header, false, HTTPClient.METHOD_GET)
 
 func request_user_avatar(avatar_url : String) -> void:
-	client.set_download_file(UserData.directory+UserData.avatar_name)
+#	client.set_download_file(UserData.directory+UserData.avatar_name)
 	requesting = REQUESTS.USER_AVATAR
-	downloading_file = true
+#	downloading_file = true
 	client.request(avatar_url)
-	set_process(true)
+#	set_process(true)
 
 var temp_contributor : ContributorClass
 
diff --git a/addons/github-integration/scripts/SignIn.gd b/addons/github-integration/scripts/SignIn.gd
@@ -45,7 +45,7 @@ func _ready() -> void:
 	btnSignIn.set_disabled(true)
 	DeleteDataBtn.set_disabled(true)
 	
-	if UserData.load_user().size() > 0:
+	if UserData.user_exists():
 		logfile = true
 		LogfileIcon.show()
 		DeleteDataBtn.disabled = false
@@ -79,6 +79,7 @@ func sign_in() -> void:
 	else:
 		# If there is a logfile
 		get_parent().loading(true)
+		UserData.load_user()
 		emit_signal("signed")
 
 func _on_completed_loading():
@@ -105,10 +106,7 @@ func _on_user_avatar_requested(user_avatar : PoolByteArray) -> void:
 	get_parent().loading(true)
 	UserData.save(user_data, user_avatar, auth, token, mail) 
 	emit_signal("signed")
-	yield(get_parent().UserPanel, "completed_loading")
-	requesting = REQUESTS.END
-	hide()
-	get_parent().loading(false)
+	DeleteDataBtn.set_disabled(false)
 
 func _on_singup_pressed():
 	OS.shell_open("https://github.com/join?source=header-home")
@@ -121,6 +119,9 @@ func _on_delete_pressed():
 	DeleteHover.show()
 
 func _on_delete_confirm():
+	delete_user()
+
+func delete_user():
 	UserData.delete_user()
 	logfile = false
 	LogfileIcon.hide()
diff --git a/addons/github-integration/scripts/user_data.gd b/addons/github-integration/scripts/user_data.gd

Original file line number	Diff line number	Diff line change
`@@ -21,3 +21,6 @@ screenshots/`
`21`	`21`
`22`	`22`
`23`	`23`
	`24`	`+`
	`25`	`+`
	`26`	`+`