@@ -13,16 +13,23 @@ import (
1313
1414func main () {
1515 logger := logging .NewLogger ()
16- logger .LogDebug ("Starting file encryptor" ) //Added debug log
16+ logger .LogDebug ("Starting file encryptor" )
1717
1818 encrypt := flag .Bool ("e" , false , "Encrypt the file" )
1919 decrypt := flag .Bool ("d" , false , "Decrypt the file" )
20+
21+ // Define both short and long flag names for file and key
2022 file := flag .String ("file" , "" , "File to encrypt or decrypt" )
21- key := flag .String ("key" , "" , "Path to the key file (public key for encryption, private key for decryption)" )
23+ flag .StringVar (file , "f" , "" , "File to encrypt or decrypt (shorthand)" ) //Bind short flag to the same variable
24+ key := flag .String ("key" , "" , "Path to the key file" )
25+ flag .StringVar (key , "k" , "" , "Path to the key file (shorthand)" ) //Bind short flag to the same variable
26+
2227 password := flag .String ("password" , "" , "Password for encryption/decryption (alternative to key file)" )
28+ flag .StringVar (password , "p" , "" , "Password for encryption/decryption (shorthand)" ) //Bind short flag to the same variable
2329 flag .Parse ()
24- logger .LogDebug ("Parsed command line flags" ) // Added debug log
30+ logger .LogDebug ("Parsed command line flags" )
2531
32+ // Use the flag values after parsing.
2633 if err := validateFlags (* encrypt , * decrypt , * file , * key , * password ); err != nil {
2734 logger .LogError (err .Error ())
2835 flag .Usage ()
@@ -38,7 +45,7 @@ func main() {
3845 operation = "Decryption"
3946 outputFile , err = handleDecryption (* file , * key , * password , logger )
4047 }
41- logger .LogDebugf ("Operation: %s, Output file: %s" , operation , outputFile ) // Added debug log
48+ logger .LogDebugf ("Operation: %s, Output file: %s" , operation , outputFile )
4249
4350 if err != nil {
4451 logger .LogError (fmt .Sprintf ("%v" , err ))
@@ -49,7 +56,7 @@ func main() {
4956 }
5057
5158 logger .LogInfo (fmt .Sprintf ("File %s completed. Output file: %s" , strings .ToLower (operation ), outputFile ))
52- logger .LogDebug ("File encryption/decryption completed" ) // Added debug log
59+ logger .LogDebug ("File encryption/decryption completed" )
5360}
5461
5562func validateFlags (encrypt , decrypt bool , file , key , password string ) error {
@@ -58,15 +65,15 @@ func validateFlags(encrypt, decrypt bool, file, key, password string) error {
5865 }
5966
6067 if file == "" {
61- return fmt .Errorf ("please provide the --file argument" )
68+ return fmt .Errorf ("please provide the --file or -f argument" )
6269 }
6370
6471 if key == "" && password == "" {
65- return fmt .Errorf ("please provide either --key or -- password argument" )
72+ return fmt .Errorf ("please provide either --key or -k or -- password or -p argument" )
6673 }
6774
6875 if key != "" && password != "" {
69- return fmt .Errorf ("please provide either --key or -- password, not both" )
76+ return fmt .Errorf ("please provide either --key or -k or -- password or -p , not both" )
7077 }
7178
7279 return nil
@@ -82,7 +89,7 @@ func handleEncryption(file, key, password string, logger *logging.Logger) (strin
8289 } else {
8390 encryptor , err = crypto .NewPasswordEncryptor (password )
8491 }
85- logger .LogDebugf ("Initialized encryptor: %T" , encryptor ) // Added debug log
92+ logger .LogDebugf ("Initialized encryptor: %T" , encryptor )
8693
8794 if err != nil {
8895 return "" , fmt .Errorf ("error initializing encryptor: %v" , err )
@@ -103,7 +110,7 @@ func handleDecryption(file, key, password string, logger *logging.Logger) (strin
103110 } else {
104111 decryptor , err = crypto .NewPasswordDecryptor (password )
105112 }
106- logger .LogDebugf ("Initialized decryptor: %T" , decryptor ) // Added debug log
113+ logger .LogDebugf ("Initialized decryptor: %T" , decryptor )
107114
108115 if err != nil {
109116 return "" , fmt .Errorf ("error initializing decryptor: %v" , err )
0 commit comments