Skip to content

Commit

Permalink
Version 0.2.10
Browse files Browse the repository at this point in the history
  • Loading branch information
Paco8 committed Mar 2, 2021
1 parent f6fc028 commit bd81146
Show file tree
Hide file tree
Showing 9 changed files with 191 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ all: ttml2ssa $(PACKAGE-NAME)

ttml2ssa: Makefile src/timestampconverter.py src/ttml2ssa.py src/__main__.py
cd src && zip -9 ../app.zip *.py && cd ..
echo '#!/usr/bin/env python' | cat - app.zip > ttml2ssa
echo '#!/usr/bin/env python3' | cat - app.zip > ttml2ssa
chmod 755 ttml2ssa
rm app.zip

Expand Down
5 changes: 4 additions & 1 deletion kodi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ install: ../src/ttml2ssa.py ../src/timestampconverter.py addon.xml-k18 addon.xml
install -m 644 addon.xml-k19 $(OUTPUT_DIR)/
install -m 644 default.py $(OUTPUT_DIR)/
install -m 644 icon.png $(OUTPUT_DIR)/
install -m 644 settings.xml $(OUTPUT_DIR)/resources/
install -m 644 settings.xml-k18 $(OUTPUT_DIR)/resources/
install -m 644 settings.xml-k19 $(OUTPUT_DIR)/resources/
install -m 644 screen*.jpg $(OUTPUT_DIR)/resources/
sed -e 's/{version}/$(VERSION)/' -i $(OUTPUT_DIR)/addon.xml-k18
cp $(OUTPUT_DIR)/addon.xml-k18 $(OUTPUT_DIR)/addon.xml
cp $(OUTPUT_DIR)/resources/settings.xml-k18 $(OUTPUT_DIR)/resources/settings.xml

cd translations && make
-install -d $(OUTPUT_DIR)/resources/language/resource.language.en_gb/
Expand Down
8 changes: 5 additions & 3 deletions kodi/addon.xml-k18
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="script.module.ttml2ssa"
name="Ttml2Ssa"
name="Improved Subtitles"
version="{version}"
provider-name="Paco8">
<requires>
Expand All @@ -14,13 +14,15 @@
point="xbmc.python.module" library="resources/lib" />
<extension point="xbmc.addon.metadata">
<summary lang="en_GB">Ttml2Ssa Library.</summary>
<description lang="en_GB">Ttml2Ssa is a library that allows other addons to convert TTML/XML/DFXP/VTT/SRT subtitles to SRT and SSA/ASS formats.</description>
<description lang="en_GB">Ttml2Ssa is a library that allows other addons to convert TTML/XML/DFXP/VTT/SRT subtitles to SRT and SSA/ASS formats. It also provides a configuration window where the user can adjust the SSA/ASS style and other options.</description>
<platform>all</platform>
<license>The Unlicense</license>
<license>GPL-2.0-or-later</license>
<website>https://github.com/Paco8/ttml2ssa</website>
<source>https://github.com/Paco8/ttml2ssa</source>
<assets>
<icon>icon.png</icon>
<screenshot>resources/screen1.jpg</screenshot>
<screenshot>resources/screen2.jpg</screenshot>
</assets>
</extension>
</addon>
8 changes: 5 additions & 3 deletions kodi/addon.xml-k19
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="script.module.ttml2ssa"
name="Ttml2Ssa"
name="Improved Subtitles"
version="{version}"
provider-name="Paco8">
<requires>
Expand All @@ -14,13 +14,15 @@
point="xbmc.python.module" library="resources/lib" />
<extension point="xbmc.addon.metadata">
<summary lang="en_GB">Ttml2Ssa Library.</summary>
<description lang="en_GB">Ttml2Ssa is a library that allows other addons to convert TTML/XML/DFXP/VTT/SRT subtitles to SRT and SSA/ASS formats.</description>
<description lang="en_GB">Ttml2Ssa is a library that allows other addons to convert TTML/XML/DFXP/VTT/SRT subtitles to SRT and SSA/ASS formats. It also provides a configuration window where the user can adjust the SSA/ASS style and other options.</description>
<platform>all</platform>
<license>The Unlicense</license>
<license>GPL-2.0-or-later</license>
<website>https://github.com/Paco8/ttml2ssa</website>
<source>https://github.com/Paco8/ttml2ssa</source>
<assets>
<icon>icon.png</icon>
<screenshot>resources/screen1.jpg</screenshot>
<screenshot>resources/screen2.jpg</screenshot>
</assets>
</extension>
</addon>
Binary file added kodi/screen1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added kodi/screen2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
175 changes: 175 additions & 0 deletions kodi/settings.xml-k19
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
<?xml version="1.0" ?>
<settings version="1">
<section id="script.module.ttml2ssa">
<category id="general" label="32016" help="">
<group id="1">
<setting id="subtitle_type" type="integer" label="32200" help="">
<level>0</level>
<default>0</default>
<constraints>
<options>
<option label="32203">0</option>
<option label="32204">1</option>
<option label="32205">2</option>
</options>
</constraints>
<control type="spinner" format="string"/>
</setting>
</group>
<group id="2" label="32000">
<setting id="fontname" type="string" label="32001" help="">
<level>0</level>
<default>Arial</default>
<control type="edit" format="string">
<heading>32001</heading>
</control>
</setting>
<setting id="fontsize" type="integer" label="32002" help="">
<level>0</level>
<default>50</default>
<control type="edit" format="integer">
<heading>32002</heading>
</control>
</setting>
<setting id="primarycolor" type="string" label="32003" help="">
<level>0</level>
<default>00EEEEEE</default>
<control type="edit" format="string">
<heading>32003</heading>
</control>
</setting>
<setting id="backcolor" type="string" label="32004" help="">
<level>0</level>
<default>40000000</default>
<control type="edit" format="string">
<heading>32004</heading>
</control>
</setting>
<setting id="outlinecolor" type="string" label="32005" help="">
<level>0</level>
<default>00000000</default>
<control type="edit" format="string">
<heading>32005</heading>
</control>
</setting>
<setting id="borderstyle" type="integer" label="32006" help="">
<level>0</level>
<default>0</default>
<constraints>
<options>
<option label="32007">0</option>
<option label="32008">1</option>
</options>
</constraints>
<control type="spinner" format="string"/>
</setting>
<setting id="outline" type="integer" label="32009" help="">
<level>0</level>
<default>2</default>
<control type="edit" format="integer">
<heading>32009</heading>
</control>
</setting>
<setting id="shadow" type="integer" label="32010" help="">
<level>0</level>
<default>3</default>
<control type="edit" format="integer">
<heading>32010</heading>
</control>
</setting>
<setting id="bold" type="boolean" label="32011" help="">
<level>0</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="italic" type="boolean" label="32012" help="">
<level>0</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="marginv" type="integer" label="32013" help="">
<level>0</level>
<default>40</default>
<control type="edit" format="integer">
<heading>32013</heading>
</control>
</setting>
<setting id="marginl" type="integer" label="32014" help="">
<level>0</level>
<default>40</default>
<control type="edit" format="integer">
<heading>32014</heading>
</control>
</setting>
<setting id="marginr" type="integer" label="32015" help="">
<level>0</level>
<default>40</default>
<control type="edit" format="integer">
<heading>32015</heading>
</control>
</setting>
</group>
</category>
<category id="misc" label="32100" help="">
<group id="1">
<setting id="allow_italics" type="boolean" label="32101" help="">
<level>0</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="allow_top_pos" type="boolean" label="32102" help="">
<level>0</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="cosmetic_filter" type="boolean" label="32103" help="">
<level>0</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="fix_amazon" type="boolean" label="32108" help="">
<level>0</level>
<default>true</default>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="cosmetic_filter">true</condition>
</dependency>
</dependencies>
<control type="toggle"/>
</setting>
<setting id="language_filter" type="boolean" label="32104" help="">
<level>0</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="timestamp manipulation" type="boolean" label="32106" help="">
<level>0</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="fix_collisions" type="boolean" label="32107" help="">
<level>0</level>
<default>true</default>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="timestamp manipulation">true</condition>
</dependency>
</dependencies>
<control type="toggle"/>
</setting>
<setting id="min_sep" type="integer" label="32105" help="">
<level>0</level>
<default>200</default>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="timestamp manipulation">true</condition>
</dependency>
</dependencies>
<control type="edit" format="integer">
<heading>32105</heading>
</control>
</setting>
</group>
</category>
</section>
</settings>
2 changes: 1 addition & 1 deletion src/ttml2ssa.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

class Ttml2Ssa(object):

VERSION = '0.2.8'
VERSION = '0.2.10'

TIME_BASES = [
'media',
Expand Down

0 comments on commit bd81146

Please sign in to comment.