Refactor file organization logic and enhance .gitignore; remove GUI component

codeperfectplus · codeperfectplus · commit dcaca8c67d20 · 2025-05-22T09:31:38.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,161 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
 env/
-.vscode/
-.env
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,9 +1,46 @@
 Changelog
 =========
 
-v1.0.7 (2025-05-22)
--------------------
+1.0.7
+-----
 
 - First `Production` release
 - Organize files via `movens -p <path>`
 - Version flag `-v` added
+
+
+1.0.6 - 2022-11-18
+-----
+
+- Bug fixed
+- Code refactoring
+
+1.0.5 - 2022-11-02
+------------------
+
+- PYPI package is now available
+- Only create required directories
+- Package can be updated from GitHub Action workflow
+
+1.0.4 - 2022-07-04
+------------------
+
+- Code refactoring
+- Bug fixes
+
+1.0.3 - 2020-09-23
+------------------
+
+- Bug fixed
+
+1.0.2 - 2020-09-22
+------------------
+
+- New extension added
+- Bug fixed
+
+Initial Release - 2020-05-13
+----------------------------
+
+- Initial release
+
diff --git a/movens/__init__.py b/movens/__init__.py
@@ -1,3 +1,3 @@
-from movens.main import start
+from movens.main import organize_files_in_directory
 
-__all__ = ['start']
+__all__ = ['organize_files_in_directory']
diff --git a/movens/gui/filemovergui.py b/movens/gui/filemovergui.py
diff --git a/movens/main.py b/movens/main.py
@@ -77,24 +77,36 @@ def classify_extension(extension: str) -> str:
 def organize_files_in_directory(folder_path: str) -> None:
     """
     Organize files in the given folder into subfolders based on their extensions.
-    
+
     Args:
         folder_path (str): Path of the folder to organize.
     """
-    folder = Path(folder_path)
+    folder = Path(folder_path).resolve()
     if not folder.exists():
         print(f"[!] Provided path does not exist: {folder_path}")
         return
 
+    current_dir_name = folder.name.lower()
     files_to_move = {}
 
     for item in folder.iterdir():
         if item.is_file() and not item.name.startswith('.') and '.' in item.name:
             if item.name == Path(__file__).name:
                 continue  # Avoid moving the script itself
             extension = item.suffix[1:]  # Remove the dot
-            destination_folder = classify_extension(extension)
-            files_to_move.setdefault(destination_folder, []).append(item)
+            category_path = classify_extension(extension)
+            parts = category_path.split('/')
+            top_level = parts[0].lower()
+
+            # Determine actual destination path
+            if top_level == current_dir_name:
+                # Remove the top-level category from path
+                destination_folder = '/'.join(parts[1:]) if len(parts) > 1 else ''
+            else:
+                destination_folder = category_path
+
+            if destination_folder:  # Only move if there's a subfolder
+                files_to_move.setdefault(destination_folder, []).append(item)
 
     for category in files_to_move:
         full_folder_path = folder / category
@@ -107,6 +119,7 @@ def organize_files_in_directory(folder_path: str) -> None:
                 print(f"[✖] Could not move {file.name}: {e}")
 
 
+
 if __name__ == '__main__':
     import sys
     if len(sys.argv) > 1:
