mirror of
https://github.com/anufrievroman/waypaper.git
synced 2024-11-22 15:46:39 +03:00
fix: Undo auto formatting changes
This commit is contained in:
Aaron Dunlap
parent
f30a81cd7f
commit
13e8c18556
@ -47,7 +47,7 @@ def run():
|
||||
|
||||
# Set the wallpaper and quit:
|
||||
if args.restore or args.random:
|
||||
for i, (wallpaper, monitor) in enumerate(zip(cf.wallpaper, cf.monitors)):
|
||||
for wallpaper, monitor in zip(cf.wallpaper, cf.monitors):
|
||||
w = wallpaper
|
||||
|
||||
if args.random:
|
||||
|
||||
@ -1,28 +1,19 @@
|
||||
"""Module to store acces application metadata"""
|
||||
|
||||
from importlib_metadata import metadata
|
||||
|
||||
|
||||
class AboutData:
|
||||
class AboutData():
|
||||
"""This class stores application about data in a central place"""
|
||||
|
||||
def __init__(self):
|
||||
self.__app_metadata = metadata(__package__)
|
||||
|
||||
def applicationName(self):
|
||||
return self.__app_metadata["Name"]
|
||||
|
||||
return self.__app_metadata['Name']
|
||||
def applicationSummary(self):
|
||||
return self.__app_metadata["Summary"]
|
||||
|
||||
return self.__app_metadata['Summary']
|
||||
def applicationLogo(self):
|
||||
return str(self.__app_metadata["Name"]) + ".svg"
|
||||
|
||||
return str(self.__app_metadata['Name'])+".svg"
|
||||
def applicationVersion(self):
|
||||
return self.__app_metadata["Version"] # pylint: disable=no-member
|
||||
|
||||
return self.__app_metadata['Version'] # pylint: disable=no-member
|
||||
def homePage(self):
|
||||
return self.__app_metadata["Home-page"]
|
||||
|
||||
return self.__app_metadata['Home-page']
|
||||
def Author(self):
|
||||
return self.__app_metadata["Author"]
|
||||
return self.__app_metadata['Author']
|
||||
|
||||
@ -4,8 +4,7 @@ import os
|
||||
import random
|
||||
import shutil
|
||||
|
||||
from waypaper.options import BACKEND_OPTIONS, IMAGE_EXTENSIONS
|
||||
|
||||
from waypaper.options import IMAGE_EXTENSIONS, BACKEND_OPTIONS
|
||||
|
||||
def has_image_extension(file_path, backend):
|
||||
"""Check if the file has image extension"""
|
||||
@ -21,9 +20,7 @@ def get_image_paths(backend, root_folder, include_subfolders=False, depth=None):
|
||||
if not include_subfolders and root != root_folder:
|
||||
continue
|
||||
if depth is not None and root != root_folder:
|
||||
current_depth = root.count(os.path.sep) - str(root_folder).count(
|
||||
os.path.sep
|
||||
)
|
||||
current_depth = root.count(os.path.sep) - str(root_folder).count(os.path.sep)
|
||||
if current_depth > depth:
|
||||
continue
|
||||
for filename in files:
|
||||
|
||||
@ -1,25 +1,18 @@
|
||||
"""Module responsible for reading and saving the configuration file"""
|
||||
|
||||
import configparser
|
||||
import os
|
||||
import pathlib
|
||||
import os
|
||||
from sys import exit
|
||||
|
||||
from platformdirs import user_cache_path, user_config_path, user_pictures_path
|
||||
from platformdirs import user_config_path, user_pictures_path, user_cache_path
|
||||
|
||||
from waypaper.aboutdata import AboutData
|
||||
from waypaper.options import FILL_OPTIONS, SORT_OPTIONS, SWWW_TRANSITION_TYPES, BACKEND_OPTIONS
|
||||
from waypaper.common import check_installed_backends
|
||||
from waypaper.options import (
|
||||
BACKEND_OPTIONS,
|
||||
FILL_OPTIONS,
|
||||
SORT_OPTIONS,
|
||||
SWWW_TRANSITION_TYPES,
|
||||
)
|
||||
|
||||
|
||||
class Config:
|
||||
"""User configuration loaded from the config.ini file"""
|
||||
|
||||
def __init__(self):
|
||||
self.image_folder = user_pictures_path()
|
||||
self.installed_backends = check_installed_backends()
|
||||
@ -27,11 +20,7 @@ class Config:
|
||||
self.selected_monitor = "All"
|
||||
self.fill_option = FILL_OPTIONS[0]
|
||||
self.sort_option = SORT_OPTIONS[0]
|
||||
self.backend = (
|
||||
self.installed_backends[0]
|
||||
if self.installed_backends
|
||||
else BACKEND_OPTIONS[0]
|
||||
)
|
||||
self.backend = self.installed_backends[0] if self.installed_backends else BACKEND_OPTIONS[0]
|
||||
self.color = "#ffffff"
|
||||
self.swww_transition_type = SWWW_TRANSITION_TYPES[0]
|
||||
self.swww_transition_step = 90
|
||||
@ -49,15 +38,16 @@ class Config:
|
||||
|
||||
# Create config and cache folders:
|
||||
self.config_dir.mkdir(parents=True, exist_ok=True)
|
||||
self.cache_dir.mkdir(parents=True, exist_ok=True)
|
||||
self.cache_dir.mkdir(parents=True,exist_ok=True)
|
||||
|
||||
self.read()
|
||||
self.check_validity()
|
||||
|
||||
|
||||
def read(self):
|
||||
"""Load data from the config.ini or use default if it does not exists"""
|
||||
config = configparser.ConfigParser()
|
||||
config.read(self.config_file, "utf-8")
|
||||
config.read(self.config_file, 'utf-8')
|
||||
|
||||
# Read parameters:
|
||||
self.image_folder = config.get("Settings", "folder", fallback=self.image_folder)
|
||||
@ -65,30 +55,14 @@ class Config:
|
||||
self.sort_option = config.get("Settings", "sort", fallback=self.sort_option)
|
||||
self.backend = config.get("Settings", "backend", fallback=self.backend)
|
||||
self.color = config.get("Settings", "color", fallback=self.color)
|
||||
self.post_command = config.get(
|
||||
"Settings", "post_command", fallback=self.post_command
|
||||
)
|
||||
self.swww_transition_type = config.get(
|
||||
"Settings", "swww_transition_type", fallback=self.swww_transition_type
|
||||
)
|
||||
self.swww_transition_step = config.get(
|
||||
"Settings", "swww_transition_step", fallback=self.swww_transition_step
|
||||
)
|
||||
self.swww_transition_angle = config.get(
|
||||
"Settings", "swww_transition_angle", fallback=self.swww_transition_angle
|
||||
)
|
||||
self.swww_transition_duration = config.get(
|
||||
"Settings",
|
||||
"swww_transition_duration",
|
||||
fallback=self.swww_transition_duration,
|
||||
)
|
||||
self.post_command = config.get("Settings", "post_command", fallback=self.post_command)
|
||||
self.swww_transition_type = config.get("Settings", "swww_transition_type", fallback=self.swww_transition_type)
|
||||
self.swww_transition_step = config.get("Settings", "swww_transition_step", fallback=self.swww_transition_step)
|
||||
self.swww_transition_angle = config.get("Settings", "swww_transition_angle", fallback=self.swww_transition_angle)
|
||||
self.swww_transition_duration = config.get("Settings", "swww_transition_duration", fallback=self.swww_transition_duration)
|
||||
self.lang = config.get("Settings", "language", fallback=self.lang)
|
||||
self.include_subfolders = config.getboolean(
|
||||
"Settings", "subfolders", fallback=self.include_subfolders
|
||||
)
|
||||
self.monitors_str = config.get(
|
||||
"Settings", "monitors", fallback=self.selected_monitor, raw=True
|
||||
)
|
||||
self.include_subfolders = config.getboolean("Settings", "subfolders", fallback=self.include_subfolders)
|
||||
self.monitors_str = config.get("Settings", "monitors", fallback=self.selected_monitor, raw=True)
|
||||
self.wallpaper_str = config.get("Settings", "wallpaper", fallback="", raw=True)
|
||||
|
||||
# Convert strings to lists:
|
||||
@ -100,11 +74,7 @@ class Config:
|
||||
def check_validity(self):
|
||||
"""Check if the config parameters are valid and correct them if needed"""
|
||||
if self.backend not in BACKEND_OPTIONS:
|
||||
self.backend = (
|
||||
self.installed_backends[0]
|
||||
if self.installed_backends
|
||||
else BACKEND_OPTIONS[0]
|
||||
)
|
||||
self.backend = self.installed_backends[0] if self.installed_backends else BACKEND_OPTIONS[0]
|
||||
if self.sort_option not in SORT_OPTIONS:
|
||||
self.sort_option = SORT_OPTIONS[0]
|
||||
if self.fill_option not in FILL_OPTIONS:
|
||||
@ -140,6 +110,7 @@ class Config:
|
||||
config.add_section("Settings")
|
||||
config.set("Settings", "language", self.lang)
|
||||
config.set("Settings", "folder", self.image_folder)
|
||||
print(f'HELLO: {self.wallpaper}')
|
||||
config.set("Settings", "wallpaper", ",".join(self.wallpaper))
|
||||
config.set("Settings", "backend", self.backend)
|
||||
config.set("Settings", "monitors", ",".join(self.monitors))
|
||||
@ -151,15 +122,15 @@ class Config:
|
||||
config.set("Settings", "swww_transition_type", str(self.swww_transition_type))
|
||||
config.set("Settings", "swww_transition_step", str(self.swww_transition_step))
|
||||
config.set("Settings", "swww_transition_angle", str(self.swww_transition_angle))
|
||||
config.set(
|
||||
"Settings", "swww_transition_duration", str(self.swww_transition_duration)
|
||||
)
|
||||
config.set("Settings", "swww_transition_duration", str(self.swww_transition_duration))
|
||||
with open(self.config_file, "w") as configfile:
|
||||
config.write(configfile)
|
||||
|
||||
|
||||
def read_parameters_from_user_arguments(self, args):
|
||||
"""Read user arguments provided at the run. These values take priority over config.ini"""
|
||||
if args.backend:
|
||||
self.backend = args.backend
|
||||
if args.fill:
|
||||
self.fill_option = args.fill
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user