Skip to content
Open
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
10 changes: 5 additions & 5 deletions .config/template.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.jellycon"
name="JellyCon"
<addon id="plugin.video.embycon"
name="embycon"
version=""
provider-name="Jellyfin Contributors">
<requires>
Expand All @@ -14,9 +14,9 @@
<platform>all</platform>
<language>en</language>
<license>GPL-2.0-only</license>
<forum>https://github.com/jellyfin/jellycon/issues</forum>
<website>https://github.com/jellyfin/jellycon/wiki</website>
<source>https://github.com/jellyfin/jellycon</source>
<forum>https://github.com/jellyfin/embycon/issues</forum>
<website>https://github.com/jellyfin/embycon/wiki</website>
<source>https://github.com/jellyfin/embycon</source>
<summary lang="en_GB">Browse and play your Jellyfin server media library.</summary>
<description lang="en_GB">An addon to allow you to browse and playback your Jellyfin (https://jellyfin.org) Movie, TV Show and Music collections.</description>
<assets>
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build JellyCon
name: Build embycon

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
analyze:
runs-on: ubuntu-latest
if: ${{ github.repository == 'jellyfin/jellycon' }}
if: ${{ github.repository == 'jellyfin/embycon' }}
strategy:
fail-fast: false
matrix:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish JellyCon
name: Publish embycon

on:
workflow_dispatch:
Expand Down Expand Up @@ -60,5 +60,5 @@ jobs:
key: ${{ secrets.DEPLOY_KEY }}
script_stop: true
script: |
python3 /usr/local/bin/kodirepo add /srv/repository/incoming/kodi/plugin.video.jellycon+${{ matrix.py_version }}.zip --datadir /srv/repository/releases/client/kodi/${{ matrix.py_version }};
rm /srv/repository/incoming/kodi/plugin.video.jellycon+${{ matrix.py_version }}.zip;
python3 /usr/local/bin/kodirepo add /srv/repository/incoming/kodi/plugin.video.embycon+${{ matrix.py_version }}.zip --datadir /srv/repository/releases/client/kodi/${{ matrix.py_version }};
rm /srv/repository/incoming/kodi/plugin.video.embycon+${{ matrix.py_version }}.zip;
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test JellyCon
name: Test embycon

on:
push:
Expand All @@ -9,7 +9,7 @@ on:
- master

env:
PR_TRIGGERED: ${{ github.event_name == 'pull_request' && github.repository == 'jellyfin/jellycon' }}
PR_TRIGGERED: ${{ github.event_name == 'pull_request' && github.repository == 'jellyfin/embycon' }}

jobs:
test:
Expand Down
6 changes: 3 additions & 3 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ def zip_files(py_version: str, source: str, target: str, dev: bool) -> None:
"""
Create installable addon zip archive
"""
archive_name = f'plugin.video.jellycon+{py_version}.zip'
archive_name = f'plugin.video.embycon+{py_version}.zip'

with zipfile.ZipFile(f'{target}/{archive_name}', 'w') as z:
for root, dirs, files in os.walk(args.source):
for filename in filter(file_filter, files):
file_path = os.path.join(root, filename)
if dev or folder_filter(file_path):
relative_path = os.path.join('plugin.video.jellycon', os.path.relpath(file_path, source))
relative_path = os.path.join('plugin.video.embycon', os.path.relpath(file_path, source))
z.write(file_path, relative_path)


Expand All @@ -83,7 +83,7 @@ def file_filter(file_name: str) -> bool:
True if file_name is meant to be included
"""
return (
not (file_name.startswith('plugin.video.jellycon') and file_name.endswith('.zip'))
not (file_name.startswith('plugin.video.embycon') and file_name.endswith('.zip'))
and not file_name.endswith('.pyo')
and not file_name.endswith('.pyc')
and not file_name.endswith('.pyd')
Expand Down
2 changes: 1 addition & 1 deletion resources/lib/cache_images.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def run(self):
monitor.waitForAbort(5)

while not self.stop_all_activity and not monitor.abortRequested() and xbmc.getCondVisibility("System.ScreenSaverActive"):
content_hash = home_window.get_property("jellycon_widget_reload")
content_hash = home_window.get_property("embycon_widget_reload")
if (check_interval != 0 and (time.time() - last_update) > check_interval) or (latest_content_hash != content_hash):
log.debug("CacheArtwork background thread - triggered")
if monitor.waitForAbort(10):
Expand Down
2 changes: 1 addition & 1 deletion resources/lib/datamanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ def run(self):

# TODO: probably should only set this in simple check mode
current_time_stamp = str(time.time())
home_window.set_property("jellycon_widget_reload", current_time_stamp)
home_window.set_property("embycon_widget_reload", current_time_stamp)
log.debug("Setting New Widget Hash: {0}".format(current_time_stamp))

log.debug("CacheManagerThread : Sending container refresh")
Expand Down
2 changes: 1 addition & 1 deletion resources/lib/dialogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def onClick(self, control_id):
play_info["item_id"] = next_item_id
play_info["auto_resume"] = "-1"
play_info["force_transcode"] = False
send_event_notification("jellycon_play_action", play_info)
send_event_notification("embycon_play_action", play_info)
elif control_id == 3014:
self.close()

Expand Down
14 changes: 7 additions & 7 deletions resources/lib/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

@timer
def main_entry_point():
log.debug("===== JellyCon START =====")
log.debug("===== embycon START =====")

settings = xbmcaddon.Addon()
profile_count = int(settings.getSetting('profile_count'))
Expand All @@ -66,7 +66,7 @@ def main_entry_point():
pr.enable()

log.debug("Running Python: {0}".format(sys.version_info))
log.debug("Running JellyCon: {0}".format(get_version()))
log.debug("Running embycon: {0}".format(get_version()))
log.debug("Kodi BuildVersion: {0}".format(
xbmc.getInfoLabel("System.BuildVersion"))
)
Expand Down Expand Up @@ -147,8 +147,8 @@ def main_entry_point():
elif mode == "SHOW_ADDON_MENU":
display_menu(params)
else:
log.debug("JellyCon -> Mode: {0}".format(mode))
log.debug("JellyCon -> URL: {0}".format(param_url))
log.debug("embycon -> Mode: {0}".format(mode))
log.debug("embycon -> URL: {0}".format(param_url))

if mode == "GET_CONTENT":
get_content(param_url, params)
Expand All @@ -175,7 +175,7 @@ def main_entry_point():
with open(tab_file_name, 'w') as f:
f.write(s.getvalue())

log.debug("===== JellyCon FINISHED =====")
log.debug("===== embycon FINISHED =====")


def toggle_watched(params):
Expand Down Expand Up @@ -316,7 +316,7 @@ def get_params():
request_path = plugin_path.replace("plugin://{}".format(addon_id), "")
param["request_path"] = request_path

log.debug("JellyCon -> Detected parameters: {0}".format(param))
log.debug("embycon -> Detected parameters: {0}".format(param))
return param


Expand Down Expand Up @@ -939,7 +939,7 @@ def play_action(params):
play_info["media_source_id"] = media_source_id
play_info["subtitle_stream_index"] = subtitle_stream_index
play_info["audio_stream_index"] = audio_stream_index
log.info("Sending jellycon_play_action : {0}".format(play_info))
log.info("Sending embycon_play_action : {0}".format(play_info))
play_file(play_info)


Expand Down
2 changes: 1 addition & 1 deletion resources/lib/image_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def serve_image(self):

else:

image_path = translate_path("special://home/addons/plugin.video.jellycon/icon.png").decode('utf-8')
image_path = translate_path("special://home/addons/plugin.video.embycon/icon.png").decode('utf-8')
self.send_response(200)
self.send_header('Content-type', 'image/png')
modified = xbmcvfs.Stat(image_path).st_mtime()
Expand Down
2 changes: 1 addition & 1 deletion resources/lib/item_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ def add_gui_item(url, item_details, display_options, folder=True, default_sort=F
info_labels["userrating"] = item_details.critic_rating

if item_type in ('movie', 'series'):
info_labels["trailer"] = "plugin://plugin.video.jellycon?mode=playTrailer&id=" + item_details.id
info_labels["trailer"] = "plugin://plugin.video.embycon?mode=playTrailer&id=" + item_details.id

list_item.setInfo('video', info_labels)

Expand Down
4 changes: 2 additions & 2 deletions resources/lib/jellyfin.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,14 @@ def create_headers(self, force=False):
headers = {}
device_name = self.settings.getSetting('deviceName')
if len(device_name) == 0:
device_name = "JellyCon"
device_name = "embycon"
# Ensure ascii and remove invalid characters
device_name = py2_decode(device_name).replace('"', '_').replace(',', '_')
device_id = get_device_id()
version = get_version()

authorization = (
'MediaBrowser Client="Kodi JellyCon", Device="{device}", '
'MediaBrowser Client="Kodi embycon", Device="{device}", '
'DeviceId="{device_id}", Version="{version}"'
).format(
device=device_name,
Expand Down
2 changes: 1 addition & 1 deletion resources/lib/kodi_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class HomeWindow:
"""

def __init__(self):
self.id_string = 'plugin.video.jellycon-%s'
self.id_string = 'plugin.video.embycon-%s'
self.window = xbmcgui.Window(10000)

def get_property(self, key):
Expand Down
2 changes: 1 addition & 1 deletion resources/lib/loghandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from .utils import translate_path

__addon__ = xbmcaddon.Addon(id='plugin.video.jellycon')
__addon__ = xbmcaddon.Addon(id='plugin.video.embycon')
__pluginpath__ = translate_path(__addon__.getAddonInfo('path'))


Expand Down
Loading