resolved conflicts

1 files changed, 0 insertions, 51 deletions

diff --git a/share/frontend/im/OLD/clearthedirectories b/share/frontend/im/OLD/clearthedirectories
deleted file mode 100755
index 6d5b2a7..0000000
--- a/share/frontend/im/OLD/clearthedirectories
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/python2.7
-
-import sys
-import os
-import time
-
-f = open("directories",'r')
-lines = f.readlines()
-f.close()
-newlines = []
-for line in lines:
-	if "\n" in line:
-		jerry = line.replace("\n","")
-		if len(jerry) == 2:
-			newlines.append(jerry)
-dirs = newlines
-print dirs
-for dir in dirs:
-	print dir
-	if len(dir) == 2:
-		delete = False
-		os.system("ls "+dir+"/ >> contents")
-		f = open("contents","r")
-		thecontents = f.readlines()
-		f.close()
-		print thecontents
-		os.system("rm contents")
-		tempbool = False
- 		tempbool2 = False
-		if len(thecontents) != 0:
-			for x in thecontents:
-				if ".jpg" in x:
-					tempbool = True
-#			if len(thedirs)>40:
-#				tempbool2 = True
-			if tempbool == True:# and tempbool2 == True:
-				print "deleting contents.."
-		print "moving to directory '"+dir+"'"
-	if len(thecontents)>0:
-		x = input("bout to do some deleting 1=yes 0=no")
-		if x == 1:
-			print "ok deleting "+dir+"/*"
-			try:
-				os.system("rm "+dir+"/*")
-			except:
-				continue
-		else:
-			sys.exit()
-	else:
-		print "nothing there"
-		continue