From 1ebf4a365befa1679b92e79439f6bb0d257f7d61 Mon Sep 17 00:00:00 2001
From: berkguzel <berkguzeell@gmail.com>
Date: Fri, 25 Sep 2020 11:58:31 +0300
Subject: [PATCH 1/3] get main file's name is solved

---
 main.py | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 824a86e..eaec8e5 100755
--- a/main.py
+++ b/main.py
@@ -147,15 +147,43 @@ def check_and_create(fileName, templates, templateName, emoji='', vars={}):
     else:
         print('Found. ✅')
 
+def get_main_name():
+    files=os.listdir()
+    fileName=[]
+    for file in files:
+        if file[-2:]=='py':
+            fileName.append(file)
+        else:
+            pass
+
+    if len(fileName) == 1:
+        os.rename(fileName[0],'main.py')
+        return 'main.py'
+    elif len(fileName)==0:
+        print('You do not have py file in this directory, please go into the correct directory')
+    else:
+        print()
+        for file in fileName:
+            print(file)
+
+        file=prompt('there are too many py files are in this directory, please choose one of them as the main file: ')
+
+        if not file in fileName:
+            print('You do not have any file with this name')
+        elif file in fileName:
+            os.rename(file,'main.py')            
+            return 'main.py'
 
 def get_main():
-    if not doesFileExist('main.py'):
-        print('Not found  ❌')
-        # TODO: get main file's name
-        raise NameError('Couldnt found main')
-    else:
+    fileName=get_main_name()
+
+    if doesFileExist('main.py'):
         print('Present. ✅')
         return 'main.py'
+    else:
+        print('Not found ❌')
+        raise NameError('Couldnt found main')
+
 
 
 def build_image(org='', repo='gepp', tag='latest'):

From 89f379f60748c52f5a11ca6e9f2becd122d64d01 Mon Sep 17 00:00:00 2001
From: berkguzel <berkguzeell@gmail.com>
Date: Thu, 1 Oct 2020 16:48:15 +0300
Subject: [PATCH 2/3] TODO get main file's name is solved

---
 main.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/main.py b/main.py
index eaec8e5..69ca437 100755
--- a/main.py
+++ b/main.py
@@ -157,8 +157,7 @@ def get_main_name():
             pass
 
     if len(fileName) == 1:
-        os.rename(fileName[0],'main.py')
-        return 'main.py'
+        return fileName[0]
     elif len(fileName)==0:
         print('You do not have py file in this directory, please go into the correct directory')
     else:
@@ -166,20 +165,19 @@ def get_main_name():
         for file in fileName:
             print(file)
 
-        file=prompt('there are too many py files are in this directory, please choose one of them as the main file: ')
+        file=input('there are too many py files are in this directory, please choose one of them as the main file: ')
 
         if not file in fileName:
             print('You do not have any file with this name')
-        elif file in fileName:
-            os.rename(file,'main.py')            
-            return 'main.py'
+        elif file in fileName:           
+            return file
 
 def get_main():
-    fileName=get_main_name()
+    mainFileName=get_main_name()
 
-    if doesFileExist('main.py'):
-        print('Present. ✅')
-        return 'main.py'
+    if doesFileExist(mainFileName):
+        print(f'{mainFileName} Present. ✅')
+        return mainFileName
     else:
         print('Not found ❌')
         raise NameError('Couldnt found main')
@@ -373,8 +371,6 @@ def main():
     else:
         config = generate_default_config()
 
-    templates = jinja2.Environment(
-        loader=jinja2.PackageLoader(package_name='main'), autoescape=True)
     '''
     TODO: fix here to include prompt toolkit and get a list of ports
 
@@ -385,13 +381,17 @@ def main():
         print("it is listening!")
     '''
 
-    print('📍 Locating main.py file... ', end='')
+    print('📍 Locating main file... ', end='')
     try:
         mainFile = get_main()
     except:
         print('Could not get main.py, exiting.')
         import sys
         sys.exit(1)
+        
+    templates = jinja2.Environment(
+        loader=jinja2.PackageLoader(package_name=mainFile[:-3]), autoescape=True)
+    
     tempVars['mainFile'] = mainFile
 
     tempVars['ports'].append(

From bebe15bafb3c2fbb1a386f1bdadbc696dee249ba Mon Sep 17 00:00:00 2001
From: berkguzel <berkguzeell@gmail.com>
Date: Fri, 2 Oct 2020 23:15:04 +0300
Subject: [PATCH 3/3] TODO get main file's name is solved

---
 main.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/main.py b/main.py
index 69ca437..a43f2c6 100755
--- a/main.py
+++ b/main.py
@@ -161,16 +161,19 @@ def get_main_name():
     elif len(fileName)==0:
         print('You do not have py file in this directory, please go into the correct directory')
     else:
-        print()
-        for file in fileName:
-            print(file)
+        if 'main.py' in fileName:
+            return 'main.py'
+        else:
+            print()
+            for file in fileName:
+                print(file)
 
-        file=input('there are too many py files are in this directory, please choose one of them as the main file: ')
+            file=input('there are too many py files are in this directory, please choose one of them as the main file: ')
 
-        if not file in fileName:
-            print('You do not have any file with this name')
-        elif file in fileName:           
-            return file
+            if not file in fileName:
+                print('You do not have any file with this name')
+            elif file in fileName:           
+                return file
 
 def get_main():
     mainFileName=get_main_name()