Split learn data into subdirs

pychess · Feb 23, 2018 · 4f59a42 · 4f59a42
1 parent a96c928
commit 4f59a42
Show file tree

Hide file tree

Showing 45 changed files with 11 additions and 9 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,7 +2,7 @@ include glade/*.glade glade/background.jpg glade/*.png glade/*.svg glade/16x16/*
 recursive-include pieces *
 include README.md AUTHORS ARTISTS DOCUMENTERS LICENSE INSTALL TRANSLATORS
 include sounds/*.ogg
-include lectures/*.txt lectures/*.pgn
+include learn/lectures/*.txt learn/lessons/*.pgn learn/puzzles/*.pgn learn/puzzles/*.olv
 include manpages/pychess.1.gz
 include menu/pychess
 include gtksourceview-3.0/language-specs/pgn.lang

diff --git a/lectures/lec1.txt → learn/lectures/lec1.txt b/lectures/lec1.txt → learn/lectures/lec1.txt
diff --git a/lectures/lec10.txt → learn/lectures/lec10.txt b/lectures/lec10.txt → learn/lectures/lec10.txt
diff --git a/lectures/lec11.txt → learn/lectures/lec11.txt b/lectures/lec11.txt → learn/lectures/lec11.txt
diff --git a/lectures/lec12.txt → learn/lectures/lec12.txt b/lectures/lec12.txt → learn/lectures/lec12.txt
diff --git a/lectures/lec13.txt → learn/lectures/lec13.txt b/lectures/lec13.txt → learn/lectures/lec13.txt
diff --git a/lectures/lec14.txt → learn/lectures/lec14.txt b/lectures/lec14.txt → learn/lectures/lec14.txt
diff --git a/lectures/lec15.txt → learn/lectures/lec15.txt b/lectures/lec15.txt → learn/lectures/lec15.txt
diff --git a/lectures/lec16.txt → learn/lectures/lec16.txt b/lectures/lec16.txt → learn/lectures/lec16.txt
diff --git a/lectures/lec17.txt → learn/lectures/lec17.txt b/lectures/lec17.txt → learn/lectures/lec17.txt
diff --git a/lectures/lec18.txt → learn/lectures/lec18.txt b/lectures/lec18.txt → learn/lectures/lec18.txt
diff --git a/lectures/lec19.txt → learn/lectures/lec19.txt b/lectures/lec19.txt → learn/lectures/lec19.txt
diff --git a/lectures/lec2.txt → learn/lectures/lec2.txt b/lectures/lec2.txt → learn/lectures/lec2.txt
diff --git a/lectures/lec20.txt → learn/lectures/lec20.txt b/lectures/lec20.txt → learn/lectures/lec20.txt
diff --git a/lectures/lec21.txt → learn/lectures/lec21.txt b/lectures/lec21.txt → learn/lectures/lec21.txt
diff --git a/lectures/lec22.txt → learn/lectures/lec22.txt b/lectures/lec22.txt → learn/lectures/lec22.txt
diff --git a/lectures/lec23.txt → learn/lectures/lec23.txt b/lectures/lec23.txt → learn/lectures/lec23.txt
diff --git a/lectures/lec24.txt → learn/lectures/lec24.txt b/lectures/lec24.txt → learn/lectures/lec24.txt
diff --git a/lectures/lec25.txt → learn/lectures/lec25.txt b/lectures/lec25.txt → learn/lectures/lec25.txt
diff --git a/lectures/lec26.txt → learn/lectures/lec26.txt b/lectures/lec26.txt → learn/lectures/lec26.txt
diff --git a/lectures/lec27.txt → learn/lectures/lec27.txt b/lectures/lec27.txt → learn/lectures/lec27.txt
diff --git a/lectures/lec28.txt → learn/lectures/lec28.txt b/lectures/lec28.txt → learn/lectures/lec28.txt
diff --git a/lectures/lec29.txt → learn/lectures/lec29.txt b/lectures/lec29.txt → learn/lectures/lec29.txt
diff --git a/lectures/lec3.txt → learn/lectures/lec3.txt b/lectures/lec3.txt → learn/lectures/lec3.txt
diff --git a/lectures/lec30.txt → learn/lectures/lec30.txt b/lectures/lec30.txt → learn/lectures/lec30.txt
diff --git a/lectures/lec31.txt → learn/lectures/lec31.txt b/lectures/lec31.txt → learn/lectures/lec31.txt
diff --git a/lectures/lec4.txt → learn/lectures/lec4.txt b/lectures/lec4.txt → learn/lectures/lec4.txt
diff --git a/lectures/lec5.txt → learn/lectures/lec5.txt b/lectures/lec5.txt → learn/lectures/lec5.txt
diff --git a/lectures/lec6.txt → learn/lectures/lec6.txt b/lectures/lec6.txt → learn/lectures/lec6.txt
diff --git a/lectures/lec7.txt → learn/lectures/lec7.txt b/lectures/lec7.txt → learn/lectures/lec7.txt
diff --git a/lectures/lec8.txt → learn/lectures/lec8.txt b/lectures/lec8.txt → learn/lectures/lec8.txt
diff --git a/lectures/lec9.txt → learn/lectures/lec9.txt b/lectures/lec9.txt → learn/lectures/lec9.txt
diff --git a/lectures/toddmf_lecbot.txt → learn/lectures/toddmf_lecbot.txt b/lectures/toddmf_lecbot.txt → learn/lectures/toddmf_lecbot.txt
diff --git a/lectures/Back_rank_threats.pgn → learn/lessons/Back_rank_threats.pgn b/lectures/Back_rank_threats.pgn → learn/lessons/Back_rank_threats.pgn
diff --git a/lectures/Charles_XII_At_Bender.pgn → learn/lessons/Charles_XII_At_Bender.pgn b/lectures/Charles_XII_At_Bender.pgn → learn/lessons/Charles_XII_At_Bender.pgn
diff --git a/lectures/lasker.olv → learn/puzzles/lasker.olv b/lectures/lasker.olv → learn/puzzles/lasker.olv
diff --git a/lectures/loyd.olv → learn/puzzles/loyd.olv b/lectures/loyd.olv → learn/puzzles/loyd.olv
diff --git a/lectures/mate_in_2.pgn → learn/puzzles/mate_in_2.pgn b/lectures/mate_in_2.pgn → learn/puzzles/mate_in_2.pgn
diff --git a/lectures/mate_in_3.pgn → learn/puzzles/mate_in_3.pgn b/lectures/mate_in_3.pgn → learn/puzzles/mate_in_3.pgn
diff --git a/lectures/mate_in_4.pgn → learn/puzzles/mate_in_4.pgn b/lectures/mate_in_4.pgn → learn/puzzles/mate_in_4.pgn
diff --git a/lectures/reti.olv → learn/puzzles/reti.olv b/lectures/reti.olv → learn/puzzles/reti.olv
diff --git a/lib/pychess/perspectives/learn/LecturesPanel.py b/lib/pychess/perspectives/learn/LecturesPanel.py
@@ -97,7 +97,7 @@ def row_activated(self, widget, path, col):
         if path is None:
             return
         lecnum = path[0] + 1
-        self.lecture = addDataPrefix("lectures/lec%s.txt" % lecnum)
+        self.lecture = addDataPrefix("learn/lectures/lec%s.txt" % lecnum)
 
         # connection.client.run_command("examine")
         gamemodel = self.start_lecture_game()

diff --git a/lib/pychess/perspectives/learn/LessonsPanel.py b/lib/pychess/perspectives/learn/LessonsPanel.py
@@ -66,7 +66,7 @@ def row_activated(self, widget, path, col):
 
 
 def start_lesson_from(filename, index):
-    chessfile = PGNFile(protoopen(addDataPrefix("lectures/%s" % filename)))
+    chessfile = PGNFile(protoopen(addDataPrefix("learn/lessons/%s" % filename)))
     chessfile.limit = 1000
     importer = PgnImport(chessfile)
     chessfile.init_tag_database(importer)

diff --git a/lib/pychess/perspectives/learn/PuzzlesPanel.py b/lib/pychess/perspectives/learn/PuzzlesPanel.py
@@ -75,12 +75,12 @@ def row_activated(self, widget, path, col):
 
 def start_puzzle_from(filename):
     if filename.lower().endswith(".pgn"):
-        chessfile = PGNFile(protoopen(addDataPrefix("lectures/%s" % filename)))
+        chessfile = PGNFile(protoopen(addDataPrefix("learn/puzzles/%s" % filename)))
         chessfile.limit = 1000
         importer = PgnImport(chessfile)
         chessfile.init_tag_database(importer)
     elif filename.lower().endswith(".olv"):
-        chessfile = OLVFile(protoopen(addDataPrefix("lectures/%s" % filename), encoding="utf-8"))
+        chessfile = OLVFile(protoopen(addDataPrefix("learn/puzzles/%s" % filename), encoding="utf-8"))
 
     records, plys = chessfile.get_records()
 

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from distutils.command.register import register
 from glob import glob
 from os import listdir
-from os.path import isdir, isfile
+from os.path import isdir
 import os
 import site
 import sys
@@ -168,9 +168,11 @@ def run(self):
 DATA_FILES += [("share/pychess/pieces", glob('pieces/*.png'))]
 DATA_FILES += [("share/pychess/pieces/ttf", glob('pieces/ttf/*.ttf'))]
 
-# Lectures, puzzles
-DATA_FILES += [("share/pychess/lectures", glob('lectures/*.pgn'))]
-DATA_FILES += [("share/pychess/lectures", glob('lectures/*.txt'))]
+# Lectures, puzzles, lessons
+DATA_FILES += [("share/pychess/learn/puzzles", glob('learn/puzzles/*.olv'))]
+DATA_FILES += [("share/pychess/learn/puzzles", glob('learn/puzzles/*.pgn'))]
+DATA_FILES += [("share/pychess/learn/lessons", glob('learn/lessons/*.pgn'))]
+DATA_FILES += [("share/pychess/learn/lectures", glob('learn/lectures/*.txt'))]
 
 for dir in [d for d in listdir('pieces') if isdir(os.path.join('pieces', d)) and d != 'ttf']:
     DATA_FILES += [("share/pychess/pieces/" + dir, glob('pieces/' + dir + '/*.svg'))]