Packman Build Service PMBS

devede.changes Changed

devede.spec Changed

@@ -1,25 +1,35 @@
-# vim: set sw=4 ts=4 et:
+#
+# spec file for package devede
+#
+# Copyright (c) 2023 Packman Team <packman@links2linux.de>
 # Copyright (c) 2006-2010 oc2pus
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments to packman@links2linux.de
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
+#
+
 
 Name:           devede
-Summary:        Video DVD creator
-Version:        4.16.0
+Version:        4.17.0
 Release:        0
-License: GPL-3.0
+Summary:        Video DVD creator
+License:        GPL-3.0-only
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-BuildArch:      noarch
 URL:            https://gitlab.com/rastersoft/devedeng
 Source:         %{name}-%{version}.tar.xz
-Provides:       devedeng = %{version}-%{release}
-Obsoletes:      devedeng < %{version}-%{release}
 BuildRequires:  fdupes
+BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
-BuildRequires:  pkgconfig(python3)
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(python3)
 Requires:       dvdauthor
 Requires:       ffmpeg
 Requires:       mimehandler(application/x-cd-image)
@@ -29,6 +39,9 @@
 Requires:       python3-gobject-Gdk
 Requires:       vcdimager
 Requires:       vlc
+Provides:       devedeng = %{version}-%{release}
+Obsoletes:      devedeng < %{version}-%{release}
+BuildArch:      noarch
 
 %description
 DeVeDe is a program that allows you to create a video DVD from
@@ -48,7 +61,7 @@
 %install
 python3 ./setup.py install \
  --prefix="%{_prefix}" \
- --root="%{buildroot}"
+ --root=%{buildroot}
 
 rm -rf "%{buildroot}%{_datadir}/doc"
 rm -rf "%{buildroot}%{_datadir}/applications"
@@ -78,6 +91,8 @@
 %{_datadir}/applications/*
 %{_datadir}/icons/*
 %{_datadir}/pixmaps/*
+%dir %{_datadir}/metainfo/
+%{_datadir}/metainfo/devedeng.appdata.xml
 %{_mandir}/*/*
 
 %changelog

_service Changed

devede-4.16.0.tar.xz/HISTORY.md -> devede-4.17.0.tar.xz/HISTORY.md Changed

devede-4.17.0.tar.xz/data/devedeng.appdata.xml Added

devede-4.16.0.tar.xz/po/it.po -> devede-4.17.0.tar.xz/po/it.po Changed

@@ -4,14 +4,14 @@
 #
 #
 # Maurizio Daniele <hayabusa@hayabusa.it>, 2006, 2009.
-# Andrea Musuruane <musuruan@gmail.com>, 2011-2016.
+# Andrea Musuruane <musuruan@gmail.com>, 2011-2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DeVeDe 4.5.0\n"
+"Project-Id-Version: DeVeDe 4.16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-13 22:07+0200\n"
-"PO-Revision-Date: 2017-02-02 19:42+0100\n"
+"POT-Creation-Date: 2019-01-27 10:44+0100\n"
+"PO-Revision-Date: 2021-01-02 14:01+0100\n"
 "Last-Translator: Andrea Musuruane <musuruan@gmail.com>\n"
 "Language-Team: Andrea Musuruane <musuruan@gmail.com>\n"
 "Language: it_IT\n"
@@ -19,67 +19,67 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.4.2\n"
 
-#: ../src/devedeng/add_files.py:44
+#: ../src/devedeng/add_files.py:45
 msgid "Video files"
 msgstr "File video"
 
-#: ../src/devedeng/add_files.py:49 ../src/devedeng/ask_subtitles.py:92
-#: ../src/devedeng/dvd_menu.py:146 ../src/devedeng/dvd_menu.py:158
-#: ../src/devedeng/opensave.py:48
+#: ../src/devedeng/add_files.py:50 ../src/devedeng/ask_subtitles.py:93
+#: ../src/devedeng/dvd_menu.py:147 ../src/devedeng/dvd_menu.py:159
+#: ../src/devedeng/opensave.py:49
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/devedeng/ask_subtitles.py:81
+#: ../src/devedeng/ask_subtitles.py:82
 msgid "Subtitle files"
 msgstr "File sottotitoli"
 
-#: ../src/devedeng/avconv.py:114 ../src/devedeng/ffmpeg.py:114
+#: ../src/devedeng/avconv.py:115 ../src/devedeng/ffmpeg.py:115
 #, python-format
 msgid "Converting %(X)s (pass 2)"
 msgstr "Conversione di %(X)s in corso (passaggio 2)"
 
-#: ../src/devedeng/avconv.py:117 ../src/devedeng/ffmpeg.py:117
+#: ../src/devedeng/avconv.py:118 ../src/devedeng/ffmpeg.py:118
 #, python-format
 msgid "Converting %(X)s (pass 1)"
 msgstr "Conversione di %(X)s in corso (passaggio 1)"
 
-#: ../src/devedeng/avconv.py:127
+#: ../src/devedeng/avconv.py:128
 #, python-format
 msgid "Converting %(X)s"
 msgstr "Conversione di %(X)s in corso"
 
-#: ../src/devedeng/avconv.py:507
+#: ../src/devedeng/avconv.py:508
 #, python-format
 msgid "Creating menu %(X)d"
 msgstr "Creazione del menu %(X)d in corso"
 
-#: ../src/devedeng/choose_disc_type.py:156
-#: ../src/devedeng/choose_disc_type.py:167
-#: ../src/devedeng/choose_disc_type.py:183
-#: ../src/devedeng/choose_disc_type.py:194
-#: ../src/devedeng/choose_disc_type.py:205
-#: ../src/devedeng/choose_disc_type.py:215
-#: ../src/devedeng/choose_disc_type.py:221
-#: ../src/devedeng/choose_disc_type.py:227
+#: ../src/devedeng/choose_disc_type.py:157
+#: ../src/devedeng/choose_disc_type.py:168
+#: ../src/devedeng/choose_disc_type.py:184
+#: ../src/devedeng/choose_disc_type.py:195
+#: ../src/devedeng/choose_disc_type.py:206
+#: ../src/devedeng/choose_disc_type.py:216
+#: ../src/devedeng/choose_disc_type.py:222
+#: ../src/devedeng/choose_disc_type.py:228
 #, python-format
 msgid "\t%(program_name)s (not installed)\n"
 msgstr "\t%(program_name)s (non installato)\n"
 
-#: ../src/devedeng/choose_disc_type.py:159
-#: ../src/devedeng/choose_disc_type.py:170
-#: ../src/devedeng/choose_disc_type.py:186
-#: ../src/devedeng/choose_disc_type.py:197
-#: ../src/devedeng/choose_disc_type.py:208
-#: ../src/devedeng/choose_disc_type.py:218
-#: ../src/devedeng/choose_disc_type.py:224
-#: ../src/devedeng/choose_disc_type.py:230
+#: ../src/devedeng/choose_disc_type.py:160
+#: ../src/devedeng/choose_disc_type.py:171
+#: ../src/devedeng/choose_disc_type.py:187
+#: ../src/devedeng/choose_disc_type.py:198
+#: ../src/devedeng/choose_disc_type.py:209
+#: ../src/devedeng/choose_disc_type.py:219
+#: ../src/devedeng/choose_disc_type.py:225
+#: ../src/devedeng/choose_disc_type.py:231
 #, python-format
 msgid "\t%(program_name)s (installed)\n"
 msgstr "\t%(program_name)s (installato)\n"
 
-#: ../src/devedeng/choose_disc_type.py:161
+#: ../src/devedeng/choose_disc_type.py:162
 #, python-format
 msgid ""
 "Movie identifiers (install at least one of these):\n"
@@ -90,7 +90,7 @@
 "\n"
 "%(program_list)s\n"
 
-#: ../src/devedeng/choose_disc_type.py:172
+#: ../src/devedeng/choose_disc_type.py:173
 #, python-format
 msgid ""
 "Movie players (install at least one of these):\n"
@@ -101,7 +101,7 @@
 "\n"
 "%(program_list)s\n"
 
-#: ../src/devedeng/choose_disc_type.py:188
+#: ../src/devedeng/choose_disc_type.py:189
 #, python-format
 msgid ""
 "Movie Converters (install at least one of these):\n"
@@ -112,7 +112,7 @@
 "\n"
 "%(program_list)s\n"
 
-#: ../src/devedeng/choose_disc_type.py:200
+#: ../src/devedeng/choose_disc_type.py:201
 #, python-format
 msgid ""
 "CD/DVD burners (install at least one of these):\n"
@@ -123,7 +123,7 @@
 "\n"
 "%(program_list)s\n"
 
-#: ../src/devedeng/choose_disc_type.py:210
+#: ../src/devedeng/choose_disc_type.py:211
 #, python-format
 msgid ""
 "ISO creators (install at least one of these):\n"
@@ -134,7 +134,7 @@
 "\n"
 "%(program_list)s\n"
 
-#: ../src/devedeng/choose_disc_type.py:233
+#: ../src/devedeng/choose_disc_type.py:234
 #, python-format
 msgid ""
 "Other programs:\n"
@@ -145,106 +145,105 @@
 "\n"
 "%(program_list)s\n"
 
-#: ../src/devedeng/dvdauthor_converter.py:48
+#: ../src/devedeng/dvdauthor_converter.py:49
 msgid "Creating DVD structure"
 msgstr "Creazione della struttura del DVD in corso"
 
-#: ../src/devedeng/dvd_menu.py:51 ../src/devedeng/dvd_menu.py:418
+#: ../src/devedeng/dvd_menu.py:52 ../src/devedeng/dvd_menu.py:419
 msgid "Play all"
 msgstr "Riproduci tutti"
 
-#: ../src/devedeng/dvd_menu.py:93
+#: ../src/devedeng/dvd_menu.py:94
 msgid "The selected file is a video, not an audio file"
 msgstr "Il file selezionato è un file video, non un file audio"
 
-#: ../src/devedeng/dvd_menu.py:93 ../src/devedeng/dvd_menu.py:96
+#: ../src/devedeng/dvd_menu.py:94 ../src/devedeng/dvd_menu.py:97
 msgid "Error"
 msgstr "Errore"
 
-#: ../src/devedeng/dvd_menu.py:96
+#: ../src/devedeng/dvd_menu.py:97
 msgid "The selected file is not an audio file"
 msgstr "Il file selezionato non è un file audio"
 
-#: ../src/devedeng/dvd_menu.py:141
+#: ../src/devedeng/dvd_menu.py:142
 msgid "Picture files"
 msgstr "File immagine"
 
-#: ../src/devedeng/dvd_menu.py:153
+#: ../src/devedeng/dvd_menu.py:154
 msgid "Sound files"
 msgstr "File audio"
 
-#: ../src/devedeng/dvd_menu.py:409
+#: ../src/devedeng/dvd_menu.py:410

devede-4.17.0.tar.xz/po/ja.po Added

@@ -0,0 +1,1403 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: DeVeDe\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-09 22:08+0200\n"
+"PO-Revision-Date: 2020-06-09 11:37+0800\n"
+"Last-Translator: JW <jw.shin1abe@gmail.com>\n"
+"Language-Team: \n"
+"Language: ja_JP\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 16bit\n"
+"X-Poedit-Language: Japanese\n"
+"X-Poedit-Country: Japan\n"
+
+#: ../src/devedeng/add_files.py:44
+msgid "Video files"
+msgstr "動画ファイル"
+
+#: ../src/devedeng/add_files.py:49 ../src/devedeng/ask_subtitles.py:92
+#: ../src/devedeng/dvd_menu.py:146 ../src/devedeng/dvd_menu.py:158
+#: ../src/devedeng/opensave.py:48
+msgid "All files"
+msgstr "全て選択"
+
+#: ../src/devedeng/ask_subtitles.py:81
+#, fuzzy
+msgid "Subtitle files"
+msgstr "字幕"
+
+#: ../src/devedeng/avconv.py:114 ../src/devedeng/ffmpeg.py:114
+#, python-format
+msgid "Converting %(X)s (pass 2)"
+msgstr "変換 %(X)s (pass 2)"
+
+#: ../src/devedeng/avconv.py:117 ../src/devedeng/ffmpeg.py:117
+#, python-format
+msgid "Converting %(X)s (pass 1)"
+msgstr "変換 %(X)s (pass 1)"
+
+#: ../src/devedeng/avconv.py:127
+#, python-format
+msgid "Converting %(X)s"
+msgstr "変換 %(X)s "
+
+#: ../src/devedeng/avconv.py:507
+#, fuzzy, python-format
+msgid "Creating menu %(X)d"
+msgstr "メニュー %(X)d 作製中"
+
+#: ../src/devedeng/choose_disc_type.py:156
+#: ../src/devedeng/choose_disc_type.py:167
+#: ../src/devedeng/choose_disc_type.py:183
+#: ../src/devedeng/choose_disc_type.py:194
+#: ../src/devedeng/choose_disc_type.py:205
+#: ../src/devedeng/choose_disc_type.py:215
+#: ../src/devedeng/choose_disc_type.py:221
+#: ../src/devedeng/choose_disc_type.py:227
+#, python-format
+msgid "\t%(program_name)s (not installed)\n"
+msgstr "\t%(program_name)s (not installed)\n"
+
+#: ../src/devedeng/choose_disc_type.py:159
+#: ../src/devedeng/choose_disc_type.py:170
+#: ../src/devedeng/choose_disc_type.py:186
+#: ../src/devedeng/choose_disc_type.py:197
+#: ../src/devedeng/choose_disc_type.py:208
+#: ../src/devedeng/choose_disc_type.py:218
+#: ../src/devedeng/choose_disc_type.py:224
+#: ../src/devedeng/choose_disc_type.py:230
+#, python-format
+msgid "\t%(program_name)s (installed)\n"
+msgstr "\t%(program_name)s (installed)\n"
+
+#: ../src/devedeng/choose_disc_type.py:161
+#, python-format
+
+#: ../data/interface/wselect_disk.ui:321
+msgid "Programs needed by Devede"
+msgstr "Devede に必要なプログラム"
+
+msgid "Programs needed by Devede NG"
+msgstr "Devede NG に必要なプログラム"
+
+msgid
+"Movie identifiers (install at least one of these):\n"
+"\n"
+"%(program_list)s\n"
+msgstr 
+"Movie identifiers (install at least one of these):\n"
+"\n"
+"%(program_list)s\n"
+
+#: ../src/devedeng/choose_disc_type.py:172
+#, python-format
+msgid
+"Movie players (install at least one of these):\n"
+"\n"
+"%(program_list)s\n"
+msgstr 
+"Movie players (install at least one of these):\n"
+"\n"
+"%(program_list)s\n"
+
+#: ../src/devedeng/choose_disc_type.py:188
+#, python-format
+msgid
+"Movie Converters (install at least one of these):\n"
+"\n"
+"%(program_list)s\n"
+msgstr 
+"Movie Converters (install at least one of these):\n"
+"\n"
+"%(program_list)s\n"
+
+#: ../src/devedeng/choose_disc_type.py:200
+#, python-format
+msgid
+"CD/DVD burners (install at least one of these):\n"
+"\n"
+"%(program_list)s\n"
+msgstr 
+"CD/DVD burners (install at least one of these):\n"
+"\n"
+"%(program_list)s\n"
+
+#: ../src/devedeng/choose_disc_type.py:210
+#, python-format
+msgid
+"ISO creators (install at least one of these):\n"
+"\n"
+"%(program_list)s\n"
+msgstr 
+"ISO creators (install at least one of these):\n"
+"\n"
+"%(program_list)s\n"
+
+#: ../src/devedeng/choose_disc_type.py:233
+#, python-format
+msgid
+"Other programs:\n"
+"\n"
+"%(program_list)s\n"
+msgstr 
+"Other programs:\n"
+"\n"
+"%(program_list)s\n"
+
+#: ../src/devedeng/dvdauthor_converter.py:48
+#, fuzzy
+msgid "Creating DVD structure"
+msgstr "DVD structure 作製中"
+
+#: ../src/devedeng/dvd_menu.py:51 ../src/devedeng/dvd_menu.py:418
+msgid "Play all"
+msgstr "全て再生"
+
+#: ../src/devedeng/dvd_menu.py:93
+msgid "The selected file is a video, not an audio file"
+msgstr "選択されたファイルは動画ファイルです、オーディオファイルではありません"
+
+#: ../src/devedeng/dvd_menu.py:93 ../src/devedeng/dvd_menu.py:96
+msgid "Error"
+msgstr "エラー"
+
+#: ../src/devedeng/dvd_menu.py:96
+#, fuzzy
+msgid "The selected file is not an audio file"
+msgstr "選択されたファイルはオーディオファイルではありません。"
+
+#: ../src/devedeng/dvd_menu.py:141
+#, fuzzy
+msgid "Picture files"
+msgstr "画像ファイル"
+
+#: ../src/devedeng/dvd_menu.py:153
+#, fuzzy
+msgid "Sound files"
+msgstr "サウンドファイル"
+
+#: ../src/devedeng/dvd_menu.py:409
+#, python-brace-format
+msgid "Page {0} of {1}"
+msgstr ""
+
+#: ../src/devedeng/dvd_menu.py:416
+msgid "Play_all"
+msgstr "全て再生"
+
+#: ../src/devedeng/file_copy.py:31
+#, fuzzy, python-format
+msgid "Copying file %(X)s"
+msgstr "%(X)s 複製中"
+
+#: ../src/devedeng/genisoimage.py:73 ../src/devedeng/mkisofs.py:73
+#, fuzzy
+msgid "Creating ISO image"
+msgstr "ISOイメージ 作製中"
+

devede-4.16.0.tar.xz/setup.py -> devede-4.17.0.tar.xz/setup.py Changed

devede-4.16.0.tar.xz/src/devedeng/avconv.py -> devede-4.17.0.tar.xz/src/devedeng/avconv.py Changed

@@ -178,6 +178,20 @@
             vflip = False
             hflip = False
 
+            if (file_project.prerotation == 90):
+                if (cmd_line != ""):
+                    cmd_line += ",fifo,"
+                cmd_line += "transpose=1"
+            elif (file_project.prerotation == -90) or (file_project.prerotation == 270):
+                if (cmd_line != ""):
+                    cmd_line += ",fifo,"
+                cmd_line += "transpose=2"
+            elif (file_project.prerotation == 180):
+                if (cmd_line != ""):
+                    cmd_line += ",fifo,"
+                vflip = not vflip
+                hflip = not hflip
+
             if (file_project.rotation == "rotation_90"):
                 if (cmd_line != ""):
                     cmd_line += ",fifo,"
@@ -187,8 +201,8 @@
                     cmd_line += ",fifo,"
                 cmd_line += "transpose=2"
             elif (file_project.rotation == "rotation_180"):
-                vflip = True
-                hflip = True
+                vflip = not vflip
+                hflip = not hflip
 
             if (file_project.mirror_vertical):
                 vflip = not vflip

devede-4.16.0.tar.xz/src/devedeng/avprobe.py -> devede-4.17.0.tar.xz/src/devedeng/avprobe.py Changed

@@ -88,7 +88,8 @@
         self.original_audiorate = 0
         self.original_audiorate_uncompressed = 0
         self.original_fps = 0
-        self.original_aspect_ratio = 0
+        self.original_aspect_ratio = None
+        self.prerotation = 0
 
         self.config.append_static_log(
             "Getting data for {:s} with avprobe".format(file_name))
@@ -109,6 +110,10 @@
                     self.original_length = -1
 
             if (element"codec_type" == "video"):
+                if "tags" in element:
+                    tags = element"tags"
+                    if "rotate" in tags:
+                        self.prerotation = int(tags"rotate")
                 self.video_streams += 1
                 self.video_list.append(element"index")
                 if (self.video_streams == 1):
@@ -120,29 +125,25 @@
                     self.original_fps = self.get_division(
                         element"avg_frame_rate")
                     if ("display_aspect_ratio" in element):
-                        self.original_aspect_ratio = self.get_division(
-                            element"display_aspect_ratio")
+                        self.original_aspect_ratio = self.get_division(element"display_aspect_ratio")
 
             elif (element"codec_type" == "audio"):
                 self.audio_streams += 1
                 self.audio_list.append(element"index")
                 if (self.audio_streams == 1):
                     if ("bit_rate" in element):
-                        self.original_audiorate = int(
-                            float(element"bit_rate")) / 1000
+                        self.original_audiorate = int(float(element"bit_rate")) / 1000
                     self.original_audiorate_uncompressed = int(
                         float(element"sample_rate"))
 
-        self.original_size = str(self.original_width) + \
-            "x" + str(self.original_height)
-        if (self.original_aspect_ratio is None) or (self.original_aspect_ratio <= 1.0):
+        self.original_size = str(self.original_width) + "x" + str(self.original_height)
+        if (self.original_aspect_ratio is None):
             if (self.original_height != 0):
-                self.original_aspect_ratio = (
-                    float(self.original_width)) / (float(self.original_height))
+                self.original_aspect_ratio = (float(self.original_width)) / (float(self.original_height))
+            else:
+                self.original_aspect_ratio = 1
 
-        if (self.original_aspect_ratio is not None):
-            self.original_aspect_ratio = (
-                float(int(self.original_aspect_ratio * 1000.0))) / 1000.0
+        self.original_aspect_ratio = (float(int(self.original_aspect_ratio * 1000.0))) / 1000.0
 
         if (len(self.video_list) == 0):
             return True  # the file is not a video file; maybe an audio-only file or another thing

devede-4.16.0.tar.xz/src/devedeng/configuration_data.py -> devede-4.17.0.tar.xz/src/devedeng/configuration_data.py Changed

devede-4.16.0.tar.xz/src/devedeng/ffmpeg.py -> devede-4.17.0.tar.xz/src/devedeng/ffmpeg.py Changed

@@ -178,6 +178,20 @@
             vflip = False
             hflip = False
 
+            if (file_project.prerotation == 90):
+                if (cmd_line != ""):
+                    cmd_line += ",fifo,"
+                cmd_line += "transpose=1"
+            elif (file_project.prerotation == -90) or (file_project.prerotation == 270):
+                if (cmd_line != ""):
+                    cmd_line += ",fifo,"
+                cmd_line += "transpose=2"
+            elif (file_project.prerotation == 180):
+                if (cmd_line != ""):
+                    cmd_line += ",fifo,"
+                vflip = not vflip
+                hflip = not hflip
+
             if (file_project.rotation == "rotation_90"):
                 if (cmd_line != ""):
                     cmd_line += ",fifo,"
@@ -187,8 +201,8 @@
                     cmd_line += ",fifo,"
                 cmd_line += "transpose=2"
             elif (file_project.rotation == "rotation_180"):
-                vflip = True
-                hflip = True
+                vflip = not vflip
+                hflip = not hflip
 
             if (file_project.mirror_vertical):
                 vflip = not vflip
@@ -207,16 +221,12 @@
             if (file_project.width_midle != file_project.original_width) or (file_project.height_midle != file_project.original_height):
                 if (cmd_line != ""):
                     cmd_line += ",fifo,"
-                x = int((file_project.width_midle -
-                         file_project.original_width) / 2)
-                y = int((file_project.height_midle -
-                         file_project.original_height) / 2)
+                x = int((file_project.width_midle - file_project.original_width) / 2)
+                y = int((file_project.height_midle - file_project.original_height) / 2)
                 if (x > 0) or (y > 0):
-                    cmd_line += "pad=" + str(file_project.width_midle) + ":" + str(
-                        file_project.height_midle) + ":" + str(x) + ":" + str(y) + ":0x000000"
+                    cmd_line += "pad=" + str(file_project.width_midle) + ":" + str(file_project.height_midle) + ":" + str(x) + ":" + str(y) + ":0x000000"
                 else:
-                    cmd_line += "crop=" + str(file_project.width_midle) + ":" + str(
-                        file_project.height_midle) + ":" + str(x) + ":" + str(y)
+                    cmd_line += "crop=" + str(file_project.width_midle) + ":" + str(file_project.height_midle) + ":" + str(x) + ":" + str(y)
 
             if (file_project.width_final != file_project.width_midle) or (file_project.height_final != file_project.height_midle):
                 if (cmd_line != ""):
@@ -493,6 +503,7 @@
                 self.command_var.append("1")
 
         self.command_var.append(output_file)
+        print(self.command_var)
 
     def _adjust_audio_bitrate(self, bitrate):
         br = 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384

devede-4.16.0.tar.xz/src/devedeng/ffprobe.py -> devede-4.17.0.tar.xz/src/devedeng/ffprobe.py Changed

@@ -87,7 +87,8 @@
         self.original_audiorate = 0
         self.original_audiorate_uncompressed = 0
         self.original_fps = 0
-        self.original_aspect_ratio = 0
+        self.original_aspect_ratio = None
+        self.prerotation = 0
 
         self.config.append_static_log(
             "Getting data for {:s} with ffprobe".format(file_name))
@@ -108,6 +109,10 @@
                     self.original_length = -1
 
             if (element"codec_type" == "video"):
+                if "tags" in element:
+                    tags = element"tags"
+                    if "rotate" in tags:
+                        self.prerotation = int(tags"rotate")
                 self.video_streams += 1
                 self.video_list.append(element"index")
                 if (self.video_streams == 1):
@@ -119,35 +124,32 @@
                     self.original_fps = self.get_division(
                         element"avg_frame_rate")
                     if ("display_aspect_ratio" in element):
-                        self.original_aspect_ratio = self.get_division(
-                            element"display_aspect_ratio")
+                        self.original_aspect_ratio = self.get_division(element"display_aspect_ratio")
 
             elif (element"codec_type" == "audio"):
                 self.audio_streams += 1
                 self.audio_list.append(element"index")
                 if (self.audio_streams == 1):
                     if ("bit_rate" in element):
-                        self.original_audiorate = int(
-                            float(element"bit_rate")) / 1000
+                        self.original_audiorate = int(float(element"bit_rate")) / 1000
                     self.original_audiorate_uncompressed = int(
                         float(element"sample_rate"))
 
-        self.original_size = str(self.original_width) + \
-            "x" + str(self.original_height)
-        if (self.original_aspect_ratio is None) or (self.original_aspect_ratio <= 1.0):
+        self.original_size = str(self.original_width) + "x" + str(self.original_height)
+        if (self.original_aspect_ratio is None):
             if (self.original_height != 0):
-                self.original_aspect_ratio = (
-                    float(self.original_width)) / (float(self.original_height))
+                self.original_aspect_ratio = (float(self.original_width)) / (float(self.original_height))
+            else:
+                self.original_aspect_ratio = 1
 
-        if (self.original_aspect_ratio is not None):
-            self.original_aspect_ratio = (
-                float(int(self.original_aspect_ratio * 1000.0))) / 1000.0
+        self.original_aspect_ratio = (float(int(self.original_aspect_ratio * 1000.0))) / 1000.0
 
         if (len(self.video_list) == 0):
             return True  # the file is not a video file; maybe an audio-only file or another thing
 
         if self.original_length == -1:  # if it was unable to detect the duration, try to use the human readable format
             command_line = "ffprobe", file_name
+            print(f"Launching {command_line}")
             (stdout, stderr) = self.launch_process(command_line, False)
             try:
                 stdout2 = stdout.decode("utf-8") + \
@@ -155,14 +157,12 @@
             except:
                 stdout2 = stdout.decode("latin1") + \
                     "\n" + stderr.decode("latin1")
-            self.config.append_static_log(
-                "Using ffprobe human readable format: " + str(stdout2))
+            self.config.append_static_log("Using ffprobe human readable format: " + str(stdout2))
             for line in stdout2.split("\n"):
                 line = line.strip()
                 if line.startswith("Duration: "):
                     self.original_length = self.get_time(line10:)
                     break
 
-        self.config.append_static_log("Estimated length: {:d}; Resolution: {:s}".format(
-            self.original_length, self.original_size))
+        self.config.append_static_log("Estimated length: {:d}; Resolution: {:s}".format(self.original_length, self.original_size))
         return False  # no error

devede-4.16.0.tar.xz/src/devedeng/file_movie.py -> devede-4.17.0.tar.xz/src/devedeng/file_movie.py Changed

@@ -93,6 +93,7 @@
         self.add_group("actions", "action_stop", "action_play_first", "action_play_previous",
                                    "action_play_again", "action_play_next", "action_play_last", "action_stop")
 
+        self.prerotation = 0
         self.add_integer_adjustment("volume", 100)
         if (self.disc_type == "dvd"):
             self.add_integer_adjustment("video_rate", 5000)
@@ -174,6 +175,7 @@
                 self.original_aspect_ratio = film_analizer.original_aspect_ratio
                 self.original_videorate = film_analizer.original_videorate
                 self.original_audiorate = film_analizer.original_audiorate
+                self.prerotation = film_analizer.prerotation
 
                 self.original_audiorate_uncompressed = film_analizer.original_audiorate_uncompressed
                 self.original_fps = film_analizer.original_fps
@@ -399,33 +401,34 @@
 
         if (self.rotation == "rotation_90") or (self.rotation == "rotation_270"):
             midle_aspect_ratio = 1.0 / self.original_aspect_ratio
+            original_width = self.original_height
+            original_height = self.original_width
         else:
+            original_width = self.original_width
+            original_height = self.original_height
             midle_aspect_ratio = self.original_aspect_ratio
 
         if midle_aspect_ratio == 0:
             midle_aspect_ratio = 1
 
         if self.scaling == "scale_picture":
-            self.width_midle = int(self.original_width)
-            self.height_midle = int(self.original_height)
+            self.width_midle = int(original_width)
+            self.height_midle = int(original_height)
         elif self.scaling == "add_black_bars":
+            print(f"Original width {original_width}x{original_height}; ratio original: {midle_aspect_ratio}; ratio nuevo: {self.aspect_ratio_final}")
             if midle_aspect_ratio > self.aspect_ratio_final:  # add horizontal black bars, at top and bottom
-                self.width_midle = int(self.original_width)
-                self.height_midle = int(
-                    self.original_height * midle_aspect_ratio / self.aspect_ratio_final)
+                self.width_midle = int(original_width)
+                self.height_midle = int(original_height * midle_aspect_ratio / self.aspect_ratio_final)
             else:  # add vertical black bars, at left and right
-                self.width_midle = int(
-                    self.original_width * self.aspect_ratio_final / midle_aspect_ratio)
-                self.height_midle = int(self.original_height)
+                self.width_midle = int(original_width * self.aspect_ratio_final / midle_aspect_ratio)
+                self.height_midle = int(original_height)
         else:  # cut picture
             if midle_aspect_ratio > self.aspect_ratio_final:
-                self.width_midle = int(
-                    self.original_width * self.aspect_ratio_final / midle_aspect_ratio)
-                self.height_midle = int(self.original_height)
+                self.width_midle = int(original_width * self.aspect_ratio_final / midle_aspect_ratio)
+                self.height_midle = int(original_height)
             else:
-                self.width_midle = int(self.original_width)
-                self.height_midle = int(
-                    self.original_height * midle_aspect_ratio / self.aspect_ratio_final)
+                self.width_midle = int(original_width)
+                self.height_midle = int(original_height * midle_aspect_ratio / self.aspect_ratio_final)
 
     def set_type(self, obj=None, disc_type=None):
         if (disc_type is not None):

devede-4.16.0.tar.xz/stdeb.cfg -> devede-4.17.0.tar.xz/stdeb.cfg Changed

Changes of Revision 19