[help.gnome.org] Move app icons to _appicons

From: Shaun McCance <shaunm src gnome org>
To: commits-list gnome org
Cc:
Subject: [help.gnome.org] Move app icons to _appicons
Date: Sat, 11 Sep 2021 02:43:45 +0000 (UTC)
commit 98bc3a87c7853aa0ee6998861a9aa6fd3d4ea842
Author: Shaun McCance <shaunm redhat com>
Date:   Fri Sep 10 22:43:29 2021 -0400

    Move app icons to _appicons

 accerciser.svg => _appicons/accerciser.svg         |   0
 aisleriot.png => _appicons/aisleriot.png           | Bin
 baobab.svg => _appicons/baobab.svg                 |   0
 cheese.svg => _appicons/cheese.svg                 |   0
 connections.svg => _appicons/connections.svg       |   0
 d-feet.svg => _appicons/d-feet.svg                 |   0
 daty.svg => _appicons/daty.svg                     |   0
 deja-dup.svg => _appicons/deja-dup.svg             |   0
 easytag.svg => _appicons/easytag.svg               |   0
 empathy.png => _appicons/empathy.png               | Bin
 eog.svg => _appicons/eog.svg                       |   0
 epiphany.svg => _appicons/epiphany.svg             |   0
 evince.svg => _appicons/evince.svg                 |   0
 evolution.svg => _appicons/evolution.svg           |   0
 file-roller.png => _appicons/file-roller.png       | Bin
 five-or-more.png => _appicons/five-or-more.png     | Bin
 four-in-a-row.png => _appicons/four-in-a-row.png   | Bin
 geary.svg => _appicons/geary.svg                   |   0
 gedit.svg => _appicons/gedit.svg                   |   0
 ghex.svg => _appicons/ghex.svg                     |   0
 giggle.svg => _appicons/giggle.svg                 |   0
 glabels.svg => _appicons/glabels.svg               |   0
 glade.svg => _appicons/glade.svg                   |   0
 gnome-boxes.svg => _appicons/gnome-boxes.svg       |   0
 .../gnome-calculator.svg                           |   0
 gnome-chess.svg => _appicons/gnome-chess.svg       |   0
 gnome-clocks.svg => _appicons/gnome-clocks.svg     |   0
 .../gnome-dictionary.svg                           |   0
 .../gnome-documents.svg                            |   0
 gnome-klotski.svg => _appicons/gnome-klotski.svg   |   0
 gnome-logs.svg => _appicons/gnome-logs.svg         |   0
 gnome-mahjongg.svg => _appicons/gnome-mahjongg.svg |   0
 gnome-mines.svg => _appicons/gnome-mines.svg       |   0
 gnome-music.svg => _appicons/gnome-music.svg       |   0
 gnome-nettool.svg => _appicons/gnome-nettool.svg   |   0
 gnome-nibbles.svg => _appicons/gnome-nibbles.svg   |   0
 gnome-notes.svg => _appicons/gnome-notes.svg       |   0
 gnome-photos.svg => _appicons/gnome-photos.svg     |   0
 gnome-robots.svg => _appicons/gnome-robots.svg     |   0
 .../gnome-subtitles.svg                            |   0
 gnome-sudoku.svg => _appicons/gnome-sudoku.svg     |   0
 .../gnome-system-monitor.svg                       |   0
 gnome-taquin.svg => _appicons/gnome-taquin.svg     |   0
 gnome-terminal.svg => _appicons/gnome-terminal.svg |   0
 gnome-tetravex.svg => _appicons/gnome-tetravex.svg |   0
 gnote.svg => _appicons/gnote.svg                   |   0
 gparted.svg => _appicons/gparted.svg               |   0
 gthumb.svg => _appicons/gthumb.svg                 |   0
 gtranslator.svg => _appicons/gtranslator.svg       |   0
 help-browser.png => _appicons/help-browser.png     | Bin
 hitori.svg => _appicons/hitori.svg                 |   0
 iagno.svg => _appicons/iagno.svg                   |   0
 lightsoff.svg => _appicons/lightsoff.svg           |   0
 meld.svg => _appicons/meld.svg                     |   0
 ocrfeeder.svg => _appicons/ocrfeeder.svg           |   0
 orca.svg => _appicons/orca.svg                     |   0
 pitivi.svg => _appicons/pitivi.svg                 |   0
 polari.svg => _appicons/polari.svg                 |   0
 quadrapassel.svg => _appicons/quadrapassel.svg     |   0
 recipes.png => _appicons/recipes.png               | Bin
 simple-scan.svg => _appicons/simple-scan.svg       |   0
 sound-juicer.svg => _appicons/sound-juicer.svg     |   0
 swell-foop.png => _appicons/swell-foop.png         | Bin
 totem.svg => _appicons/totem.svg                   |   0
 configger.py                                       | 113 ++---
 lightoff.svg                                       | 504 ---------------------
 pintail.cfg                                        |   5 +-
 67 files changed, 62 insertions(+), 560 deletions(-)
---
diff --git a/accerciser.svg b/_appicons/accerciser.svg
similarity index 100%
rename from accerciser.svg
rename to _appicons/accerciser.svg
diff --git a/aisleriot.png b/_appicons/aisleriot.png
similarity index 100%
rename from aisleriot.png
rename to _appicons/aisleriot.png
diff --git a/baobab.svg b/_appicons/baobab.svg
similarity index 100%
rename from baobab.svg
rename to _appicons/baobab.svg
diff --git a/cheese.svg b/_appicons/cheese.svg
similarity index 100%
rename from cheese.svg
rename to _appicons/cheese.svg
diff --git a/connections.svg b/_appicons/connections.svg
similarity index 100%
rename from connections.svg
rename to _appicons/connections.svg
diff --git a/d-feet.svg b/_appicons/d-feet.svg
similarity index 100%
rename from d-feet.svg
rename to _appicons/d-feet.svg
diff --git a/daty.svg b/_appicons/daty.svg
similarity index 100%
rename from daty.svg
rename to _appicons/daty.svg
diff --git a/deja-dup.svg b/_appicons/deja-dup.svg
similarity index 100%
rename from deja-dup.svg
rename to _appicons/deja-dup.svg
diff --git a/easytag.svg b/_appicons/easytag.svg
similarity index 100%
rename from easytag.svg
rename to _appicons/easytag.svg
diff --git a/empathy.png b/_appicons/empathy.png
similarity index 100%
rename from empathy.png
rename to _appicons/empathy.png
diff --git a/eog.svg b/_appicons/eog.svg
similarity index 100%
rename from eog.svg
rename to _appicons/eog.svg
diff --git a/epiphany.svg b/_appicons/epiphany.svg
similarity index 100%
rename from epiphany.svg
rename to _appicons/epiphany.svg
diff --git a/evince.svg b/_appicons/evince.svg
similarity index 100%
rename from evince.svg
rename to _appicons/evince.svg
diff --git a/evolution.svg b/_appicons/evolution.svg
similarity index 100%
rename from evolution.svg
rename to _appicons/evolution.svg
diff --git a/file-roller.png b/_appicons/file-roller.png
similarity index 100%
rename from file-roller.png
rename to _appicons/file-roller.png
diff --git a/five-or-more.png b/_appicons/five-or-more.png
similarity index 100%
rename from five-or-more.png
rename to _appicons/five-or-more.png
diff --git a/four-in-a-row.png b/_appicons/four-in-a-row.png
similarity index 100%
rename from four-in-a-row.png
rename to _appicons/four-in-a-row.png
diff --git a/geary.svg b/_appicons/geary.svg
similarity index 100%
rename from geary.svg
rename to _appicons/geary.svg
diff --git a/gedit.svg b/_appicons/gedit.svg
similarity index 100%
rename from gedit.svg
rename to _appicons/gedit.svg
diff --git a/ghex.svg b/_appicons/ghex.svg
similarity index 100%
rename from ghex.svg
rename to _appicons/ghex.svg
diff --git a/giggle.svg b/_appicons/giggle.svg
similarity index 100%
rename from giggle.svg
rename to _appicons/giggle.svg
diff --git a/glabels.svg b/_appicons/glabels.svg
similarity index 100%
rename from glabels.svg
rename to _appicons/glabels.svg
diff --git a/glade.svg b/_appicons/glade.svg
similarity index 100%
rename from glade.svg
rename to _appicons/glade.svg
diff --git a/gnome-boxes.svg b/_appicons/gnome-boxes.svg
similarity index 100%
rename from gnome-boxes.svg
rename to _appicons/gnome-boxes.svg
diff --git a/gnome-calculator.svg b/_appicons/gnome-calculator.svg
similarity index 100%
rename from gnome-calculator.svg
rename to _appicons/gnome-calculator.svg
diff --git a/gnome-chess.svg b/_appicons/gnome-chess.svg
similarity index 100%
rename from gnome-chess.svg
rename to _appicons/gnome-chess.svg
diff --git a/gnome-clocks.svg b/_appicons/gnome-clocks.svg
similarity index 100%
rename from gnome-clocks.svg
rename to _appicons/gnome-clocks.svg
diff --git a/gnome-dictionary.svg b/_appicons/gnome-dictionary.svg
similarity index 100%
rename from gnome-dictionary.svg
rename to _appicons/gnome-dictionary.svg
diff --git a/gnome-documents.svg b/_appicons/gnome-documents.svg
similarity index 100%
rename from gnome-documents.svg
rename to _appicons/gnome-documents.svg
diff --git a/gnome-klotski.svg b/_appicons/gnome-klotski.svg
similarity index 100%
rename from gnome-klotski.svg
rename to _appicons/gnome-klotski.svg
diff --git a/gnome-logs.svg b/_appicons/gnome-logs.svg
similarity index 100%
rename from gnome-logs.svg
rename to _appicons/gnome-logs.svg
diff --git a/gnome-mahjongg.svg b/_appicons/gnome-mahjongg.svg
similarity index 100%
rename from gnome-mahjongg.svg
rename to _appicons/gnome-mahjongg.svg
diff --git a/gnome-mines.svg b/_appicons/gnome-mines.svg
similarity index 100%
rename from gnome-mines.svg
rename to _appicons/gnome-mines.svg
diff --git a/gnome-music.svg b/_appicons/gnome-music.svg
similarity index 100%
rename from gnome-music.svg
rename to _appicons/gnome-music.svg
diff --git a/gnome-nettool.svg b/_appicons/gnome-nettool.svg
similarity index 100%
rename from gnome-nettool.svg
rename to _appicons/gnome-nettool.svg
diff --git a/gnome-nibbles.svg b/_appicons/gnome-nibbles.svg
similarity index 100%
rename from gnome-nibbles.svg
rename to _appicons/gnome-nibbles.svg
diff --git a/gnome-notes.svg b/_appicons/gnome-notes.svg
similarity index 100%
rename from gnome-notes.svg
rename to _appicons/gnome-notes.svg
diff --git a/gnome-photos.svg b/_appicons/gnome-photos.svg
similarity index 100%
rename from gnome-photos.svg
rename to _appicons/gnome-photos.svg
diff --git a/gnome-robots.svg b/_appicons/gnome-robots.svg
similarity index 100%
rename from gnome-robots.svg
rename to _appicons/gnome-robots.svg
diff --git a/gnome-subtitles.svg b/_appicons/gnome-subtitles.svg
similarity index 100%
rename from gnome-subtitles.svg
rename to _appicons/gnome-subtitles.svg
diff --git a/gnome-sudoku.svg b/_appicons/gnome-sudoku.svg
similarity index 100%
rename from gnome-sudoku.svg
rename to _appicons/gnome-sudoku.svg
diff --git a/gnome-system-monitor.svg b/_appicons/gnome-system-monitor.svg
similarity index 100%
rename from gnome-system-monitor.svg
rename to _appicons/gnome-system-monitor.svg
diff --git a/gnome-taquin.svg b/_appicons/gnome-taquin.svg
similarity index 100%
rename from gnome-taquin.svg
rename to _appicons/gnome-taquin.svg
diff --git a/gnome-terminal.svg b/_appicons/gnome-terminal.svg
similarity index 100%
rename from gnome-terminal.svg
rename to _appicons/gnome-terminal.svg
diff --git a/gnome-tetravex.svg b/_appicons/gnome-tetravex.svg
similarity index 100%
rename from gnome-tetravex.svg
rename to _appicons/gnome-tetravex.svg
diff --git a/gnote.svg b/_appicons/gnote.svg
similarity index 100%
rename from gnote.svg
rename to _appicons/gnote.svg
diff --git a/gparted.svg b/_appicons/gparted.svg
similarity index 100%
rename from gparted.svg
rename to _appicons/gparted.svg
diff --git a/gthumb.svg b/_appicons/gthumb.svg
similarity index 100%
rename from gthumb.svg
rename to _appicons/gthumb.svg
diff --git a/gtranslator.svg b/_appicons/gtranslator.svg
similarity index 100%
rename from gtranslator.svg
rename to _appicons/gtranslator.svg
diff --git a/help-browser.png b/_appicons/help-browser.png
similarity index 100%
rename from help-browser.png
rename to _appicons/help-browser.png
diff --git a/hitori.svg b/_appicons/hitori.svg
similarity index 100%
rename from hitori.svg
rename to _appicons/hitori.svg
diff --git a/iagno.svg b/_appicons/iagno.svg
similarity index 100%
rename from iagno.svg
rename to _appicons/iagno.svg
diff --git a/lightsoff.svg b/_appicons/lightsoff.svg
similarity index 100%
rename from lightsoff.svg
rename to _appicons/lightsoff.svg
diff --git a/meld.svg b/_appicons/meld.svg
similarity index 100%
rename from meld.svg
rename to _appicons/meld.svg
diff --git a/ocrfeeder.svg b/_appicons/ocrfeeder.svg
similarity index 100%
rename from ocrfeeder.svg
rename to _appicons/ocrfeeder.svg
diff --git a/orca.svg b/_appicons/orca.svg
similarity index 100%
rename from orca.svg
rename to _appicons/orca.svg
diff --git a/pitivi.svg b/_appicons/pitivi.svg
similarity index 100%
rename from pitivi.svg
rename to _appicons/pitivi.svg
diff --git a/polari.svg b/_appicons/polari.svg
similarity index 100%
rename from polari.svg
rename to _appicons/polari.svg
diff --git a/quadrapassel.svg b/_appicons/quadrapassel.svg
similarity index 100%
rename from quadrapassel.svg
rename to _appicons/quadrapassel.svg
diff --git a/recipes.png b/_appicons/recipes.png
similarity index 100%
rename from recipes.png
rename to _appicons/recipes.png
diff --git a/simple-scan.svg b/_appicons/simple-scan.svg
similarity index 100%
rename from simple-scan.svg
rename to _appicons/simple-scan.svg
diff --git a/sound-juicer.svg b/_appicons/sound-juicer.svg
similarity index 100%
rename from sound-juicer.svg
rename to _appicons/sound-juicer.svg
diff --git a/swell-foop.png b/_appicons/swell-foop.png
similarity index 100%
rename from swell-foop.png
rename to _appicons/swell-foop.png
diff --git a/totem.svg b/_appicons/totem.svg
similarity index 100%
rename from totem.svg
rename to _appicons/totem.svg
diff --git a/configger.py b/configger.py
index 104e6f7..b237c27 100755
--- a/configger.py
+++ b/configger.py
@@ -8,62 +8,65 @@ import sys
 import urllib.request
 import yaml
 
-icons = []
-apps = yaml.full_load(open('APPS.yaml'))
-appsxml = open('__pintail__/APPS.xml', 'w')
-appsxml.write('<apps>\n')
-for group in apps:
-    for app in apps[group]:
-        icon = '#default'
-        if os.path.exists(app + '.svg'):
-            icon = app + '.svg'
-        elif os.path.exists(app + '.png'):
-            icon = app + '.png'
-        if icon != '#default':
-            icons.append(icon)
-        appsxml.write('<app docid="{0}" group="{1}" icon="{2}"/>\n'
-                      .format(app, group, icon))
-        appdata = apps[group][app] or {}
-        directory = appdata.get('directory', 'help/C')
-        stable = appdata.get('stable', None)
-        unstable = appdata.get('unstable', None)
-        if 'repository' in appdata:
-            repository = appdata['repository']
-            if stable is None:
-                stable = 'main'
-        else:
-            if 'project' in appdata:
-                project = appdata['project']
-            else:
-                project = 'GNOME'
-            repository = 'https://gitlab.gnome.org/' + project + '/' + app + '.git'
-            if stable is None or unstable is None:
-                bfile = urllib.request.urlopen('https://gitlab.gnome.org/api/v4/projects/' +
-                                               project + '%2F' + app + '/repository/branches')
-                branches = json.load(bfile)
-                branches = [branch['name'] for branch in branches]
-                if unstable is None:
-                    unstable = 'main' if ('main' in branches) else 'master'
+try:
+    icons = []
+    apps = yaml.full_load(open('APPS.yaml'))
+    appsxml = open('__pintail__/APPS.xml', 'w')
+    appsxml.write('<apps>\n')
+    for group in apps:
+        for app in apps[group]:
+            icon = '#default'
+            if os.path.exists('_appicons/' + app + '.svg'):
+                icon = app + '.svg'
+            elif os.path.exists('_appicons/' + app + '.png'):
+                icon = app + '.png'
+            if icon != '#default':
+                icons.append('_appicons/' + icon)
+            appsxml.write('<app docid="{0}" group="{1}" icon="{2}"/>\n'
+                          .format(app, group, icon))
+            appdata = apps[group][app] or {}
+            directory = appdata.get('directory', 'help/C')
+            stable = appdata.get('stable', None)
+            unstable = appdata.get('unstable', None)
+            if 'repository' in appdata:
+                repository = appdata['repository']
                 if stable is None:
-                    stable = unstable
-                    for trybranch in STABLE_BRANCHES:
-                        if trybranch in branches:
-                            stable = trybranch
-                            break
-        if stable == unstable:
-            unstable = None
-        print('[/' + app + '/]')
-        print('git_repository = ' + repository)
-        print('git_directory = ' + directory)
-        print('git_branch = ' + stable)
-        print('')
-        if unstable is not None:
-            print('[/unstable/' + app + '/]')
+                    stable = 'main'
+            else:
+                if 'project' in appdata:
+                    project = appdata['project']
+                else:
+                    project = 'GNOME'
+                repository = 'https://gitlab.gnome.org/' + project + '/' + app + '.git'
+                if stable is None or unstable is None:
+                    bfile = urllib.request.urlopen('https://gitlab.gnome.org/api/v4/projects/' +
+                                                   project + '%2F' + app + '/repository/branches')
+                    branches = json.load(bfile)
+                    branches = [branch['name'] for branch in branches]
+                    if unstable is None:
+                        unstable = 'main' if ('main' in branches) else 'master'
+                    if stable is None:
+                        stable = unstable
+                        for trybranch in STABLE_BRANCHES:
+                            if trybranch in branches:
+                                stable = trybranch
+                                break
+            if stable == unstable:
+                unstable = None
+            print('[/' + app + '/]')
             print('git_repository = ' + repository)
             print('git_directory = ' + directory)
-            print('git_branch = ' + unstable)
+            print('git_branch = ' + stable)
             print('')
-print('[/]')
-print('extra_files = ' + ' '.join(icons))
-appsxml.write('</apps>\n')
-appsxml.close()
+            if unstable is not None:
+                print('[/unstable/' + app + '/]')
+                print('git_repository = ' + repository)
+                print('git_directory = ' + directory)
+                print('git_branch = ' + unstable)
+                print('')
+    print('[/]')
+    print('extra_files = ' + ' '.join(icons))
+    appsxml.write('</apps>\n')
+    appsxml.close()
+except KeyboardInterrupt:
+    sys.exit(1)
diff --git a/pintail.cfg b/pintail.cfg
index 202415a..b16416d 100644
--- a/pintail.cfg
+++ b/pintail.cfg
@@ -12,7 +12,10 @@ itstool_batch_dirs = True
 link_extension = .html
 
 [/]
-extra_files = gnome-logo.png gnome-banner.svg lotsoficons.svg help-browser.png banner-a11y.svg 
banner-files.svg banner-help.svg banner-network.svg banner-settings.svg banner-sysadmin.svg banner-tips.svg
+extra_files = gnome-logo.png gnome-banner.svg lotsoficons.svg _appicons/help-browser.png banner-a11y.svg 
banner-files.svg banner-help.svg banner-network.svg banner-settings.svg banner-sysadmin.svg banner-tips.svg
+
+[/foo/]
+extra_files = eog.svg
 
 [/system-admin-guide/]
 git_repository = https://gitlab.gnome.org/GNOME/gnome-user-docs.git
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]