Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTROL/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: enigma2-plugin-extensions-linuxsat-panel
Version: 3.0.1
Version: 3.0.2
Description: addons panel
Section: extra
Priority: optional
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<p align="center">
<a href="https://github.com/Belfagor2005/LinuxsatPanel">
<img src="https://img.shields.io/badge/Version-3.0.0-blue.svg" alt="Version">
<img src="https://img.shields.io/badge/Version-3.0.2-blue.svg" alt="Version">
</a>

<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">
Expand Down
4 changes: 2 additions & 2 deletions installer.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

version='3.0.1'
changelog="\n--Bump plugin version to 3.0.1\n--Rework File_Commander: replace static skin with _build_skin() that computes layout from desktop size (HD/FHD/4K scaling)\n--Add getDesktopSize(), clean up imports and fileReadLines error/encoding handling\n--Add translate_utils.py: new Google Translate wrapper with caching, Arabic detection, batch support and disk-persisted translation_cache.json (moved into locale/)\n--Minor locale fixes (.pot/.po and .mo) and translation_cache.json cleanup"
version='3.0.2'
changelog="\n--Hotfix: remote scripts in Script Installer failed to run in 3.0.1 (wget/opkg entries were passed to sh as a filename)\n--Local sh scripts now listed in stable alphabetical order\n--File Commander button labels translated again\n--translate_utils can now be imported (missing package constants added)"

TMPPATH=/tmp/LinuxsatPanel-install
FILEPATH=/tmp/LinuxsatPanel-main.tar.gz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
__email__ = "ekekaz@gmail.com"
__copyright__ = 'Copyright (c) 2024 Lululla'
__license__ = "GPL-v2"
__version__ = "3.0.1"
__version__ = "3.0.2"


def check_and_install_requests():
Expand Down Expand Up @@ -75,6 +75,10 @@ def check_and_install_requests():
PluginLanguagePath = 'Extensions/LinuxsatPanel/locale'
plugin_path = dirname(sys.modules[__name__].__file__)
AgentRequest = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.3'
# used by translate_utils
DEBUG = False
HEADERS = {"User-Agent": AgentRequest}
SYSTEM_DIR = plugin_path
infourl = 'https://raw.githubusercontent.com/Belfagor2005/upload/main/fill/info.txt'
abouturl = 'https://raw.githubusercontent.com/Belfagor2005/upload/main/fill/about.txt'
xmlurl = 'https://raw.githubusercontent.com/Belfagor2005/upload/main/fill/addons_2024.xml'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
from Tools.Directories import fileExists
from errno import ENOENT
import sys
from gettext import gettext

_ = gettext
from .. import _

PY3 = sys.version_info[0] >= 3
DEFAULT_MODULE_NAME = __name__.split(".")[-1]
Expand Down Expand Up @@ -180,8 +178,7 @@ def __init__(self, session, file):
self.skin = _build_skin()
Screen.__init__(self, session)
self.file_name = file
title = "Lululla File Commander"
self.newtitle = 'Console' if title == 'vEditorScreen' else title
self.newtitle = "Lululla File Commander"
self.list = []
self["filedata"] = MenuList(self.list)
self["actions"] = ActionMap(["WizardActions", "ColorActions", "DirectionActions"], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2466,11 +2466,10 @@ def __init__(self, session, name):
# local script in folder /sh
sh_dir = plugin_path + "/sh"
if exists(sh_dir):
for filename in listdir(sh_dir):
for filename in sorted(listdir(sh_dir)):
if filename.endswith(".sh"):
base_name = filename[:-3]
title = base_name.replace('_', ' ').title()
icon = picfold + "script.png"
script_path = join(sh_dir, filename)
add_menu_item(menu_list, self.titles, self.pics, self.urls,
title, "script.png", script_path)
Expand Down Expand Up @@ -2584,10 +2583,13 @@ def okClicked(self, answer=False):
"source"]
lower_namev = self.namev.lower()
keyword_found = any(keyword in lower_namev for keyword in keywords)
if self.url.startswith("http"):
cmd = str(self.url) + " > %s 2>&1" % file_log
else:
if self.url.startswith("/"):
# local script from the sh/ folder
cmd = 'sh "{}" > {} 2>&1'.format(self.url, file_log)
else:
# remote entries are complete command lines (wget ... | sh,
# opkg ...) and must run as-is
cmd = str(self.url) + " > %s 2>&1" % file_log
if keyword_found:
self.session.open(
lsConsole,
Expand Down
Loading