]> git.corax.cc Git - toolbox/commitdiff
include: Remove acpi/*, clip, gitlab, iruca, net/*, xrandr modules
authorMatthias Kruk <m@m10k.eu>
Sun, 27 Jun 2021 08:05:57 +0000 (17:05 +0900)
committerMatthias Kruk <m@m10k.eu>
Sun, 27 Jun 2021 08:05:57 +0000 (17:05 +0900)
To avoid dependencies on packages such as X11 in the toolbox core
package, several packages need to be moved into separate repositories.
This commit removes the following modules from this repository:
 - acpi/ac      => toolbox-linux
 - acpi/battery => toolbox->linux
 - clip         => toolbox-x11
 - gitlab       => toolbox-restapis
 - iruca        => toolbox-restapis
 - net/iface    => toolbox-linux
 - xrandr       => toolbox-x11

include/acpi/ac.sh [deleted file]
include/acpi/battery.sh [deleted file]
include/clip.sh [deleted file]
include/gitlab.sh [deleted file]
include/iruca.sh [deleted file]
include/net/iface.sh [deleted file]
include/xrandr.sh [deleted file]

diff --git a/include/acpi/ac.sh b/include/acpi/ac.sh
deleted file mode 100644 (file)
index c1da36e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-__init() {
-       declare -xgr __acpi_ac_path="/sys/class/power_supply"
-
-       return 0
-}
-
-acpi_ac_get_state() {
-       local psu
-
-       psu="$1"
-
-       if ! cat "$__acpi_ac_path/$psu/online" 2>/dev/null; then
-               return 1
-       fi
-
-       return 0
-}
diff --git a/include/acpi/battery.sh b/include/acpi/battery.sh
deleted file mode 100644 (file)
index 4a39e0c..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-__init() {
-       declare -xgr __acpi_battery_path="/sys/class/power_supply"
-
-       return 0
-}
-
-acpi_battery_get_charge_full() {
-       local battery
-
-       battery="$1"
-
-       if cat "$__acpi_battery_path/$battery/charge_full" 2>/dev/null; then
-               return 0
-       fi
-
-       if cat "$__acpi_battery_path/$battery/energy_full" 2>/dev/null; then
-               return 0
-       fi
-
-       return 1
-}
-
-acpi_battery_get_charge_now() {
-       local battery
-
-       battery="$1"
-
-       if cat "$__acpi_battery_path/$battery/charge_now" 2>/dev/null; then
-               return 0
-       fi
-
-       if cat "$__acpi_battery_path/$battery/energy_now" 2>/dev/null; then
-               return 0
-       fi
-
-       return 1
-}
-
-acpi_battery_get_level() {
-       local battery
-
-        local full
-       local now
-       local lvl
-
-       battery="$1"
-
-       if ! full=$(acpi_battery_get_charge_full "$battery"); then
-               return 1
-       fi
-
-       if ! now=$(acpi_battery_get_charge_now "$battery"); then
-               return 1
-       fi
-
-       if (( full == 0 )); then
-               return 1
-       fi
-
-       lvl=$((now * 100 / full))
-       echo "$lvl"
-
-       return 0
-}
diff --git a/include/clip.sh b/include/clip.sh
deleted file mode 100644 (file)
index 38322b1..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-
-# clip.sh - Toolbox module for X11 clipboard manipulation
-# Copyright (C) 2021 Matthias Kruk
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-__init() {
-       return 0
-}
-
-clip_get() {
-       local sel="$1"
-
-       if ! xclip -selection "$sel" -o 2>/dev/null; then
-               return 1
-       fi
-
-       return 0
-}
-
-clip_get_any() {
-       if clip_get "primary"; then
-               return 0
-       fi
-
-       if clip_get "clipboard"; then
-               return 0
-       fi
-
-       if clip_get "secondary"; then
-               return 0
-       fi
-
-       return 1
-}
-
-clip_set() {
-       local sel="$1"
-       local data="$2"
-
-       if (( $# < 2 )); then
-               data=$(</dev/stdin)
-       fi
-
-       if ! printf "$data" | xclip -selection "$sel" 2>/dev/null; then
-               return 1
-       fi
-
-       return 0
-}
-
-clip_swap() {
-       local left="$1"
-       local right="$2"
-
-       local left_data
-
-        left_data=$(clip_get "$left")
-       clip_get "$right" | clip_set "$left"
-       clip_set "$right" <<< "$left_data"
-
-       return 0
-}
diff --git a/include/gitlab.sh b/include/gitlab.sh
deleted file mode 100755 (executable)
index 13f09cb..0000000
+++ /dev/null
@@ -1,579 +0,0 @@
-#!/bin/bash
-
-# gitlab.sh - Toolbox module for GitLab API v4
-# Copyright (C) 2021 Matthias Kruk
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-__init() {
-       if ! include "log" "json"; then
-               return 1
-       fi
-
-       return 0
-}
-
-_gitlab_urlencode() {
-        local str="$1"
-
-        echo "${str//\//%2F}"
-}
-
-_gitlab_get() {
-        local token="$1"
-        local url="$2"
-
-        if ! curl --silent --location -X GET \
-            --header "Private-Token: $token" "$url"; then
-                return 1
-        fi
-
-        return 0
-}
-
-_gitlab_post() {
-        local token="$1"
-        local url="$2"
-        local data="$3"
-
-        if ! curl --silent --location -X POST \
-             --header "Private-Token: $token" \
-             --header "Content-Type: application/json" \
-             --data "$data" "$url"; then
-                return 1
-        fi
-
-        return 0
-}
-
-_gitlab_put() {
-       local token="$1"
-       local url="$2"
-
-       if ! curl --silent --location -X PUT \
-                 --header "Private-Token: $token" "$url"; then
-               return 1
-       fi
-
-       return 0
-}
-
-gitlab_import_status() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-
-        local url
-        local res
-
-        id=$(_gitlab_urlencode "$project")
-        url="$host/api/v4/projects/$id"
-
-        if ! res=$(_gitlab_get "$token" "$url"); then
-                return 1
-        fi
-
-        echo "$res" | jq -r ".import_status"
-        return 0
-}
-
-gitlab_download_file() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-       local branch="$4"
-       local file="$5"
-
-       local url
-
-       project=$(_gitlab_urlencode "$project")
-       file=$(_gitlab_urlencode "$file")
-       url="$host/api/v4/projects/$project/repository/files/$file/raw?ref=$branch"
-
-       if ! _gitlab_get "$token" "$url"; then
-               return 1
-       fi
-
-       return 0
-}
-
-gitlab_get_users() {
-       local host="$1"
-       local token="$2"
-
-       local url
-
-       url="$host/api/v4/users?per_page=512"
-
-       if ! _gitlab_get "$token" "$url"; then
-               return 1
-       fi
-
-       return 0
-}
-
-gitlab_user_list() {
-       local host="$1"
-       local token="$2"
-
-       local resp
-
-       if ! resp=$(gitlab_get_users "$host" "$token"); then
-               return 1
-       fi
-
-       echo "$resp" | jq -r ".[] | \"\(.id) \(.username) \(.name)\""
-       return 0
-}
-
-gitlab_get_current_user() {
-       local host="$1"
-       local token="$2"
-
-       local url
-
-       url="$host/api/v4/user"
-
-       if ! _gitlab_get "$token" "$url"; then
-               return 1
-       fi
-
-       return 0
-}
-
-gitlab_get_user_id() {
-       local host="$1"
-       local token="$2"
-       local user="$3"
-
-       local resp
-       local uid
-       local username
-       local fullname
-
-       if ! resp=$(gitlab_user_list "$host" "$token"); then
-               return 1
-       fi
-
-       while read -r uid username fullname; do
-               if [[ "$username" == "$user" ]]; then
-                       echo "$uid"
-                       return 0
-               fi
-       done <<< "$resp"
-
-       return 1
-}
-
-gitlab_fork() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-       local namespace="$4"
-
-       local url
-       local id
-       local data
-
-       id=$(_gitlab_urlencode "$project")
-       url="$host/api/v4/projects/$id/fork"
-
-       # json_object() will silently drop the namespace if "$namespace" is empty
-       data=$(json_object "id" "$id" \
-                          "namespace" "$namespace")
-
-       if ! _gitlab_post "$token" "$url" "$data"; then
-               return 1
-       fi
-
-       return 0
-}
-
-gitlab_fork_sync() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-       local namespace="$4"
-
-       local resp
-       local fork_id
-
-       if ! resp=$(gitlab_fork "$host" "$token" "$project" "$namespace"); then
-               echo "Could not fork project" 1>&2
-               return 1
-       fi
-
-       if ! fork_id=$(echo "$resp" | jq ".id"); then
-               echo "Could not get id of fork" 1>&2
-               return 1
-       fi
-
-       # Gitlab's fork API call returns before the fork completes, but we want
-       # to make sure the fork is complete by the time we return to the caller
-
-       while true; do
-               local import_status
-
-               if ! import_status=$(gitlab_import_status "$host" \
-                                                         "$token" \
-                                                         "$fork_id"); then
-                       echo "Could not get import status of fork" 1>&2
-                       return 1
-               fi
-
-               if [[ "$import_status" == "none" ]] ||
-                          [[ "$import_status" == "finished" ]]; then
-                       break
-               fi
-
-               sleep 5
-       done
-
-       return 0
-}
-
-gitlab_create_branch() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-       local branch="$4"
-       local ref="$5"
-
-       local id
-       local url
-
-       id=$(_gitlab_urlencode "$project")
-       data=$(json_make "id" "$id" "branch" "$branch" "ref" "$ref")
-       url="$host/api/v4/projects/$id/repository/branches"
-
-       if ! _gitlab_post "$token" "$url" "$data"; then
-               return 1
-       fi
-
-       return 0
-}
-
-gitlab_project_get_branches() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-
-       local url
-       local resp
-
-       project=$(_gitlab_urlencode "$project")
-       url="$host/api/v4/projects/$project/repository/branches"
-
-       if ! resp=$(_gitlab_get "$token" "$url"); then
-               return 1
-       fi
-
-       if ! echo "$resp" | jq -r ".[].name"; then
-               return 1
-       fi
-
-       return 0
-}
-
-gitlab_project_get_members() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-
-       local project_id
-       local url
-       local resp
-
-       if ! project_id=$(gitlab_get_project_id "$host"  \
-                                               "$token" \
-                                               "$project"); then
-               return 1
-       fi
-
-       url="$host/api/v4/projects/$project_id/members/all"
-       if ! resp=$(_gitlab_get "$token" "$url"); then
-               return 1
-       fi
-
-       echo "$resp"
-       return 0
-}
-
-gitlab_project_get_merge_requests() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-
-       local url
-       local resp
-
-       project=$(_gitlab_urlencode "$project")
-       url="$host/api/v4/projects/$project/merge_requests?state=opened"
-
-       if ! resp=$(_gitlab_get "$token" "$url"); then
-               return 1
-       fi
-
-       echo "$resp"
-       return 0
-}
-
-gitlab_project_mergerequest_get_votes() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-       local mergerequest="$4"
-
-       local project_id
-       local url
-       local resp
-
-       if ! project_id=$(gitlab_get_project_id "$host" "$token" "$project"); then
-               return 1
-       fi
-
-       url="$host/api/v4/projects/$project_id/merge_requests/$mergerequest/award_emoji"
-       if ! resp=$(_gitlab_get "$token" "$url"); then
-               return 1
-       fi
-
-       echo "$resp"
-       return 0
-}
-
-gitlab_project_mergerequest_comment() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-       local mergerequest="$4"
-       local comment="$5"
-
-       local project_id
-       local url
-       local data
-
-       if ! project_id=$(gitlab_get_project_id "$host" "$token" "$project"); then
-               return 1
-       fi
-
-       url="$host/api/v4/projects/$project_id/merge_requests/$mergerequest/notes"
-       data=$(json_object "body" "$comment")
-
-       if ! resp=$(_gitlab_post "$token" "$url" "$data"); then
-               return 1
-       fi
-
-       return 0
-}
-
-gitlab_list_merge_requests() {
-       local host="$1"
-       local token="$2"
-       local scope="$3"
-
-       local url
-       local resp
-
-       if [[ -z "$scope" ]]; then
-               scope="assigned_to_me"
-       fi
-
-       url="$host/api/v4/merge_requests?scope=$scope"
-
-       if ! resp=$(_gitlab_get "$token" "$url"); then
-               return 1
-       fi
-
-       echo "$resp"
-       return 0
-}
-
-gitlab_project_merge_merge_request() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-       local mergerequest="$4"
-
-       local project_id
-       local url
-       local resp
-
-       if [[ "$project" =~ ^[0-9]+$ ]]; then
-               project_id="$project"
-       elif ! project_id=$(gitlab_get_project_id "$host" "$token" "$project"); then
-               return 1
-       fi
-
-       url="$host/api/v4/projects/$project_id/merge_requests/$mergerequest/merge"
-
-       if ! resp=$(_gitlab_put "$token" "$url"); then
-               return 1
-       fi
-
-       echo "$resp"
-       return 0
-}
-
-gitlab_get_project_id() {
-       local host="$1"
-       local token="$2"
-       local project="$3"
-
-       local url
-       local resp
-
-       project=$(_gitlab_urlencode "$project")
-       url="$host/api/v4/projects/$project"
-
-       if ! resp=$(_gitlab_get "$token" "$url"); then
-               return 1
-       fi
-
-       echo "$resp" | jq ".id"
-       return 0
-}
-
-gitlab_list_projects_page() {
-       local host="$1"
-       local token="$2"
-       local perpage="$3"
-       local page="$4"
-
-       local url
-       local results
-
-       url="$host/api/v4/projects?simple=true&per_page=$perpage&page=$page"
-
-       if ! results=$(_gitlab_get "$token" "$url"); then
-               return 1
-       fi
-
-       echo "$results" | jq -r ".[] | \"\(.id) \(.path_with_namespace)\""
-
-       return 0
-}
-
-gitlab_list_projects() {
-       local host="$1"
-       local token="$2"
-
-       local page
-       local perpage
-
-       page=1
-       perpage=50
-
-       while true; do
-               local projects
-               local num
-
-               if ! projects=$(gitlab_list_projects_page "$host" \
-                                                         "$token" \
-                                                         "$perpage" \
-                                                         "$page"); then
-                       return 1
-               fi
-
-               num=$(echo "$projects" | wc -l)
-               echo "$projects"
-
-               if ((num < perpage)); then
-                       break
-               fi
-
-               ((page++))
-       done
-
-       return 0
-}
-
-#
-# gitlab_merge_request - Create a new merge request
-#
-# SYNOPSIS
-#  gitlab_merge_request "$host" "$token" "$source" "$destination"
-#                       "$title" "$assignee" "$description"
-#
-# DESCRIPTION
-#  The gitlab_merge_request function creates a new merge request from the
-#  repository:branch identified by $source to the repository:branch identified
-#  by $destination. The title, assignee, and description of the merge request
-#  will be set according to the $title, $assignee, and $description arguments,
-#  respectively.
-#
-gitlab_merge_request() {
-       local host="$1"
-       local token="$2"
-       local source="$3"
-       local destination="$4"
-       local title="$5"
-       local assignee="$6"
-       local description="$7"
-
-       local source_name
-       local destination_name
-       local source_id
-       local destination_id
-       local source_branch
-       local destination_branch
-       local assignee_id
-       local url
-
-       source_name="${source%:*}"
-       destination_name="${destination%:*}"
-       source_branch="${source##*:}"
-       destination_branch="${destination##*:}"
-
-       if ! assignee_id=$(gitlab_get_user_id "$host" \
-                                             "$token" \
-                                             "$assignee"); then
-               echo "Invalid user: $assignee" 1>&2
-               return 1
-       fi
-
-       if [ -z "$source_branch" ]; then
-               echo "Invalid source branch" 1>&2
-               return 1
-       fi
-
-       if [ -z "$destination_branch" ]; then
-               echo "Invalid destination branch" 1>&2
-               return 1
-       fi
-
-       if ! source_id=$(gitlab_get_project_id "$host" "$token" "$source_name"); then
-               echo "Could not get project id for $source_name" 1>&2
-               return 1
-       fi
-
-       if ! destination_id=$(gitlab_get_project_id "$host" "$token" "$destination_name"); then
-               echo "Could not get project id for $destination_name" 1>&2
-               return 1
-       fi
-
-       data=$(json_make "id" "$source_id" \
-                        "target_project_id" "$destination_id" \
-                        "source_branch" "$source_branch" \
-                        "target_branch" "$destination_branch" \
-                        "title" "$title" \
-                        "assignee_id" "$assignee_id" \
-                        "description" "$description")
-       url="$host/api/v4/projects/$source_id/merge_requests"
-
-       if ! _gitlab_post "$token" "$url" "$data"; then
-               return 1
-       fi
-
-       return 0
-}
diff --git a/include/iruca.sh b/include/iruca.sh
deleted file mode 100644 (file)
index af16734..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-
-# iruca.sh - Iruca module for Toolbox
-# Copyright (C) 2021 Matthias Kruk
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-__init() {
-       if ! include "array" "json"; then
-               return 1
-       fi
-
-       declare -xgr __iruca_state_present="在席"
-       declare -xgr __iruca_state_absent="退社"
-       declare -xgr __iruca_state_awayfromkeyboard="離席"
-       declare -xgr __iruca_state_outside="外出"
-       declare -xgr __iruca_state_dayoff="休暇"
-       declare -xgr __iruca_state_workfromhome="テレワーク"
-
-       declare -xgr __iruca_url="https://iruca.co/api"
-
-       return 0
-}
-
-_iruca_get() {
-       local token="$1"
-       local url="$2"
-
-       if ! curl --silent --location \
-            --header "X-Iruca-Token: $token" \
-            "$url"; then
-               return 1
-       fi
-
-       return 0
-}
-
-_iruca_put() {
-       local token="$1"
-       local url="$2"
-       local data="$3"
-
-       if ! curl --silent --location -X PUT \
-            --header "X-Iruca-Token: $token" \
-            --header "Content-Type: application/json" \
-            --data "$data" "$url"; then
-               return 1
-       fi
-
-       return 0
-}
-
-iruca_list_members() {
-       local token="$1"
-       local room="$2"
-
-       local url
-
-       url="$__iruca_url/rooms/$room/members"
-
-       if ! _iruca_get "$token" "$url"; then
-               return 1
-       fi
-
-       return 0
-}
-
-iruca_get_status() {
-       local token="$1"
-       local room="$2"
-       local member="$3"
-
-       local url
-
-       url="$__iruca_url/rooms/$room/members/$member"
-
-       if ! _iruca_get "$token" "$url"; then
-               return 1
-       fi
-
-       return 0
-}
-
-_iruca_status_is_valid() {
-       local status="$1"
-
-       local valid_states
-
-       valid_states=(
-               "$__iruca_state_present"
-               "$__iruca_state_absent"
-               "$__iruca_state_awayfromkeyboard"
-               "$__iruca_state_outside"
-               "$__iruca_state_dayoff"
-               "$__iruca_state_workfromhome"
-       )
-
-       if array_contains "$status" "${valid_states[@]}"; then
-               return 0
-       fi
-
-       return 1
-}
-
-iruca_set_status() {
-       local token="$1"
-       local room="$2"
-       local member="$3"
-       local status="$4"
-       local message="$5"
-
-       local url
-       local data
-
-       if ! _iruca_status_is_valid "$status"; then
-               return 1
-       fi
-
-       data=$(json_object "status" "$status" \
-                          "message" "$message")
-
-       url="$__iruca_url/rooms/$room/members/$member"
-
-       if ! _iruca_put "$token" "$url" "$data" > /dev/null; then
-               return 1
-       fi
-
-       return 0
-}
diff --git a/include/net/iface.sh b/include/net/iface.sh
deleted file mode 100644 (file)
index fb7f07b..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/bash
-
-__init() {
-       return 0
-}
-
-net_iface_exists() {
-       local iface
-
-       iface="$1"
-
-       if grep -F "$iface" < /proc/net/dev &> /dev/null; then
-               return 0
-       fi
-
-       return 1
-}
-
-net_iface_get_state() {
-       local iface
-       local state
-
-       iface="$1"
-
-       if ! state=$(ip link show "$iface" 2>/dev/null); then
-               return 1
-       fi
-
-       if ! state=$(echo "$state" | grep -oP 'state[ ]+\K[^ ]+'); then
-               return 1
-       fi
-
-       case "$state" in
-               "UP")
-                       echo "1"
-                       ;;
-
-               "DOWN")
-                       echo "0"
-                       ;;
-
-               *)
-                       return 1
-                       ;;
-       esac
-
-       return 0
-}
-
-net_iface_set_state() {
-       local iface
-       local state
-
-       iface="$1"
-       state="$2"
-
-       case "$state" in
-               "0")
-                       state="down"
-                       ;;
-
-               "1")
-                       state="up"
-                       ;;
-
-               *)
-                       return 1
-                       ;;
-       esac
-
-       if ! /sbin/ifconfig "$iface" "$state" &>/dev/null; then
-               return 1
-       fi
-
-       return 0
-}
-
-net_iface_get_address() {
-       local iface
-       local proto
-
-        local addr_all
-
-        iface="$1"
-        proto="$2"
-
-        if ! addr_all=$(ip address show dev "$iface"); then
-                return 1
-        fi
-
-        if ! echo "$addr_all" | grep -oP "${proto}[ \\t]+\\K[^ ]+"; then
-                return 1
-        fi
-
-        return 0
-}
-
-net_iface_get_essid() {
-        local iface
-        local addr_all
-
-        iface="$1"
-
-        if ! addr_all=$(/sbin/iwconfig 2>&1); then
-                return 1
-        fi
-
-        if ! echo "$addr_all" | grep -oP "$iface.*ESSID:\"\\K[^\"]+"; then
-                return 1
-        fi
-
-        return 0
-}
-
-_net_iface_parse_iwlist() {
-       local regex_ssid='Cell [0-9]+ - Address: ([0-9A-Fa-f:]+)'
-       local regex_signal='Quality=([0-9/]+)'
-       local regex_essid='ESSID:"(.*)"'
-
-        local line
-        local ssid
-        local essid
-        local strength
-
-        while read -r line; do
-                if [[ "$line" =~ $regex_ssid ]]; then
-                        #start of a new network
-                        ssid="${BASH_REMATCH[1]}"
-                        essid=""
-                        strength=""
-                elif [[ "$line" =~ $regex_signal ]]; then
-                        strength="${BASH_REMATCH[1]}"
-                elif [[ "$line" =~ $regex_essid ]]; then
-                        essid="${BASH_REMATCH[1]}"
-                fi
-
-                if [ -n "$ssid" ] && [ -n "$essid" ] && [ -n "$strength" ]; then
-                        echo "$ssid $strength $essid"
-                       ssid=""
-                fi
-        done
-}
-
-net_iface_scan() {
-       local iface
-       local raw
-
-       iface="$1"
-
-       if ! raw=$(iwlist "$iface" scan 2>&1); then
-               return 1
-       fi
-
-       echo "$raw" | _iface_parse_iwlist
-       return 0
-}
diff --git a/include/xrandr.sh b/include/xrandr.sh
deleted file mode 100644 (file)
index 42977e5..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-#/bin/bash
-
-# xrandr.sh - Toolbox module for interaction with XRandR
-# Copyright (C) 2021 Matthias Kruk
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-__init() {
-       return 0
-}
-
-xrandr_get_monitors() {
-       local conns
-
-       if ! conns=$(xrandr | grep -F " connected "); then
-               return 1
-       fi
-
-       cut -d ' ' -f 1 <<< "$conns"
-       return 0
-}
-
-_xrandr_list_all() {
-       local screen
-       local monitor
-       local line
-
-       local re_screen
-       local re_monitor
-       local re_current
-
-       re_screen='Screen ([0-9]+):'
-       re_monitor='([^ ]+) (dis)*connected'
-       re_current='[0-9]+\.[0-9]+\*'
-
-       while read -r line; do
-               local resolution
-               local freqs
-
-               if [[ "$line" =~ $re_screen ]]; then
-                       screen="${BASH_REMATCH[1]}"
-                       continue
-               fi
-
-               if [[ "$line" =~ $re_monitor ]]; then
-                       monitor="${BASH_REMATCH[1]}"
-                       continue
-               fi
-
-               if read -r resolution other <<< "$line"; then
-                       local current
-
-                       if [[ "$other" =~ $re_current ]]; then
-                               current="current"
-                       else
-                               current=""
-                       fi
-
-                       echo "$screen $monitor $resolution $current"
-               fi
-       done < <(xrandr)
-
-       return 0
-}
-
-xrandr_monitor_get_resolution() {
-       local monitor="$1"
-
-       local resolution
-
-       if ! resolution=$(_xrandr_list_all | grep -F " $monitor " |
-                                 grep -F " current"); then
-               return 1
-       fi
-
-       cut -d ' ' -f 3 <<< "$resolution"
-       return 0
-}
-
-xrandr_monitor_get_resolutions() {
-       local monitor="$1"
-       local current_only="$2"
-
-       local resolutions
-
-       if ! resolutions=$(_xrandr_list_all | grep -F " $monitor "); then
-               return 1
-       fi
-
-       cut -d ' ' -f 3 <<< "$resolutions"
-       return 0
-}