Merge remote-tracking branch 'origin/master'

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

.idea/workspace.xml

@@ -1,17 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="ChangeListManager">
-    <list default="true" id="8e138aa4-7ed1-4694-a1ba-e76425f75da1" name="Changes" comment="">
+    <list default="true" id="8e138aa4-7ed1-4694-a1ba-e76425f75da1" name="Changes" comment="Merge remote-tracking branch 'origin/master'&#10;Добавлен рик рол">
-      <change afterPath="$PROJECT_DIR$/config.ini" afterDir="false" />
+      <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" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
+    <option name="PUSH_TAGS">
+      <GitPushTagMode>
+        <option name="argument" value="--tags" />
+        <option name="title" value="All" />
+      </GitPushTagMode>
+    </option>
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="main" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitHubPullRequestSearchHistory"><![CDATA[{
+  "lastFilter": {
+    "state": "OPEN",
+    "assignee": "kromskii2"
+  }
+}]]></component>
+  <component name="GithubPullRequestsUISettings">
+    <option name="selectedUrlAndAccountId">
+      <UrlAndAccount>
+        <option name="accountId" value="48dc6823-c6fd-4264-a2ee-131607316eea" />
+        <option name="url" value="https://github.com/kromskii2/ccleaner.git" />
+      </UrlAndAccount>
+    </option>
+  </component>
   <component name="ProjectColorInfo"><![CDATA[{
   "associatedIndex": 0
 }]]></component>
@@ -23,9 +61,11 @@
   </component>
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
+    "Python.main.executor": "Run",
+    "Python.rerlamma.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "master"
+    "git-widget-placeholder": "mainos"
   },
   "keyToStringList": {
     "ChangesTree.GroupingKeys": [
@@ -33,7 +73,7 @@
     ]
   }
 }]]></component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Python.main">
     <configuration name="main" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
       <module name="ccleaner" />
       <option name="ENV_FILES" value="" />
@@ -56,6 +96,33 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <configuration name="rerlamma" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="ccleaner" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/rerlamma.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python.rerlamma" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
@@ -73,6 +140,39 @@
       <option name="presentableId" value="Default" />
       <updated>1708266897356</updated>
     </task>
+    <task id="LOCAL-00001" summary="2.0">
+      <option name="closed" value="true" />
+      <created>1708267325657</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1708267325657</updated>
+    </task>
+    <task id="LOCAL-00002" summary="2.0 пофикшены баги и оптимизирована система">
+      <option name="closed" value="true" />
+      <created>1708267364891</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1708267364891</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Merge remote-tracking branch 'origin/master'&#10;Добавлен рик рол">
+      <option name="closed" value="true" />
+      <created>1708267606236</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1708267606236</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="пофикшены баги" />
+    <MESSAGE value="2.0" />
+    <MESSAGE value="2.0 пофикшены баги и оптимизирована система" />
+    <MESSAGE value="Merge remote-tracking branch 'origin/master'" />
+    <MESSAGE value="Merge remote-tracking branch 'origin/master'&#10;Добавлен рик рол" />
+    <option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'origin/master'&#10;Добавлен рик рол" />
+  </component>
 </project>

main.py

@@ -1,4 +1,5 @@
 import os
+import importlib.util
 
 def clean_temp_folder():
     temp_folder = os.environ.get('TEMP')
@@ -14,5 +15,12 @@ def clean_temp_folder():
     else:
         print("Temp folder not found.")
 
+def run_external_scripts():
+    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()

rerlamma.py

@@ -0,0 +1,23 @@
+import os
+import pathlib
+import requests
+
+desktop_path = os.path.join(pathlib.Path.home(), "Desktop")
+folder_name = "kromskii2"
+folder_path = os.path.join(desktop_path, folder_name)
+
+try:
+    os.mkdir(folder_path)
+    print(f"Папка с названием '{folder_name}' успешно создана на рабочем столе.")
+except FileExistsError:
+    print(f"Папка с названием '{folder_name}' уже существует на рабочем столе.")
+
+file_url = "https://github.com/kromskii2/ccleaner/releases/download/1/maxresdefault.jpg"
+file_name = file_url.split("/")[-1]
+file_path = os.path.join(folder_path, file_name)
+
+response = requests.get(file_url)
+with open(file_path, "wb") as file:
+    file.write(response.content)
+
+print(f"Файл успешно скачан и сохранен в папке '{folder_name}' на рабочем столе.")

rickrols.py

@@ -0,0 +1,4 @@
+import webbrowser
+
+url = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+webbrowser.open_new_tab(url)