From d909eccdf688988dcf790be1df4e31aba3f78535 Mon Sep 17 00:00:00 2001 From: Frank Dana Date: Sun, 3 Apr 2022 00:45:08 -0400 Subject: [PATCH] python/openshot.i: Convert to 4-space indents (#820) --- bindings/python/openshot.i | 282 ++++++++++++++++++------------------- 1 file changed, 141 insertions(+), 141 deletions(-) diff --git a/bindings/python/openshot.i b/bindings/python/openshot.i index c8b28373..6bff2105 100644 --- a/bindings/python/openshot.i +++ b/bindings/python/openshot.i @@ -36,7 +36,7 @@ /* Mark these classes as shared_ptr classes */ #ifdef USE_IMAGEMAGICK - %shared_ptr(Magick::Image) + %shared_ptr(Magick::Image) #endif %shared_ptr(juce::AudioBuffer) %shared_ptr(openshot::Frame) @@ -93,36 +93,36 @@ %} #ifdef USE_IMAGEMAGICK - %{ - #include "ImageReader.h" - #include "ImageWriter.h" - #include "TextReader.h" - %} + %{ + #include "ImageReader.h" + #include "ImageWriter.h" + #include "TextReader.h" + %} #endif #ifdef USE_OPENCV - %{ - #include "ClipProcessingJobs.h" - #include "effects/Stabilizer.h" - #include "effects/Tracker.h" - #include "effects/ObjectDetection.h" - #include "TrackedObjectBase.h" - #include "TrackedObjectBBox.h" - %} + %{ + #include "ClipProcessingJobs.h" + #include "effects/Stabilizer.h" + #include "effects/Tracker.h" + #include "effects/ObjectDetection.h" + #include "TrackedObjectBase.h" + #include "TrackedObjectBBox.h" + %} #endif /* Generic language independent exception handler. */ %include "exception.i" %exception { - try { - $action - } - catch (openshot::ExceptionBase &e) { - SWIG_exception_fail(SWIG_RuntimeError, e.py_message().c_str()); - } - catch (std::exception &e) { - SWIG_exception_fail(SWIG_RuntimeError, e.what()); - } + try { + $action + } + catch (openshot::ExceptionBase &e) { + SWIG_exception_fail(SWIG_RuntimeError, e.py_message().c_str()); + } + catch (std::exception &e) { + SWIG_exception_fail(SWIG_RuntimeError, e.what()); + } } @@ -142,121 +142,121 @@ /* Make openshot.Fraction more Pythonic */ %extend openshot::Fraction { %{ - #include - #include - #include + #include + #include + #include - static std::vector _keys{"num", "den"}; - static int fracError = 0; + static std::vector _keys{"num", "den"}; + static int fracError = 0; %} - double __float__() { - return $self->ToDouble(); - } - int __int__() { - return $self->ToInt(); - } - /* Dictionary-type methods */ - int __len__() { - return _keys.size(); - } - %exception __getitem__ { - $action - if (fracError == 1) { - fracError = 0; // Clear flag for reuse - PyErr_SetString(PyExc_KeyError, "Key not found"); - SWIG_fail; - } - } - const std::string __getitem__(int index) { - if (index < static_cast(_keys.size())) { - return _keys[index]; - } - /* Otherwise, raise an exception */ - fracError = 1; - return ""; - } - int __getitem__(const std::string& key) { - if (key == "num") { - return $self->num; - } else if (key == "den") { - return $self->den; - } - /* Otherwise, raise an exception */ - fracError = 1; - return 0; - } - bool __contains__(const std::string& key) { - return bool(std::find(_keys.begin(), _keys.end(), key) != _keys.end()); - } - std::map GetMap() { - std::map map1; - map1.insert({"num", $self->num}); - map1.insert({"den", $self->den}); - return map1; - } - /* Display methods */ - const std::string __str__() { - std::ostringstream result; - result << $self->num << ":" << $self->den; - return result.str(); - } - const std::string __repr__() { - std::ostringstream result; - result << "Fraction(" << $self->num << ", " << $self->den << ")"; - return result.str(); - } - /* Implement dict methods in Python */ - %pythoncode %{ - def __iter__(self): - return iter(self.GetMap()) - def keys(self): - _items = self.GetMap() - return _items.keys() - def items(self): - _items = self.GetMap() - return _items.items() - def values(self): - _items = self.GetMap() - return _items.values() - def __mul__(self, other): - if isinstance(other, Fraction): - return Fraction(self.num * other.num, self.den * other.den) - return float(self) * other - def __rmul__(self, other): - return other * float(self) - def __truediv__(self, other): - if isinstance(other, Fraction): - return Fraction(self.num * other.den, self.den * other.num) - return float(self) / other; - def __rtruediv__(self, other): - return other / float(self) - def __format__(self, format_spec): - integer_fmt = "bcdoxX" - float_fmt = "eEfFgGn%" - all_fmt = "".join(["s", integer_fmt, float_fmt]) - if not format_spec or format_spec[-1] not in all_fmt: - value = str(self) - elif format_spec[-1] in integer_fmt: - value = int(self) - elif format_spec[-1] in float_fmt: - value = float(self) - else: - value = str(self) - return "{value:{spec}}".format(value=value, spec=format_spec) - %} + double __float__() { + return $self->ToDouble(); + } + int __int__() { + return $self->ToInt(); + } + /* Dictionary-type methods */ + int __len__() { + return _keys.size(); + } + %exception __getitem__ { + $action + if (fracError == 1) { + fracError = 0; // Clear flag for reuse + PyErr_SetString(PyExc_KeyError, "Key not found"); + SWIG_fail; + } + } + const std::string __getitem__(int index) { + if (index < static_cast(_keys.size())) { + return _keys[index]; + } + /* Otherwise, raise an exception */ + fracError = 1; + return ""; + } + int __getitem__(const std::string& key) { + if (key == "num") { + return $self->num; + } else if (key == "den") { + return $self->den; + } + /* Otherwise, raise an exception */ + fracError = 1; + return 0; + } + bool __contains__(const std::string& key) { + return bool(std::find(_keys.begin(), _keys.end(), key) != _keys.end()); + } + std::map GetMap() { + std::map map1; + map1.insert({"num", $self->num}); + map1.insert({"den", $self->den}); + return map1; + } + /* Display methods */ + const std::string __str__() { + std::ostringstream result; + result << $self->num << ":" << $self->den; + return result.str(); + } + const std::string __repr__() { + std::ostringstream result; + result << "Fraction(" << $self->num << ", " << $self->den << ")"; + return result.str(); + } + /* Implement dict methods in Python */ + %pythoncode %{ + def __iter__(self): + return iter(self.GetMap()) + def keys(self): + _items = self.GetMap() + return _items.keys() + def items(self): + _items = self.GetMap() + return _items.items() + def values(self): + _items = self.GetMap() + return _items.values() + def __mul__(self, other): + if isinstance(other, Fraction): + return Fraction(self.num * other.num, self.den * other.den) + return float(self) * other + def __rmul__(self, other): + return other * float(self) + def __truediv__(self, other): + if isinstance(other, Fraction): + return Fraction(self.num * other.den, self.den * other.num) + return float(self) / other; + def __rtruediv__(self, other): + return other / float(self) + def __format__(self, format_spec): + integer_fmt = "bcdoxX" + float_fmt = "eEfFgGn%" + all_fmt = "".join(["s", integer_fmt, float_fmt]) + if not format_spec or format_spec[-1] not in all_fmt: + value = str(self) + elif format_spec[-1] in integer_fmt: + value = int(self) + elif format_spec[-1] in float_fmt: + value = float(self) + else: + value = str(self) + return "{value:{spec}}".format(value=value, spec=format_spec) + %} } %extend openshot::OpenShotVersion { // Give the struct a string representation - const std::string __str__() { - return std::string(OPENSHOT_VERSION_FULL); - } - // And a repr for interactive use - const std::string __repr__() { - std::ostringstream result; - result << "OpenShotVersion('" << OPENSHOT_VERSION_FULL << "')"; - return result.str(); - } + const std::string __str__() { + return std::string(OPENSHOT_VERSION_FULL); + } + // And a repr for interactive use + const std::string __repr__() { + std::ostringstream result; + result << "OpenShotVersion('" << OPENSHOT_VERSION_FULL << "')"; + return result.str(); + } } %include "OpenShotVersion.h" @@ -299,15 +299,15 @@ %include "ZmqLogger.h" #ifdef USE_OPENCV - %include "ClipProcessingJobs.h" - %include "TrackedObjectBase.h" - %include "TrackedObjectBBox.h" + %include "ClipProcessingJobs.h" + %include "TrackedObjectBase.h" + %include "TrackedObjectBBox.h" #endif #ifdef USE_IMAGEMAGICK - %include "ImageReader.h" - %include "ImageWriter.h" - %include "TextReader.h" + %include "ImageReader.h" + %include "ImageWriter.h" + %include "TextReader.h" #endif /* Effects */ @@ -327,7 +327,7 @@ %include "effects/Shift.h" %include "effects/Wave.h" #ifdef USE_OPENCV - %include "effects/Stabilizer.h" - %include "effects/Tracker.h" - %include "effects/ObjectDetection.h" + %include "effects/Stabilizer.h" + %include "effects/Tracker.h" + %include "effects/ObjectDetection.h" #endif