Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Softcam #3204

Merged
merged 3 commits into from
Dec 25, 2023
Merged

Softcam #3204

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
1 change: 1 addition & 0 deletions data/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,7 @@
<setup key="Softcam" title="Softcam Settings" showOpenWebif="1">
<item level="0" text="Select Softcam" description="Select a Softcam from the available list.">config.misc.softcams</item>
<item level="2" text="Show OScam/CCcam in Extension Menu" description="Allows you to show/hide OScam/CCcam in the Extension Menu screen (BLUE button).">config.softcam.showInExtensions</item>
<item level="2" text="Hide Server" description="Select 'Yes' to hide the server name and IP address of the server.">config.softcam.hideServerName</item>
</setup>
<setup key="SoftwareManager" title="Software Manager Settings" showOpenWebif="1">
<if conditional="BoxInfo.getItem('model').startswith('et')">
Expand Down
2 changes: 2 additions & 0 deletions lib/python/Components/Converter/VtiInfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ def ecmfile(self):
if y != -1:
info['caid'] = line[x + 5:y]

if info and info.get("from") and config.softcam.hideServerName.value:
info["from"] = "\u2022"
return info

def tempfile(self):
Expand Down
1 change: 1 addition & 0 deletions lib/python/Components/UsageConfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -1884,6 +1884,7 @@ def autolanguagesub(configElement):

config.softcam = ConfigSubsection()
config.softcam.showInExtensions = ConfigYesNo(default=False)
config.softcam.hideServerName = ConfigYesNo(default=False)

config.oscaminfo = ConfigSubsection()
config.oscaminfo.userdatafromconf = ConfigYesNo(default=True)
Expand Down
3 changes: 3 additions & 0 deletions lib/python/Tools/GetEcmInfo.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from os import stat
from time import time
from Components.config import config

ECM_INFO = "/tmp/ecm.info"
EMPTY_ECM_INFO = "", "0", "0", "0"
Expand Down Expand Up @@ -58,6 +59,8 @@ def pollEcmData(self):
d = line.split(":", 1)
if len(d) > 1:
info[d[0].strip()] = d[1].strip()
if info and info.get("from") and config.softcam.hideServerName.value:
info["from"] = "\u2022"
data = self.getText()
return True
else:
Expand Down