Merged conflicts

Author: ravishhankar

projects/Random password generator/random_password_gen.py

@@ -1,5 +1,6 @@
 import random
 import math
+<<<<<<< HEAD
 alpha = "abcdefghijklmnopqrstuvwxyz"
 num = "0123456789"
 special = "@#$%&*"
@@ -40,3 +41,51 @@ def generate_pass(length, array, is_alpha=False):
 for i in password:
     gen_password = gen_password + str(i)
 print(gen_password)
+=======
+alpha="abcdefghijklmnopqrstuvwxyz"
+num="0123456789"
+special="@#$%&*"
+
+#pass_len=random.randint(8,13)  #without User INput
+pass_len=int(input("Enter Password Length"))
+
+#length of password by 50-30-20 formula
+alpha_len=pass_len//2
+num_len=math.ceil(pass_len*30/100)
+special_len=pass_len-(alpha_len+num_len)
+
+
+password=[]
+
+def generate_pass(length,array,is_alpha=False):
+  
+    for i in range(length):
+        index=random.randint(0,len(array)-1)
+        character=array[index]
+        if is_alpha==True:
+            
+            case=random.randint(0,1)
+            if case==1:
+                character=character.upper()
+        
+        password.append(character)
+
+#alpha password     
+generate_pass(alpha_len,alpha,True)
+#numeric password
+generate_pass(num_len,num)
+#special Character password
+generate_pass(special_len,special)
+
+#suffle the generated password list
+random.shuffle(password)
+
+#convert List To string
+gen_password=""
+for i in password:
+    gen_password=gen_password+str(i)
+
+print(gen_password)
+
+
+>>>>>>> 760b764f0e43d93842442ba57e745ef195a27d42

projects/organized download folder with different categories/file-sortor.py

@@ -1,5 +1,6 @@
 import os
 import shutil
+<<<<<<< HEAD
 
 os.chdir("E:\\downloads")
 # print(os.getcwd())
@@ -8,11 +9,21 @@
 files = os.listdir()
 
 # list of extension (You can add more if you want)
+=======
+os.chdir("E:\downloads")
+#print(os.getcwd())
+
+#check number of files in  directory
+files = os.listdir()
+
+#list of extension (You can add more if you want)
+>>>>>>> 760b764f0e43d93842442ba57e745ef195a27d42
 extentions = {
     "images": [".jpg", ".png", ".jpeg", ".gif"],
     "videos": [".mp4", ".mkv"],
     "musics": [".mp3", ".wav"],
     "zip": [".zip", ".tgz", ".rar", ".tar"],
+<<<<<<< HEAD
     "documents": [".pdf", ".docx", ".csv",
                   ".xlsx", ".pptx", ".doc", ".ppt", ".xls"],
     "setup": [".msi", ".exe"],
@@ -22,6 +33,18 @@
 
 
 # sort to specific folder depend on extenstions
+=======
+    "documents": [".pdf", ".docx", ".csv", ".xlsx", ".pptx", ".doc", ".ppt", ".xls"],
+    "setup": [".msi", ".exe"],
+    "programs": [".py", ".c", ".cpp", ".php", ".C", ".CPP"],
+    "design": [".xd", ".psd"]
+
+
+}
+
+
+#sort to specific folder depend on extenstions
+>>>>>>> 760b764f0e43d93842442ba57e745ef195a27d42
 def sorting(file):
     keys = list(extentions.keys())
     for key in keys:
@@ -31,16 +54,28 @@ def sorting(file):
                 return key
 
 
+<<<<<<< HEAD
 # iterate through each file
+=======
+#iterat through each file
+>>>>>>> 760b764f0e43d93842442ba57e745ef195a27d42
 for file in files:
     dist = sorting(file)
     if dist:
         try:
             shutil.move(file, "../download-sorting/" + dist)
+<<<<<<< HEAD
         except Exception:
+=======
+        except:
+>>>>>>> 760b764f0e43d93842442ba57e745ef195a27d42
             print(file + " is already exist")
     else:
         try:
             shutil.move(file, "../download-sorting/others")
+<<<<<<< HEAD
         except Exception:
+=======
+        except:
+>>>>>>> 760b764f0e43d93842442ba57e745ef195a27d42
             print(file + " is already exist")