Merge pull request #3536 from OpenShot/codacy-clean-up

Code Clean-up flagged by Codacy

Author: jonoomph

installer/build-mac-dmg.sh

@@ -59,7 +59,7 @@ echo "Verifying App Signing"
 spctl -a -vv "build/$OS_APP_NAME"
 
 echo "Building Custom DMG"
-appdmg installer/dmg-template.json build/$OS_DMG_NAME
+appdmg "installer/dmg-template.json" "build/$OS_DMG_NAME"
 
 echo "Code Sign DMG"
 codesign -s "OpenShot Studios, LLC" "build/$OS_DMG_NAME" --force

installer/launch-mac.sh

@@ -11,9 +11,9 @@ export QT_PLUGIN_PATH="$CURR_DIR"
 export QT_DEBUG_PLUGINS="1"
 export DYLD_PRINT_LIBRARIES="1"
 
-echo $CURR_DIR
-echo $DYLD_LIBRARY_PATH
-echo $QT_PLUGIN_PATH
+echo "$CURR_DIR"
+echo "$DYLD_LIBRARY_PATH"
+echo "$QT_PLUGIN_PATH"
 
 # Launch application
 exec "$CURR_DIR/openshot-qt"

installer/mangle-hw-libs.sh

@@ -3,7 +3,7 @@
 
 usage()
 {
-    progname=$(basename $0)
+    progname="$(basename "$0")"
     cat << __EOM__
 ${progname} - Replace system paths encoded into shared libraries
 
@@ -15,7 +15,7 @@ __EOM__
 }
 
 # Bail with usage information, if the directory path is unset
-[ -z $1 ] && usage && exit -1
+[ -z "$1" ] && usage && exit -1
 
 # We take one argument, the path in which to look for target libraries
 if [ -d "$1" ]; then

src/classes/app.py

@@ -102,7 +102,7 @@ def __init__(self, *args, mode=None):
             log.info("qt5 version: %s" % QT_VERSION_STR)
             log.info("pyqt5 version: %s" % PYQT_VERSION_STR)
         except Exception:
-            pass
+            log.warning("Error displaying dependency/system details", exc_info=1)
 
         # Setup application
         self.setApplicationName('openshot')
@@ -271,12 +271,12 @@ def run(self):
 @atexit.register
 def onLogTheEnd():
     """ Log when the primary Qt event loop ends """
-
     try:
         from classes.logger import log
         import time
         log.info('OpenShot\'s session ended'.center(48))
         log.info(time.asctime().center(48))
         log.info("================================================")
     except Exception:
-        pass
+        from classes.logger import log
+        log.warning('Failed to write session ended log')

src/classes/importers/edl.py

@@ -35,6 +35,7 @@
 
 from classes import info
 from classes.app import get_app
+from classes.logger import log
 from classes.image_types import is_image
 from classes.query import Clip, Track, File
 from classes.time_parts import timecodeToSeconds
@@ -95,8 +96,7 @@ def create_clip(context, track):
             # Save file
             file.save()
         except:
-            # Ignore errors for now
-            pass
+            log.warning('Error building File object for %s' % clip_path, exc_info=1)
 
     if (file.data["media_type"] == "video" or file.data["media_type"] == "image"):
         # Determine thumb path

src/classes/importers/final_cut_pro.py

@@ -35,6 +35,7 @@
 
 from classes import info
 from classes.app import get_app
+from classes.logger import log
 from classes.image_types import is_image
 from classes.query import Clip, Track, File
 from windows.views.find_file import find_missing_file
@@ -141,8 +142,7 @@ def import_xml():
                         # Save file
                         file.save()
                     except Exception:
-                        # Ignore errors for now
-                        pass
+                        log.warning('Error building File object for %s' % clip_path, exc_info=1)
 
                 if (file.data["media_type"] == "video" or file.data["media_type"] == "image"):
                     # Determine thumb path

src/classes/language.py

@@ -1,27 +1,27 @@
-""" 
+"""
  @file
  @brief This file loads the current language based on the computer's locale settings
  @author Noah Figg <[email protected]>
  @author Jonathan Thomas <[email protected]>
- 
+
  @section LICENSE
- 
+
  Copyright (c) 2008-2018 OpenShot Studios, LLC
  (http://www.openshotstudios.com). This file is part of
  OpenShot Video Editor (http://www.openshot.org), an open-source project
  dedicated to delivering high quality video editing and animation solutions
  to the world.
- 
+
  OpenShot Video Editor is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- 
+
  OpenShot Video Editor is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
  """
@@ -123,7 +123,7 @@ def init_language():
 #  returns True when a match was found.
 #  pattern - a string expected to have one pipe to be filled by locale strings
 #  path - base path for file (pattern may contain more path)
-#  
+#
 def find_language_match(prefix, path, translator, locale_name):
     """ Match all combinations of locale, language, and country """
 
@@ -145,8 +145,7 @@ def get_all_languages():
             country_name = QLocale(locale_name).nativeCountryName().title()
             all_languages.append((locale_name, native_lang_name, country_name))
         except:
-            # Ignore failed parsing of language
-            pass
+            log.warning('Failed to parse language for %s' % locale_name)
 
     # Return list
     return all_languages

src/classes/thumbnail.py

@@ -60,9 +60,12 @@ def GenerateThumbnail(file_path, thumb_path, thumbnail_frame, width, height, mas
     rotate = 0.0
     try:
         if reader.info.metadata.count("rotate"):
-            rotate = float(reader.info.metadata.find("rotate").value()[1])
+            rotate_data = reader.info.metadata.find("rotate").value()[1]
+            rotate = float(rotate_data)
+    except ValueError as ex:
+        log.warning("Could not parse rotation value {}: {}".format(rotate_data, ex))
     except Exception:
-        pass
+        log.warning("Error reading rotation metadata from {}".format(file_path), exc_info=1)
 
     # Create thumbnail folder (if needed)
     parent_path = os.path.dirname(thumb_path)

src/timeline/app.js

@@ -1,6 +1,6 @@
 /**
  * @file
- * @brief AngularJS App (initializes angular application) 
+ * @brief AngularJS App (initializes angular application)
  * @author Jonathan Thomas <[email protected]>
  * @author Cody Parker <[email protected]>
  *
@@ -28,50 +28,55 @@
 
 
 // Initialize Angular application
-var App = angular.module('openshot-timeline', ['ui.bootstrap','ngAnimate']);
+/*global App, timeline, angular*/
+var App = angular.module("openshot-timeline", ["ui.bootstrap", "ngAnimate"]);
 
 
 // Wait for document ready event
- $( document ).ready(function() {
- 
-	/// Capture window resize event, and resize scrollable divs (i.e. track container)
-	$( window ).resize(function() {
-	
-		// Determine Y offset for track container div
-		var track_offset = $("#track_controls").offset().top;
+$(document).ready(function () {
 
-		// Set the height of the scrollable divs. This resizes the tracks to fit the remaining
-		// height of the web page. As the user changes the size of the web page, this will continue
-		// to fire, and resize the child divs to fit.
-		var new_track_height = $(this).height() - track_offset;
+  var body_object = $("body");
 
-		$("#track_controls").height(new_track_height);
-		$("#scrolling_tracks").height(new_track_height);
-		$('body').scope().playhead_height = $("#track-container").height();
-		$(".playhead-line").height($('body').scope().playhead_height);
-	});
-	
-	// Check for Qt Integration
-	if(typeof timeline != 'undefined') {
-		timeline.qt_log("Qt Found!");
-		$('body').scope().EnableQt();
-		timeline.page_ready();
-		$('body').scope().SetThumbAddress(timeline.get_thumb_address());
-	} else {
-		console.log("Qt NOT Found!");
-	}
-	
-	// Manually trigger the window resize code (to verify it runs at least once)
-	$(window).trigger('resize');
-	
-	// Bind to keydown event (to detect SHIFT)
-	$( "body" ).keydown(function(event) {
-	  if (event.which==16)
-    	$('body').scope().shift_pressed = true;
-	});
-	$( "body" ).keyup(function(event) {
-	  if ($('body').scope().shift_pressed)
-	  	$('body').scope().shift_pressed = false;
-	});
-});
+  /// Capture window resize event, and resize scrollable divs (i.e. track container)
+  $(window).resize(function () {
+
+    // Determine Y offset for track container div
+    var track_controls = $("#track_controls");
+    var track_offset = track_controls.offset().top;
+
+    // Set the height of the scrollable divs. This resizes the tracks to fit the remaining
+    // height of the web page. As the user changes the size of the web page, this will continue
+    // to fire, and resize the child divs to fit.
+    var new_track_height = $(this).height() - track_offset;
+
+    track_controls.height(new_track_height);
+    $("#scrolling_tracks").height(new_track_height);
+    body_object.scope().playhead_height = $("#track-container").height();
+    $(".playhead-line").height(body_object.scope().playhead_height);
+  });
+
+  // Check for Qt Integration
+  if (typeof timeline !== "undefined") {
+    timeline.qt_log("Qt Found!");
+    body_object.scope().enableQt();
+    timeline.page_ready();
+    body_object.scope().setThumbAddress(timeline.get_thumb_address());
+  }
 
+  // Manually trigger the window resize code (to verify it runs at least once)
+  $(window).trigger("resize");
+
+  // Bind to keydown event (to detect SHIFT)
+  body_object.keydown(function (event) {
+    if (event.which === 16) {
+      body_object.scope().shift_pressed = true;
+    }
+  });
+
+  body_object.keyup(function () {
+    if (body_object.scope().shift_pressed) {
+      body_object.scope().shift_pressed = false;
+    }
+  });
+
+});

src/timeline/index.html

@@ -44,15 +44,15 @@
 		<!-- RULER (right of screen) -->
 		<div id="scrolling_ruler">
 			<!-- PLAYHEAD TOP -->
-			<div tl-playhead class="playhead playhead-top" ng-right-click="ShowPlayheadMenu(project.playhead_position)" style="left:{{(project.playhead_position * pixelsPerSecond) + playheadOffset}}px;">
+			<div tl-playhead class="playhead playhead-top" ng-right-click="showPlayheadMenu(project.playhead_position)" style="left:{{(project.playhead_position * pixelsPerSecond) + playheadOffset}}px;">
 				<div class="playhead-line-small"></div>
 			</div>
 			<!-- Ruler extends beyond tracks area at least for a width of vertical scroll bar (or more, like 50px here) -->
-			<canvas tl-ruler id="ruler" width="{{GetTimelineWidth(1024)+50}}" height="39"></canvas>
+			<canvas tl-ruler id="ruler" width="{{getTimelineWidth(1024) + 50}}" height="39"></canvas>
 
 			<!-- MARKERS --> 
 			<span class="ruler_marker" id="marker_for_{{marker.id}}">
-				<img ng-repeat="marker in project.markers" id="marker_{{marker.id}}_{{$index}}" ng-right-click="ShowMarkerMenu(marker.id)" style="position: absolute; bottom: 0px; left: {{(marker.position * pixelsPerSecond) - 6 }}px;" class="marker_icon" ng-src="media/images/markers/{{ marker.icon }}" draggable="false"/>
+				<img ng-repeat="marker in project.markers" id="marker_{{marker.id}}_{{$index}}" ng-right-click="showMarkerMenu(marker.id)" style="position: absolute; bottom: 0px; left: {{(marker.position * pixelsPerSecond) - 6 }}px;" class="marker_icon" ng-src="media/images/markers/{{ marker.icon }}" draggable="false"/>
 			</span>
 			<br class="cleared">
 
@@ -63,29 +63,29 @@
 
 		<!-- TRACKS NAMES (left of screen) -->
 		<div id="track_controls">
-			<div ng-repeat="layer in project.layers.slice().reverse()" id="track_static_{{layer.number}}" ng-right-click="ShowTrackMenu(layer.id)" class="track_name">
+			<div ng-repeat="layer in project.layers.slice().reverse()" id="track_static_{{layer.number}}" ng-right-click="showTrackMenu(layer.id)" class="track_name">
 				<div class="track_top">
-					<div tl-clip-menu class="track_menu" ng-mousedown="ShowTrackMenu(layer.id)"></div>
-					<span class="track_label">{{GetTrackName(layer.label, project.layers.length - $index)}}</span><span ng-show="layer.lock" class="track_lock"></span>
+					<div tl-clip-menu class="track_menu" ng-mousedown="showTrackMenu(layer.id)"></div>
+					<span class="track_label">{{getTrackName(layer.label, project.layers.length - $index)}}</span><span ng-show="layer.lock" class="track_lock"></span>
 				</div>
 			</div>
 			<br>
 		</div>
 		<!-- TRACKS CONTAINER (right of screen) -->
 		<div tl-scrollable-tracks id="scrolling_tracks">
-			<div id="track-container" tl-track tl-multi-selectable style="width: {{GetTimelineWidth(1024)}}px; padding-bottom: 2px;">
+			<div id="track-container" tl-track tl-multi-selectable style="width: {{getTimelineWidth(1024)}}px; padding-bottom: 2px;">
 				<!-- TRACKS -->
-				<div ng-repeat="layer in project.layers.slice().reverse()" id="track_{{layer.number}}" ng-right-click="ShowTimelineMenu($event, layer.number)"  class="{{GetTrackStyle(layer.lock)}}" style="width:{{GetTimelineWidth(1024)}}px;">
+				<div ng-repeat="layer in project.layers.slice().reverse()" id="track_{{layer.number}}" ng-right-click="showTimelineMenu($event, layer.number)"  class="{{getTrackStyle(layer.lock)}}" style="width:{{getTimelineWidth(1024)}}px;">
 				</div>
 
 				<!-- CLIPS -->
-				<div ng-hide tl-clip ng-repeat="clip in project.clips" id="clip_{{clip.id}}" ng-click="SelectClip(clip.id, true, $event)" ng-right-click="ShowClipMenu(clip.id, $event)" class="clip droppable" ng-class="getClipStyle(clip)" style="width:{{(clip.end - clip.start) * pixelsPerSecond}}px; left:{{clip.position * pixelsPerSecond}}px; top:{{getTrackTop(clip.layer)}}px;z-index:{{1000 + $index}};">
+				<div ng-hide tl-clip ng-repeat="clip in project.clips" id="clip_{{clip.id}}" ng-click="selectClip(clip.id, true, $event)" ng-right-click="showClipMenu(clip.id, $event)" class="clip droppable" ng-class="getClipStyle(clip)" style="width:{{(clip.end - clip.start) * pixelsPerSecond}}px; left:{{clip.position * pixelsPerSecond}}px; top:{{getTrackTop(clip.layer)}}px;z-index:{{1000 + $index}};">
 					<div class="clip_top">
-						<div tl-clip-menu class="clip_menu" ng-show="!enable_razor" ng-mousedown="ShowClipMenu(clip.id, $event)" tooltip-enable="!enable_razor" tooltip="{{clip.title}}" tooltip-placement="bottom" tooltip-popup-delay="400"></div>
+						<div tl-clip-menu class="clip_menu" ng-show="!enable_razor" ng-mousedown="showClipMenu(clip.id, $event)" tooltip-enable="!enable_razor" tooltip="{{clip.title}}" tooltip-placement="bottom" tooltip-popup-delay="400"></div>
 
 						<!-- CLIP EFFECTS -->
 						<div ng-show="!enable_razor" class="effect-container" id="effects_{{clip.id}}">
-							<div class="clip_effects" ng-repeat="effect in clip.effects" id="effect_{{effect.id}}" style="background-color: {{ GetEffectColor(effect.type); }};" ng-click="SelectEffect(effect.id); $event.stopPropagation();" ng-right-click="ShowEffectMenu(effect.id); $event.stopPropagation();" tooltip="{{effect.type}} ({{$index+1}}/{{clip.effects.length}})"  tooltip-placement="bottom" tooltip-popup-delay="400">
+							<div class="clip_effects" ng-repeat="effect in clip.effects" id="effect_{{effect.id}}" style="background-color: {{ getEffectColor(effect.type) }};" ng-click="selectEffect(effect.id); $event.stopPropagation();" ng-right-click="showEffectMenu(effect.id); $event.stopPropagation();" tooltip="{{effect.type}} ({{$index+1}}/{{clip.effects.length}})"  tooltip-placement="bottom" tooltip-popup-delay="400">
 								{{effect.type[0]}}
 							</div>
 						</div>
@@ -99,17 +99,17 @@
 					</div>
 					<br class="cleared">
 					<div ng-show="!clip.show_audio" class="thumb-container">
-						<img class="thumb thumb-start" ng-show="{{ GetThumbPath(clip) }}" ng-src="{{ GetThumbPath(clip) }}"/>
+						<img class="thumb thumb-start" ng-show="{{ getThumbPath(clip) }}" ng-src="{{ getThumbPath(clip) }}"/>
 					</div>
 					<div ng-show="clip.show_audio" class="audio-container">
 						<canvas tl-audio height="46px" width="{{ (clip.end - clip.start) * pixelsPerSecond}}px" class="audio"></canvas>
 					</div>
 				</div>
 
 				<!-- TRANSITIONS -->
-				<div ng-hide tl-transition ng-repeat="transition in project.effects" id="transition_{{transition.id}}" ng-click="SelectTransition(transition.id, true, $event)" ng-right-click="ShowTransitionMenu(transition.id, $event)" class="transition droppable" ng-class="getClipStyle(transition)" style="width:{{ (transition.end - transition.start) * pixelsPerSecond}}px; left:{{transition.position * pixelsPerSecond}}px; top:{{getTrackTop(transition.layer)}}px;z-index:{{5000 + $index}};">
+				<div ng-hide tl-transition ng-repeat="transition in project.effects" id="transition_{{transition.id}}" ng-click="selectTransition(transition.id, true, $event)" ng-right-click="showTransitionMenu(transition.id, $event)" class="transition droppable" ng-class="getClipStyle(transition)" style="width:{{ (transition.end - transition.start) * pixelsPerSecond}}px; left:{{transition.position * pixelsPerSecond}}px; top:{{getTrackTop(transition.layer)}}px;z-index:{{5000 + $index}};">
 					<div class="transition_top">
-						<div tl-clip-menu class="transition_menu" ng-show="!enable_razor" ng-mousedown="ShowTransitionMenu(transition.id, $event)"></div>
+						<div tl-clip-menu class="transition_menu" ng-show="!enable_razor" ng-mousedown="showTransitionMenu(transition.id, $event)"></div>
 						<!-- TRANSITION KEYFRAME POINTS -->
 						<div ng-repeat="(point, value) in getKeyframes(transition)" id="point_{{transition.id}}_{{point}}_{{$index}}" style="left: {{(((point - 1) / (project.fps.num / project.fps.den) - transition.start) * pixelsPerSecond)}}px;" class="point_region" ng-show="transition.selected "><div class="point_icon"></div></div>
 
@@ -135,7 +135,7 @@
 
 		</script>
 
-		<div ng-show="!Qt" class="gear" ng-click="ToggleDebug()">
+		<div ng-show="!Qt" class="gear" ng-click="toggleDebug()">
 			<img src="media/images/gear.png" width="40">
 		</div>