Merge lp:~mhall119/developer-ubuntu-com/vivid-api-docs into lp:developer-ubuntu-com

[Michael Hall]

Make the switch to auto-importing ubuntu-sdk-15.05 framework docs

[David Callé (davidc3)]

LGTM

review: Approve

=== modified file 'api_docs/importers/__init__.py'
--- api_docs/importers/__init__.py	2015-02-26 15:26:20 +0000
+++ api_docs/importers/__init__.py	2015-05-14 21:11:01 +0000
@@ -32,6 +32,22 @@
                 
         self.file_storage = get_storage_class()()
         
+    def strip_links(self, line):
+        clean_line = line
+        removal = self.LINK_REGEX.search(line)
+        while removal:
+            source = removal.group(0)
+            replace = removal.group('text')
+            if '</a>' in replace:
+                source = source[:source.index('</a>')+4]
+                replace = replace[:replace.index('</a>')]
+            if self.verbosity >= 3:
+                print "Removing link: %s" % removal.group(0)
+                print "  From: %s\n  To: %s" % (source, replace)
+            clean_line = clean_line.replace(source, replace)
+            removal = self.LINK_REGEX.search(clean_line)
+        return clean_line
+
     def clean_links(self, line, source_filename, element_fullname=None):
         try:
             # Clean Links

=== modified file 'api_docs/importers/doxygen.py'
--- api_docs/importers/doxygen.py	2015-03-27 21:00:43 +0000
+++ api_docs/importers/doxygen.py	2015-05-14 21:11:01 +0000
@@ -106,7 +106,10 @@
                 
         self.read_classes(self.read_json_file(os.path.join(self.source, 'annotated.js')))
         if not self.options.get('no_pages', False):
-            self.read_pages(self.read_json_file(os.path.join(self.source, 'navtree.js')), self.parse_namespace(None))
+            if os.path.exists(os.path.join(self.source, 'navtreedata.js')):
+                self.read_pages(self.read_json_file(os.path.join(self.source, 'navtreedata.js')), self.parse_namespace(None))
+            elif os.path.exists(os.path.join(self.source, 'navtree.js')):
+                self.read_pages(self.read_json_file(os.path.join(self.source, 'navtree.js')), self.parse_namespace(None))
         #exit(0)
             
         namespace_order_index = 0

=== modified file 'api_docs/importers/qdoc.py'
--- api_docs/importers/qdoc.py	2015-03-27 19:53:26 +0000
+++ api_docs/importers/qdoc.py	2015-05-14 21:11:01 +0000
@@ -160,7 +160,7 @@
 
         try:
             brief_start = doc_data.index('<!-- $$$'+element.name+'-brief -->\n')
-            element.description = self.parse_line(doc_data[brief_start+1][3:-35], classhref, fullname)
+            element.description = self.strip_links(doc_data[brief_start+1][3:-35])
             if len(element.description) >= 256:
                 element.description = element.description[:252]+'...'
         except ValueError:

=== modified file 'update_apidocs.sh'
--- update_apidocs.sh	2015-04-14 02:04:46 +0000
+++ update_apidocs.sh	2015-05-14 21:11:01 +0000
@@ -3,104 +3,104 @@
 mkdir -p /tmp/apidoc_sources/
 
 # Archives to download packages from
-export SERIES="utopic"
+export SERIES="vivid"
 
 #### Apps/QML
 ## QtQML & QtQuick
 ./get_package.sh qtdeclarative5-doc-html
-python manage.py import_qdoc -p -t apps -l qml -r sdk-14.10 -s "Language Types" -N QtQml -i /tmp/apidoc_sources/usr/share/qt5/doc/qtqml/qtqml.index
-python manage.py import_qdoc -p -t apps -l qml -r sdk-14.10 -s "Graphical Interface" -n QtQuick -i /tmp/apidoc_sources/usr/share/qt5/doc/qtquick/qtquick.index
+python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04 -s "Language Types" -N QtQml -i /tmp/apidoc_sources/usr/share/qt5/doc/qtqml/qtqml.index
+python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04 -s "Graphical Interface" -n QtQuick -i /tmp/apidoc_sources/usr/share/qt5/doc/qtquick/qtquick.index
 
 ## QtMultimedia & QtAudioEngine
 ./get_package.sh qtmultimedia5-doc-html
-python manage.py import_qdoc -p -t apps -l qml -r sdk-14.10 -s "Multimedia" -n QtMultimedia -i /tmp/apidoc_sources/usr/share/qt5/doc/qtmultimedia/qtmultimedia.index
+python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04 -s "Multimedia" -n QtMultimedia -i /tmp/apidoc_sources/usr/share/qt5/doc/qtmultimedia/qtmultimedia.index
 
 ## QtSensors
 ./get_package.sh qtsensors5-doc-html
-python manage.py import_qdoc -p -t apps -l qml -r sdk-14.10 -s "Device and Sensors" -n QtSensors -i /tmp/apidoc_sources/usr/share/qt5/doc/qtsensors/qtsensors.index
+python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04 -s "Device and Sensors" -n QtSensors -i /tmp/apidoc_sources/usr/share/qt5/doc/qtsensors/qtsensors.index
 
 ## QtFeedback
-SERIES=vivid ./get_package.sh qtfeedback5-doc-html
-python manage.py import_qdoc -t apps -l qml -r sdk-14.10 -s "Device and Sensors" -n QtFeedback -i /tmp/apidoc_sources/usr/share/qt5/doc/qtfeedback/qtfeedback.index
+./get_package.sh qtfeedback5-doc-html
+python manage.py import_qdoc -t apps -l qml -r sdk-15.04 -s "Device and Sensors" -n QtFeedback -i /tmp/apidoc_sources/usr/share/qt5/doc/qtfeedback/qtfeedback.index
 
 ## QtLocation
 ./get_package.sh qtlocation5-doc-html
-python manage.py import_qdoc -p -t apps -l qml -r sdk-14.10 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtlocation/qtlocation.index
+python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtlocation/qtlocation.index
 
 ## QtOrganizer
-SERIES=vivid ./get_package.sh qtpim5-doc-html
-python manage.py import_qdoc -t apps -l qml -r sdk-14.10 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtorganizer/qtorganizer.index
-python manage.py import_qdoc -t apps -l qml -r sdk-14.10 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtcontacts/qtcontacts.index
+./get_package.sh qtpim5-doc-html
+python manage.py import_qdoc -t apps -l qml -r sdk-15.04 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtorganizer/qtorganizer.index
+python manage.py import_qdoc -t apps -l qml -r sdk-15.04 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtcontacts/qtcontacts.index
 
 ## Ubuntu.Components
 ./get_package.sh ubuntu-ui-toolkit-doc
-python manage.py import_qdoc -Pp -t apps -l qml -r sdk-14.10 -s "Graphical Interface" -n Ubuntu.Components -i /tmp/apidoc_sources/usr/share/ubuntu-ui-toolkit/doc/html/ubuntuuserinterfacetoolkit.index
+python manage.py import_qdoc -Pp -t apps -l qml -r sdk-15.04 -s "Graphical Interface" -n Ubuntu.Components -i /tmp/apidoc_sources/usr/share/ubuntu-ui-toolkit/doc/html/ubuntuuserinterfacetoolkit.index
 
 ## Ubuntu.OnlineAccounts
 ./get_package.sh accounts-qml-module-doc
-python manage.py import_qdoc -Pp -t apps -l qml -r sdk-14.10 -s "Platform Services" -N Ubuntu.OnlineAccounts -i /tmp/apidoc_sources/usr/share/accounts-qml-module/doc/html/onlineaccounts-qml-api.index
+python manage.py import_qdoc -Pp -t apps -l qml -r sdk-15.04 -s "Platform Services" -N Ubuntu.OnlineAccounts -i /tmp/apidoc_sources/usr/share/accounts-qml-module/doc/html/onlineaccounts-qml-api.index
 
 ## Ubuntu.Content
 ./get_package.sh libcontent-hub-doc
 gunzip -f /tmp/apidoc_sources/usr/share/doc/content-hub/qml/html/ubuntu-content-qml-api.index.gz
-python manage.py import_qdoc -Pp -t apps -l qml -r sdk-14.10 -s "Platform Services" -N Ubuntu.Content -i /tmp/apidoc_sources/usr/share/doc/content-hub/qml/html/ubuntu-content-qml-api.index
+python manage.py import_qdoc -Pp -t apps -l qml -r sdk-15.04 -s "Platform Services" -N Ubuntu.Content -i /tmp/apidoc_sources/usr/share/doc/content-hub/qml/html/ubuntu-content-qml-api.index
 
 # U1db
-SERIES=vivid ./get_package.sh libu1db-qt5-doc
-python manage.py import_qdoc -p -t apps -l qml -r sdk-14.10 -s "Platform Services" -N U1db -i /tmp/apidoc_sources/usr/share/u1db-qt/doc/html/u1db-qt.index
+./get_package.sh libu1db-qt5-doc
+python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04 -s "Platform Services" -N U1db -i /tmp/apidoc_sources/usr/share/u1db-qt/doc/html/u1db-qt.index
 
 ## Ubuntu.DownloadManager
 ./get_package.sh libubuntu-download-manager-client-doc
 gunzip -f /tmp/apidoc_sources/usr/share/doc/ubuntu-download-manager/qml/html/ubuntu-download-manager-qml-api.index.gz
-python manage.py import_qdoc -Pp -t apps -l qml -r sdk-14.10 -s "Platform Services" -N Ubuntu.DownloadManager -i /tmp/apidoc_sources/usr/share/doc/ubuntu-download-manager/qml/html/ubuntu-download-manager-qml-api.index
+python manage.py import_qdoc -Pp -t apps -l qml -r sdk-15.04 -s "Platform Services" -N Ubuntu.DownloadManager -i /tmp/apidoc_sources/usr/share/doc/ubuntu-download-manager/qml/html/ubuntu-download-manager-qml-api.index
 
 ## Ubuntu.Web
 ./get_package.sh qtdeclarative5-ubuntu-web-plugin-doc
 gunzip -f /tmp/apidoc_sources/usr/share/doc/ubuntu-web/html/ubuntuweb.index.gz
-python manage.py import_qdoc -Pp -t apps -l qml -r sdk-14.10 -s "Graphical Interface" -N Ubuntu.Web -i /tmp/apidoc_sources/usr/share/doc/ubuntu-web/html/ubuntuweb.index
+python manage.py import_qdoc -Pp -t apps -l qml -r sdk-15.04 -s "Graphical Interface" -N Ubuntu.Web -i /tmp/apidoc_sources/usr/share/doc/ubuntu-web/html/ubuntuweb.index
 
 #### Aps/HTML5
 ## UbuntuUI
-SERIES=vivid ./get_package.sh ubuntu-html5-ui-toolkit-doc
-python manage.py import_yuidoc -i -t apps -l html5 -r sdk-14.10 -s "Graphical Interface" -d /tmp/apidoc_sources/usr/share/doc/ubuntu-html5-ui-toolkit-doc/data.json
+./get_package.sh ubuntu-html5-ui-toolkit-doc
+python manage.py import_yuidoc -i -t apps -l html5 -r sdk-15.04 -s "Graphical Interface" -d /tmp/apidoc_sources/usr/share/doc/ubuntu-html5-ui-toolkit-doc/data.json
 
 ## Cordova
 #wget -P /tmp/apidoc_sources/ -nc https://swift.canonistack.canonical.com/v1/AUTH_28f73a401b8a4dfeab9f0f02f789d1ac/html5-api-docs/docs/cordova-docs.utopic.tar.gz
 #tar -C /tmp/apidoc_sources/ -xzf /tmp/apidoc_sources/cordova-docs.utopic.tar.gz
-#python manage.py import_cordova -t apps -l html5 -r sdk-14.10 -i /tmp/apidoc_sources/utopic/cordova-docs/public/en/4.0.0/index.json
+#python manage.py import_cordova -t apps -l html5 -r sdk-15.04 -i /tmp/apidoc_sources/utopic/cordova-docs/public/en/4.0.0/index.json
 
 ## Platform Bindings
-SERIES=vivid ./get_package.sh unity-webapps-qml-doc
+./get_package.sh unity-webapps-qml-doc
 ## OnlineAccounts3
-python manage.py import_yuidoc -t apps -l html5 -r sdk-14.10 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/online-accounts/data.json
+python manage.py import_yuidoc -t apps -l html5 -r sdk-15.04 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/online-accounts/data.json
 ## AlarmAPI
-python manage.py import_yuidoc -t apps -l html5 -r sdk-14.10 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/alarm-api/data.json
+python manage.py import_yuidoc -t apps -l html5 -r sdk-15.04 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/alarm-api/data.json
 ## ContentHub
-python manage.py import_yuidoc -t apps -l html5 -r sdk-14.10 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/content-hub/data.json
+python manage.py import_yuidoc -t apps -l html5 -r sdk-15.04 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/content-hub/data.json
 ## RuntimeAPI
-python manage.py import_yuidoc -t apps -l html5 -r sdk-14.10 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/runtime-api/data.json
+python manage.py import_yuidoc -t apps -l html5 -r sdk-15.04 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/runtime-api/data.json
 
 #### Autopilot/Python
 ## Autopilot
-SERIES=vivid ./get_package.sh python3-autopilot
+./get_package.sh python3-autopilot
 find /tmp/apidoc_sources/usr/share/doc/python3-autopilot/json/ -name "*.gz" -print0 |xargs -0 gunzip
 python manage.py import_sphinx -t autopilot -l python -r 1.5.0 -s ./api_docs/importers/autopilot_sections.py -i /tmp/apidoc_sources/usr/share/doc/python3-autopilot/json/objects.inv
 
-SERIES=vivid ARCH=i386 ./get_package.sh ubuntu-ui-toolkit-autopilot
+ARCH=i386 ./get_package.sh ubuntu-ui-toolkit-autopilot
 find /tmp/apidoc_sources/usr/share/doc/ubuntu-ui-toolkit-autopilot/json/ -name "*.gz" -print0 |xargs -0 gunzip
 python manage.py import_sphinx -t autopilot -l python -r 1.5.0 -s ./api_docs/importers/autopilot_sections.py -i /tmp/apidoc_sources/usr/share/doc/ubuntu-ui-toolkit-autopilot/json/objects.inv
 
 #### Scopes/C++ 
 ## unity.scopes
 ./get_package.sh libunity-scopes-doc
-python manage.py import_doxygen -t scopes -l cpp -r sdk-14.10 -s ./api_docs/importers/scope_sections.py -N unity.scopes -d /tmp/apidoc_sources/usr/share/doc/unity-scopes/
+python manage.py import_doxygen -t scopes -l cpp -r sdk-15.04 -s ./api_docs/importers/scope_sections.py -N unity.scopes -d /tmp/apidoc_sources/usr/share/doc/unity-scopes/
 
 ## Accounts
 ./get_package.sh libaccounts-qt-doc
-python manage.py import_doxygen -t scopes -l cpp -r sdk-14.10 -s ./api_docs/importers/accounts_sections.py -n Accounts -d /tmp/apidoc_sources/usr/share/doc/libaccounts-qt/html/
+python manage.py import_doxygen -t scopes -l cpp -r sdk-15.04 -s ./api_docs/importers/accounts_sections.py -n Accounts -d /tmp/apidoc_sources/usr/share/doc/libaccounts-qt/html/
 
 ## U1db
 ./get_package.sh libu1db-qt5-doc
-python manage.py import_qdoc -Pp -N U1db -t scopes -l cpp -r sdk-14.10 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/u1db-qt/doc/html/u1db-qt.index
+python manage.py import_qdoc -Pp -N U1db -t scopes -l cpp -r sdk-15.04 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/u1db-qt/doc/html/u1db-qt.index
 
 rm -r /tmp/apidoc_sources/