From eb91ef59bdbcf6e26ef618fc54d4f73eb6532c44 Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <antonio.delarosa@salirdelhoyo.com>
Date: Tue, 4 Mar 2025 00:40:44 +0100
Subject: [PATCH] Deprecating modules

---
 paramecio/app.py                      | 21 ++++++++++++---------
 paramecio/libraries/sessionplugin.py  |  5 +++--
 paramecio/modules/lang/index.py       | 11 +++++++----
 paramecio/modules/welcome/__init__.py |  3 +++
 paramecio/modules/welcome/index.py    | 10 ++++++----
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/paramecio/app.py b/paramecio/app.py
index bbd9c85..45c73e4 100644
--- a/paramecio/app.py
+++ b/paramecio/app.py
@@ -52,7 +52,7 @@ def prepare_app():
     module_loaded=None
 
     #Getting paths for loaded modules for use in media load files
-
+    """
     for module in config.modules:
         
         #controller_path=sys.modules[module]
@@ -62,6 +62,7 @@ def prepare_app():
         base_module=module.split('.')[-1]
         
         arr_module_path[base_module]=controller_base
+    """
 
     #app.add_hook('before_request', print_memory)
     """
@@ -80,7 +81,7 @@ def prepare_app():
     app_mounts={}
 
     for key_app, added_app in config.apps.items():
-        print(added_app)
+        
         controller_path=import_module(added_app[0])
         
         controller_base=os.path.dirname(controller_path.__file__)
@@ -97,18 +98,20 @@ def prepare_app():
 
                 a=import_module(module_app)
                 
-                app_name=getattr(a, added_app[1])
+                if added_app[1]!='':
+                
+                    app_name=getattr(a, added_app[1])
 
-                #app.register_blueprint(app_name, url_prefix=added_app[2])
-
-                #app.mount(added_app[2], app_name) 
-                app_mounts[added_app[2]]=app_name
+                    app_mounts[added_app[2]]=app_name
                 
                 arr_module_path[key_app]=os.path.dirname(sys.modules[module_app].__file__)
 
     for k_app,v_app in app_mounts.items():
-        
-        app.mount(k_app, v_app) 
+        #print(k_app)
+        if k_app!='/':
+            app.mount(k_app, v_app) 
+        elif k_app!='':
+            app.merge(v_app)
         
     set_timezone()
 
diff --git a/paramecio/libraries/sessionplugin.py b/paramecio/libraries/sessionplugin.py
index 03872e2..ba4ea7d 100644
--- a/paramecio/libraries/sessionplugin.py
+++ b/paramecio/libraries/sessionplugin.py
@@ -56,7 +56,8 @@ def session_plugin(callback):
             except:
                 session=Session()
         
-        kwargs['session']=session
+        if 'session' in kwargs:
+            kwargs['session']=session
         
         #For compatibility with old sessions server-side style. 
         
@@ -65,7 +66,7 @@ def session_plugin(callback):
         rv=callback(*args, **kwargs)
         
         if session.changed:
-            print('changed')
+            #print('changed')
             if not safe:
                 safe=URLSafeTimedSerializer(config.key_encrypt)
             
diff --git a/paramecio/modules/lang/index.py b/paramecio/modules/lang/index.py
index 17c614c..9849b47 100644
--- a/paramecio/modules/lang/index.py
+++ b/paramecio/modules/lang/index.py
@@ -1,10 +1,12 @@
 from paramecio.libraries.i18n import I18n
 from bottle import get,response,request
-from paramecio.libraries.sessions import get_session
+#from paramecio.libraries.sessions import get_session
+from paramecio.libraries.sessionplugin import get_session, session_plugin
 from paramecio.libraries.urls import redirect
 import re
 
 @get('/change_lang/<lang>')
+@session_plugin
 def index(lang):
     
     if lang in I18n.dict_i18n:
@@ -12,8 +14,7 @@ def index(lang):
         s=get_session()
         
         s['lang']=lang
-        
-        s.save()
+        #s.save()
         
         redirect_url=request.headers.get('Referer')
         
@@ -23,5 +24,7 @@ def index(lang):
         
             redirect(redirect_url)
         
-    return ""
+    return {'error': 1, 'message': 'No referer for redirect'}
+    
+
 
diff --git a/paramecio/modules/welcome/__init__.py b/paramecio/modules/welcome/__init__.py
index e69de29..e39e1d4 100644
--- a/paramecio/modules/welcome/__init__.py
+++ b/paramecio/modules/welcome/__init__.py
@@ -0,0 +1,3 @@
+from bottle import Bottle
+
+welcome_app=Bottle()
diff --git a/paramecio/modules/welcome/index.py b/paramecio/modules/welcome/index.py
index a3387d4..9783d81 100644
--- a/paramecio/modules/welcome/index.py
+++ b/paramecio/modules/welcome/index.py
@@ -4,25 +4,27 @@ from paramecio.libraries.mtemplates import PTemplate, env_theme
 from paramecio.libraries.urls import make_url
 from paramecio.wsgiapp import app
 from settings import config
+from paramecio.modules.welcome import welcome_app
+from bottle import request
 
 #t=ptemplate(__file__)
 env=env_theme(__file__)
 
 t=PTemplate(env)
 
-@app.route('/welcome')
+@welcome_app.route('/welcome')
 def home():
     
     return t.render_template('welcome.html', title="Welcome to Paramecio!!!", content="The simple web framework writed in Python3!!!")
 
-@app.route('/welcome/<id:int>')
+@welcome_app.route('/welcome/<id:int>')
 def page(id):
     return t.render_template('index.html', title="A simple example of a page", id=id, value=request.query.value)
 
-@app.route('/welcome/test/<int_id:int>')
+@welcome_app.route('/welcome/test/<int_id:int>')
 def test(int_id):
     
-    return make_url('welcome/test/'+int_id, {'ohmygod': 'This is gooood', 'shutup':'Shut up!!'})
+    return make_url(f'welcome/test/{int_id}', {'ohmygod': 'This is gooood', 'shutup':'Shut up!!'})
 
 if config.default_module=="welcome":