From 09bd11522bda22d39276f496fff98a412f8294ef Mon Sep 17 00:00:00 2001
From: Domhnall Morrissey <domhnallmorr@yahoo.co.uk>
Date: Sun, 31 Jul 2022 11:39:14 +0100
Subject: [PATCH] V0.33.0 Renaming of folders is now enabled

---
 src/__pycache__/branch_tab.cpython-39.pyc | Bin 25088 -> 25334 bytes
 src/branch_tab.py                         |  30 ++++++++++++++--------
 src/main.py                               |   2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/__pycache__/branch_tab.cpython-39.pyc b/src/__pycache__/branch_tab.cpython-39.pyc
index 38f712251eb5e061121813417877800cf718f700..3048224375e21c6ac31663d987e8dd6880f7c249 100644
GIT binary patch
delta 3770
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
C$fsoh

delta 3676
zcmai03s98T75?wP|2|ljby;~X%UhHm<Sl~W14IE8bQKk}$QJk)Wx<7B*5~Yw8q;Z#
znhDA2v`L#ZYujm?shKvjrky4kAFU>>jgHf#sk75)+GJvr8DG`Z%$S&-bAO7;(8><q
zp7%NT+;i{Uf1hUiPceIMLV{JozrK!-`(7P;#lG7WKQm+=kiR7jFs%Tdc6r%sxZzUw
z%?TxH2~WyQ3MKl}w8F<Ee*ym6{IfNOraq}m$cwZ(;W<~E@o1dT&v`&!qSXt1*`&Vk
z0e!i)Q0OZs^{TF~!vsns|FDGLhH-^23n^Ge6_(0`!#r}(;zfa^sh-r#hj%iHSq*%Z
zkvg*$OG@&W+-J7{RChgF6!p1%3iRicMNPRqj2#D0b}EGOHcU{T<Q-wZ7qXZ0D`y<T
zeyNO~(7#SbujV((>`b(Lc9ER?ClvBjf-?lm2+qPtVfrk=e@y&kf(Sv$B$N{MHXJFu
zv-l50{*mAuLd-TWI2`nGFMj#P_y;8aJHbB)K15IzUPSZ(g73ifx-@n=dRNV4>`K&K
zY-4&&3rKs2pq}6?ESlTPE=OOSTT074SMn@79^G1cTV{8`TcNVs@OZ^p(^WFP0Ns@x
z>^h7rOEb;V1?MV9*#%fqwPxL~WJwA!jSb1%5t2iaR|>e0myyrX3}HE7Lry`iNHd1z
z3Cmi|6gC7D%^WraSxEAupWhIYHA~2##lb(TGK;N4^0>^8pj`1=!ipw^jp!RcB#(Vp
zk1oC`?olY8m%i_)W<v`lGUKqMC7|?_W=GzrNjtE9jFJ#>gp|XKWc-U@qTi{_K&?ZJ
zi{zgfVj)FKByOAq7V4SC8E*?F1>^kIh>arn?HEDUoCoEnTwznl6iL<+4l^coN}5!u
zNQ!jOz@&h)0z-^7l;fPzXA}MhF6t#?z@5RAgHqTWGDlLuQ=OcA6g9XA)I@@5sIi1B
zy2kv(-qK)PBprsU)yB<=6m*TtdkUEpj$_i^25n|ABNTU#Mcjv_otTe*t|f(y0lSv0
z%YPufAcu|jmI-&OGgCA5MNr9@6*mkU9Mn=UL*BlSgvu-}^?7618pzVprmlKIpZ>fO
zwxXr%&yM7TtRj@o<<h~_qz*}St>!P&keoo+Yb@P8Jhq#k)M;&`e>Xou%GU{ALr~?I
zy?+EQ%y;Uub_}l1&yu+rN@@z(4cJ)I1Gd_dhOf|cbKD3Y-0BVVZuiA30pBh`aZD@m
zbPD%N3a4-~<>Hu4s?<E#Q#(taVEA=y9=u<>D;_sX;&^RI+z8$UdD+-liMOG1j19!(
zU45G^SniJPzCbX>eB1<)1@3j-sFs*Td`yUnY+)u@F{CkvY$qNm7orXSEzBk>%+8#$
z6=ib`R%T+Z36xnWb1)|}8NgllllF^LvN)e_5_Oh9oK$hzYKeUx;U$B9&Z%$wBZ4W{
z$L~<~IwaIT?oP(VsB!u|M6UNohx2u*E}llqo#KBAEl);2tRFF$Qc0ZxT}!%5!v7-d
zUz%C;9EB1$oPt!$JlY%FHaytJ$vS4#_~1?-H<HZ^_;N`jbHI{@t)|aNa2bv?6r?9j
zlk^g*--1sYK5|?q!y5$uBDe{cO45wfas}=*{;c3#q+Y^%gmm90m{R>aD6_y@OUK#g
z(ACsZbBAocK!_#uk8B_9<-Un4^h;6{OjF8VP+^1jnqHW`lsV|)gvhcWn+3_sbL4ae
z2bQ{70UT>eWq6L3f6q>L{AQD9c*oYk0KX22&B<`mn`Hbgie0dzxs;h9&^!?THdSz%
z;0j!7&aApk<OKp6Vov+WX)`!Ahf@nUt&UTHoXX(uL0QW-)&|eE^f4B_(^Aja8&I?2
zF?JPBtXRx$(ObpJA$8@e<{GkJz+i253af-qSLU|Tt&Z<k87kBio<u?MQjmBuQZdW=
zk<nq_PTw%UDcG&Nx6eD~3+lr}XDVh44hDyP{1$Yq^5=_P6Gx5gc`?Bj0`a0z$eid0
ztDMYfCRc+mps5Kl!(brDmxIz?VTz~BXQ94*ld%=a`O)XvI~XqG%IZZd9*WoGvQ}tc
zQxm_E?Ai!c!BcAvIF=K+mcT<GLyjkpNzmlUGu@)}H(|(=g^hT^Q*5k7i)MJu)9xuI
z+qncK1XLcUw46+MsZfwi%$8V-SO&Ex8(+FH6Dsj!r&t`KW&KYlCc)6!I%bXjbnS8G
zrj~xP5N)u%85Adx0EH5-f&(4hc%@zJ$aYjyo(h8b1hi-67JmOm?T7C5l^OV>N8;<r
zyPl|p1d9k3GdQ`T>;ad~N3cHrBQowGXh1ux;{Lr(*Z0~=5yZ+Hi4xnkl&B^G@!RDU
zieMr37PN1e$2#DV4Qf*}30e?TvwjSPtr&oN4i)73zeZsIu5P%(s^D)MbJ<O}yKzot
z7lw-|qrLq@G2^-wEv@VMCJG=T_ruc8R`yN!cIO%Wbuh!%x{B8IQ5j<AEo8cw;D-dF
zU>|Aq2_PB8S0`=_A)Rt-(7qpnzjigXPd6GP6zu<x26fYSZ#3-L7Bjap_(jVab}jmw
zO>1RV265dbtQ%^&8yme8a5WWngP@AouM>QOU=(4moKwg%i0dJE_^6x$%a+O%F)9zA
zlK3|#r=$UXzQw)p{`tt#=i?exHr;%PO%X?3bh7E0p6opF8k|Rum}4j~vMV6&SZ{F8
zDE?M;Qy>i*dy?1yZ0yO~*GVhtB<bWR@hoIj+thgyS;Q2H*X}d&5kH%$MO;jqhh(B{
z)7&``+L2bYknjnnr`d!bxZU&P2J%pioDL<Yy7_K`Ah9%4|D6?)Y|5<cK>c}$dEf9;
z*Yw;d(ogyNW_)nPitmM{fckSztDHKO6VJKm<#g$2?%sW-x4Lb*$)s8yGMTiGFW#F>
zTe(Hy*Wf^JU8WnIW2UifJA#A5oSt(1)xJyA9k|fj%2dehTU1&|NwNs?3I0s_?F7Tb
W+KCbmhqzI$!J$5%(d2A)*8K<jaa?}@

diff --git a/src/branch_tab.py b/src/branch_tab.py
index d9278b1..7fef539 100644
--- a/src/branch_tab.py
+++ b/src/branch_tab.py
@@ -241,7 +241,7 @@ def OnRightClick(self, event):
 					popup_menu.add_separator()
 			
 				elif os.path.isdir(os.path.join(self.explorer.current_directory, file_name)):
-					popup_menu.add_command(label="Rename", command=lambda mode='edit', initialvalue=file_name: self.new_file(mode, initialvalue))
+					popup_menu.add_command(label="Rename", command=lambda mode='edit folder', initialvalue=file_name: self.new_file(mode, initialvalue))
 					
 			else: # if file not selected, add plugin menu if any run_on_folders plugins are present
 				if len(plugins) > 0:
@@ -364,13 +364,13 @@ def new_folders(self):
 			self.mainapp.undo_redo_states.reset_redo()		
 
 	#def rename_folder(sel)
-	def new_file(self, mode, initialvalue=''):
-		if mode == 'edit':
+	def new_file(self, mode, initialvalue=""):
+		if mode == "edit" or mode == "edit folder":
 			self.orig_file_name = initialvalue
-		elif mode == 'new excel':
-			initialvalue = '.xlsx'
-		elif mode == 'new word':
-			initialvalue = '.docx'
+		elif mode == "new excel":
+			initialvalue = ".xlsx"
+		elif mode == "new word":
+			initialvalue = ".docx"
 		
 		if mode == "edit":
 			window_mode = "Rename"
@@ -388,7 +388,11 @@ def new_file(self, mode, initialvalue=''):
 			#check file does not exist
 			if mode == "new" or mode == "new excel" or mode == "new word":
 				if os.path.isfile(os.path.join(self.explorer.current_directory, new_name)):
-					msg = 'That File Already Exists!'
+					msg = "That File Already Exists!"
+					
+			if mode == "edit folder":
+				if os.path.isdir(os.path.join(self.explorer.current_directory, new_name)):
+					msg = "That Folder Already Exists!"
 					
 			# Check if user input is just a bunch of spaces
 			if new_name.strip() == '':
@@ -402,9 +406,9 @@ def new_file(self, mode, initialvalue=''):
 				messagebox.showerror('Error', message=msg)
 				self.new_file(mode, initialvalue=new_name)
 			else:
-				if mode == 'new':
+				if mode == "new":
 					with open(os.path.join(self.explorer.current_directory, new_name), 'w') as f:
-						f.write('')
+						f.write("")
 						
 				# New Excel File
 				elif mode == 'new excel':
@@ -422,7 +426,11 @@ def new_file(self, mode, initialvalue=''):
 					except Exception as e:
 						if "being used by another" in str(e).lower():
 							msg = "Permission Denied, Ensure Document is not Open in Another Process"
-							
+						elif "access is denied" in str(e).lower():
+							if mode == "edit folder":
+								msg = "Access Denied, Ensure No Files are Open in the Folder"
+							else:
+								msg = "Access Denied"
 						else:
 							msg = f"The Following Error Occured\n{str(e)}"
 							
diff --git a/src/main.py b/src/main.py
index 4f6b6df..1ab32e9 100644
--- a/src/main.py
+++ b/src/main.py
@@ -48,7 +48,7 @@ def __init__(self, parent, *args, **kwargs):
 		self.load_plugins()
 
 	def setup_variables(self):
-		self.version = "0.32.11"
+		self.version = "0.33.0"
 		self.parent.title(f"Tk Path Finder V{self.version}")
 		self.config_data = config_file_manager.load_config_file(self)
 		self.plugin_folder = ".\Plugins"