fix uploader

Author: tmeiczin

gui/forms/mainwindow.ui

@@ -1291,9 +1291,6 @@
            <property name="cursorPosition">
             <number>36</number>
            </property>
-           <property name="placeholderText">
-            <string notr="true"/>
-           </property>
           </widget>
           <widget class="QLineEdit" name="mxfKeyEdit">
            <property name="enabled">
@@ -1336,9 +1333,6 @@
            <property name="cursorPosition">
             <number>32</number>
            </property>
-           <property name="placeholderText">
-            <string notr="true"/>
-           </property>
           </widget>
           <widget class="QCheckBox" name="mxfEncryptionCheckBox">
            <property name="geometry">

scripts/publish.py

@@ -6,6 +6,7 @@
 import hashlib 
 import os
 import re
+import sys
 
 
 class BinTray(object):
@@ -203,13 +204,20 @@ def upload(self):
         bintray = BinTray()
         bintray.upload(self.downloaded_files)
 
+package = None
+if len(sys.argv) > 1:
+    package = sys.argv[1]
+
 print '---------------'
 print 'OpenDCP Publish'
 print '---------------'
 p = Publish()
 
-print 'Downloading OpenDCP files from build.opensuse.org'
-p.download()
+if not package:
+    print 'Downloading OpenDCP files from build.opensuse.org'
+    p.download()
+else:
+    p.downloaded_files = [package]
 
 print '\nUploading OpenDCP files to bintray.com'
 p.upload()

upload/CMakeLists.txt

@@ -46,22 +46,13 @@ ENDIF()
 #-----------------------------------------------------------------------------
 
 #--google parameters----------------------------------------------------------
-SET(UPLOADER ${PROJECT_SOURCE_DIR}/scripts/googlecode_upload.py)
-SET(GOOGLE_PROJECT ${PROJECT_NAME})
-SET(USER [email protected])
-SET(SUMMARY "OpenDCP ${OPENDCP_VERSION} ${SYSTEM_STRING}")
+SET(UPLOADER ${PROJECT_SOURCE_DIR}/scripts/publish.py)
 SET(UPLOAD_FILE ${PROJECT_BINARY_DIR}/${PACKAGE_FILE_NAME})
-SET(CONFIG_FILE "$ENV{HOME}/.opendcp/google.txt")
-IF(EXISTS ${CONFIG_FILE})
-    FILE(READ ${CONFIG_FILE} PASSWORD)
-    STRING(REGEX REPLACE "\n" "" PASSWORD "${PASSWORD}")
-    SET(PASSWORD "--password=${PASSWORD}")    
-ENDIF()
 #-----------------------------------------------------------------------------
 
 #--upload target--------------------------------------------------------------
-MESSAGE(STATUS "${UPLOADER} -s \"${SUMMARY}\" -p \"${GOOGLE_PROJECT}\" -u \"${USER}\" ${PASSWORD} -l \"${LABELS}\" ${UPLOAD_FILE}")
+MESSAGE(STATUS "${UPLOADER} ${UPLOAD_FILE}")
 ADD_CUSTOM_TARGET(upload
-  COMMAND ${UPLOADER} -s "${SUMMARY}" -p "${GOOGLE_PROJECT}" -u "${USER}" ${PASSWORD} -l "${LABELS}" ${UPLOAD_FILE}
+  COMMAND ${UPLOADER} ${UPLOAD_FILE}
 )
 #-----------------------------------------------------------------------------