|
[-]
[+]
|
Changed |
_service:tar_git:harbour-clipper.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/poetaster/harbour-clipper.git</param>
<param name="branch">main</param>
- <param name="revision">0.4.2 </param>
+ <param name="revision">0.4.3</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-clipper-0.4.3.tar.bz2/README.md
^
|
| @@ -20,11 +20,9 @@
## Authors
-2020 - Tobias Planitzer <tobias.planitzer@protonmail.com>
+(c) 2020 - Tobias Planitzer <tobias.planitzer@protonmail.com>
Tobias wrote Videoworks and poetaster is developing and maintaining it in future.
-2021 - Mark Washeim <blueprint@poetaster.de>
-
-
+(c) 2021-202 - Mark Washeim <blueprint@poetaster.de>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-clipper-0.4.3.tar.bz2/harbour-clipper.desktop
^
|
| @@ -3,6 +3,7 @@
X-Nemo-Application-Type=silica-qt5
Icon=harbour-clipper
Exec=harbour-clipper %u
+
Name=Videoworks
# translation example:
# your app name in German locale (de)
@@ -13,7 +14,6 @@
#Name[de_DE]=harbour-clipper.desktop
[X-Sailjail]
-Sandboxing=Disabled
-#OrganizationName=de.poetaster
-#ApplicationName=harbour-clipper
-#Permissions=Camera;Audio;Microphone;MediaIndexing;RemovableMedia;UserDirs;Compatibility
+OrganizationName=de.poetaster
+ApplicationName=harbour-clipper
+Permissions=Compatibility;Camera;Audio;Microphone;MediaIndexing;RemovableMedia;UserDirs
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-clipper-0.4.3.tar.bz2/qml/pages/FirstPage.qml
^
|
| @@ -19,7 +19,7 @@
}
// file and folder variables
- property bool debug: false
+ property bool debug: true
property string origMediaFilePath
property string origMediaFileName : "none"
property string origMediaFolderPath
@@ -1440,11 +1440,14 @@
}
onError: {
// when an exception is raised, this error handler will be called
- console.log('python error: ' + traceback);
+ if (debug) {
+ console.log('python error: ' + traceback);
+ banner.notify( qsTr("Pthon Error") + "\n" + " " + traceback + " ", Theme.highlightDimmerColor, 100000 )
+ }
}
onReceived: {
// asychronous messages from Python arrive here via pyotherside.send()
- console.log('got message from python: ' + data);
+ if (debug) console.log('got message from python: ' + data);
}
} // end python
@@ -2660,6 +2663,7 @@
if ( idComboBoxAudioFilters.currentIndex === 3 ) { py.audioEffectsFilters( "lowpass" ) }
}
}
+
if ( idButtonCollage.down ) {
if (idButtonCollageSlideshow.down && slideshowModel.count > 0 ) {
py.createSlideshowFunction()
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-clipper-0.4.3.tar.bz2/qml/pages/SavePage.qml
^
|
| @@ -5,7 +5,7 @@
Page {
id: page
allowedOrientations: Orientation.All
-
+ property bool debug: false
// values transmitted from FirstPage.qml
property string homeDirectory
property string origMediaFilePath
@@ -206,7 +206,7 @@
font.pixelSize: Theme.fontSizeExtraSmall
}
MenuItem {
- text: ".flv"
+ text: ".gif"
font.pixelSize: Theme.fontSizeExtraSmall
}
MenuItem {
@@ -342,6 +342,11 @@
font.pixelSize: Theme.fontSizeExtraSmall
}
MenuItem {
+ enabled: idComboBoxFileExtension.currentIndex !== 0
+ text: "gif"
+ font.pixelSize: Theme.fontSizeExtraSmall
+ }
+ MenuItem {
enabled: idComboBoxFileExtension.currentIndex !== 0
text: "ffv1"
font.pixelSize: Theme.fontSizeExtraSmall
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-clipper-0.4.3.tar.bz2/qml/py/videox.py
^
|
| @@ -17,11 +17,6 @@
currentFunctionErrorName = ""
success = "false"
-
-
-
-
-
# Functions for file operations
# #######################################################################################
@@ -38,8 +33,8 @@
pyotherside.send('folderExistence', )
def deleteAllTMPFunction ( tempMediaFolderPath ):
- #subprocess.run([ "killall", "-r", "ffmpeg" ])
- subprocess.run([ "pkill", "-f", "ffmpeg" ])
+ # pkill not allowed
+ #subprocess.run([ "pkill", "-f", "ffmpeg" ])
for i in os.listdir( "/"+tempMediaFolderPath ) :
if (i.find(".tmp") != -1):
os.remove ( "/"+tempMediaFolderPath+i )
@@ -1108,25 +1103,12 @@
pyotherside.send('subtitleFileParsed', subtitleText)
-
-
-
-
-
-
-
# other useful commands
#pyotherside.send('debugPythonLogs', i)
#subprocess.Popen([ "parec", "-d", inputDevice, "--file-format=wav", "/"+recordAudioPath ], shell = False )
#subprocess.run([ "killall", "-r", "parec" ])
-
-
-
-
-
-
# PARSE FFMPEG OUTPUT FUNCTIONS
# ##############################################################################################################################################################################
DUR_REGEX = re.compile( r"Duration: (?P<hour>\d{2}):(?P<min>\d{2}):(?P<sec>\d{2})\.(?P<ms>\d{2})" )
@@ -1174,8 +1156,10 @@
yield int(elapsed_time / total_dur * 100)
if p.returncode != 0:
success = "false"
- #subprocess.run([ "killall", "-r", "ffmpeg" ])
- subprocess.run([ "pkill", "-f", "ffmpeg" ])
+
+ # pkill not allowed
+ #subprocess.run([ "pkill", "-f", "ffmpeg" ])
+
if "imageLUT3DFunction" in currentFunctionErrorName:
pyotherside.send('errorOccured', "PNG not compatible.\nConversion failed." )
elif "overlayOldMovieFunction" in currentFunctionErrorName:
@@ -1186,8 +1170,8 @@
pyotherside.send('errorOccured', "An error occured with this function.\n" + currentFunctionErrorName + "\nKindly report this bug on email." )
else:
success = "true"
- #subprocess.run([ "killall", "-r", "ffmpeg" ])
- subprocess.run([ "pkill", "-f", "ffmpeg" ])
+ # not allowed
+ #subprocess.run([ "pkill", "-f", "ffmpeg" ])
yield 100
|
