OSDN Git Service

chore: increment Version to v1.3.6
[delesterandomselector/DelesteRandomSelector.git] / src / com / ranfa / main / DelesteRandomSelector.java
index 1e4ac6d..9d4b605 100644 (file)
@@ -5,15 +5,12 @@ import java.awt.EventQueue;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.function.BiConsumer;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
@@ -32,6 +29,7 @@ import com.jgoodies.forms.layout.ColumnSpec;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.layout.FormSpecs;
 import com.jgoodies.forms.layout.RowSpec;
+import com.ranfa.lib.CheckVersion;
 import com.ranfa.lib.LimitedLog;
 import com.ranfa.lib.Scraping;
 import com.ranfa.lib.SettingJSONProperty;
@@ -40,7 +38,7 @@ import com.ranfa.lib.Song;
 import com.ranfa.lib.TwitterIntegration;
 import com.ranfa.lib.Version;
 
-@Version(major = 1, minor = 0, patch = 2)
+@Version(major = 1, minor = 3, patch = 6)
 public class DelesteRandomSelector extends JFrame {
 
        private static ArrayList<Song> selectedSongsList = new ArrayList<Song>();
@@ -68,8 +66,8 @@ public class DelesteRandomSelector extends JFrame {
        private String[] integratorArray;
        private boolean integratorBool = false;
        private JTextArea textArea;
-
        private JScrollPane scrollPane;
+       private CompletableFuture<Void> softwareUpdateFuture = null;
 
        /**
         * Launch the application.
@@ -89,18 +87,29 @@ public class DelesteRandomSelector extends JFrame {
 
        /**
         * log file prefix:
-        *  "[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[LEVEL]: " +
+        *  this.getClass() + ":[LEVEL]: " +
         */
 
        /**
         * Create the frame.
         */
        public DelesteRandomSelector() {
+               boolean isFirst = !Scraping.databaseExists();
+               if(isFirst) {
+                       JOptionPane.showMessageDialog(this, "楽曲データベースが見つかりませんでした。自動的に作成されます…\n注意:初回起動ではなく、かつ、Jarファイルと同じ階層に\"database.json\"というファイルが存在するにも関わらず\nこのポップアップが出た場合、開発者までご一報ください。\nGithub URL: https://github.com/hizumiaoba/DelesteRandomSelector/issues");
+                       if(!Scraping.writeToJson(Scraping.getWholeData())) {
+                               JOptionPane.showMessageDialog(this, "Exception:NullPointerException\\nCannot Keep up! Please re-download this Application!");
+                               throw new NullPointerException("FATAL: cannot continue!");
+                       }
+               }
+               ExecutorService es = Executors.newWorkStealingPool();
+               CompletableFuture<ArrayList<Song>> getFromJsonFuture = CompletableFuture.supplyAsync(() -> Scraping.getFromJson(), es);
+               CompletableFuture<ArrayList<Song>> getWholeDataFuture = CompletableFuture.supplyAsync(() -> Scraping.getWholeData(), es);
                if(!Settings.fileExists() && !Settings.writeDownJSON()) {
                        JOptionPane.showMessageDialog(this, "Exception:NullPointerException\nCannot Keep up! Please re-download this Application!");
                        throw new NullPointerException("FATAL: cannot continue!");
                }
-               LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[DEBUG]: " + "Loading Settings...");
+               LimitedLog.println(this.getClass() + ":[DEBUG]: " + "Loading Settings...");
                property.setCheckLibraryUpdates(Settings.needToCheckLibraryUpdates());
                property.setCheckVersion(Settings.needToCheckVersion());
                property.setWindowWidth(Settings.getWindowWidth());
@@ -108,7 +117,7 @@ public class DelesteRandomSelector extends JFrame {
                property.setSongLimit(Settings.getSongsLimit());
                property.setSaveScoreLog(Settings.saveScoreLog());
                property.setOutputDebugSentences(Settings.outputDebugSentences());
-               LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[DEBUG]: " + "Loading Settings done."
+               LimitedLog.println(this.getClass() + ":[DEBUG]: " + "Loading Settings done."
                                + "\nVersion Check: " + property.isCheckVersion()
                                + "\nLibrary Update Check: " + property.isCheckLibraryUpdates()
                                + "\nWindow Width: " + property.getWindowWidth()
@@ -116,32 +125,40 @@ public class DelesteRandomSelector extends JFrame {
                                + "\nSong Limit: " + property.getSongLimit()
                                + "\nSaveScoreLog: " + property.isSaveScoreLog()
                                + "\nOutputDebugSentences: " + property.isOutputDebugSentences());
-               if(!Scraping.databaseExists()) {
-                       JOptionPane.showMessageDialog(this, "楽曲データベースが見つかりませんでした。自動的に作成されます…\n注意:初回起動ではなく、かつ、Jarファイルと同じ階層に\"database.json\"というファイルが存在するにも関わらず\nこのポップアップが出た場合、開発者までご一報ください。\nGithub URL: https://github.com/hizumiaoba/DelesteRandomSelector/issues");
-                       if(!Scraping.writeToJson(Scraping.getWholeData())) {
-                               JOptionPane.showMessageDialog(this, "Exception:NullPointerException\\nCannot Keep up! Please re-download this Application!");
-                               throw new NullPointerException("FATAL: cannot continue!");
+               if(property.isCheckVersion()) {
+                       softwareUpdateFuture = CompletableFuture.runAsync(() -> CheckVersion.needToBeUpdated(), es);
+               }
+               BiConsumer<ArrayList<Song>, ArrayList<Song>> updateConsumer = (list1, list2) -> {
+                       LimitedLog.println(this.getClass() + ":[INFO]: " + "Checking database updates...");
+                       if(list1.size() > list2.size()) {
+                               long time = System.currentTimeMillis();
+                               LimitedLog.println(this.getClass() + ":[INFO]: " + (list1.size() - list2.size()) + " Update detected.");
+                               Scraping.writeToJson(list1);
+                               LimitedLog.println(this.getClass() + ":[INFO]: " + "Update completed in " + (System.currentTimeMillis() - time) + "ms");
+                               LimitedLog.println(this.getClass() + ":[INFO]: " + "Updated database size: " + list1.size());
+                       } else {
+                               LimitedLog.println(this.getClass() + ":[INFO]: " + "database is up-to-date.");
                        }
-               } else if(Scraping.getFromJson().size() < Scraping.getWholeData().size()) {
-                       LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " + "Update detected.Initiate update process...");
-                       Path path = Paths.get(Scraping.getDBPath());
+               };
+               Runnable setEnabled = () -> {
                        try {
-                               Files.delete(path);
-                       } catch (IOException e1) {
-                               LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[FATAL]: " + "Exception while updating library.\n" + e1.getLocalizedMessage());
-                               JOptionPane.showMessageDialog(null, "データベースファイルをアップデートできませんでした。ファイルの削除権限があるかどうか確認してください。\n" + e1.getLocalizedMessage());
+                               Thread.sleep(1000);
+                       } catch (InterruptedException e1) {
+                               // TODO 自動生成された catch ブロック
+                               e1.printStackTrace();
                        }
-                       Scraping.writeToJson(Scraping.getWholeData());
-                       LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " + "Library update completed.");
+                       btnImport.setEnabled(true);
+                       btnImport.setText("<html><body>楽曲<br>絞り込み</body></html>");
+               };
+               getWholeDataFuture.thenAcceptAsync(list -> LimitedLog.println(this.getClass() + ":[INFO]: Scraping data size:" + list.size()), es);
+               getFromJsonFuture.thenAcceptAsync(list -> LimitedLog.println(this.getClass() + ":[INFO]: Currently database size:" + list.size()), es);
+               if(property.isCheckLibraryUpdates()) {
+                       CompletableFuture<Void> updatedFuture = getWholeDataFuture.thenAcceptBothAsync(getFromJsonFuture, updateConsumer, es);
+                       updatedFuture.thenRunAsync(setEnabled, es);
                }
-               ExecutorService es = Executors.newWorkStealingPool();
-               CompletableFuture<ArrayList<Song>> getFromJsonFuture = CompletableFuture.supplyAsync(() -> Scraping.getFromJson(), es);
-               CompletableFuture<ArrayList<Song>> getWholeDataFuture = CompletableFuture.supplyAsync(() -> Scraping.getWholeData(), es);
-               getWholeDataFuture.thenAcceptAsync(list -> LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: Scraping data size:" + list.size()), es);
-               getFromJsonFuture.thenAcceptAsync(list -> LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: Currently database size:" + list.size()), es);
-               LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[DEBUG]: " + "Version:" + getVersion());
+               LimitedLog.println(this.getClass() + ":[DEBUG]: " + "Version:" + CheckVersion.getVersion());
                setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-               setBounds(100, 100, 640, 360);
+               setBounds(100, 100, property.getWindowWidth(), property.getWindowHeight());
                contentPane = new JPanel();
                contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
                setContentPane(contentPane);
@@ -160,7 +177,7 @@ public class DelesteRandomSelector extends JFrame {
                labelTitle.setFont(new Font("UD デジタル 教科書体 NP-B", Font.BOLD, 16));
                panelNorth.add(labelTitle, "1, 1, center, top");
 
-               labelVersion = new JLabel(getVersion());
+               labelVersion = new JLabel(CheckVersion.getVersion());
                labelVersion.setFont(new Font("SansSerif", Font.BOLD, 12));
                panelNorth.add(labelVersion, "3, 1, right, top");
 
@@ -243,7 +260,8 @@ public class DelesteRandomSelector extends JFrame {
                                FormSpecs.RELATED_GAP_ROWSPEC,
                                FormSpecs.DEFAULT_ROWSPEC,}));
 
-               btnImport = new JButton("<html><body>楽曲<br>絞り込み</body></html>");
+               btnImport = new JButton("<html><body>データベース<br>更新中…</body></html>");
+               btnImport.setEnabled(false);
                btnImport.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e) {
                                ArrayList<Song> fromJson = Scraping.getFromJson();
@@ -253,7 +271,7 @@ public class DelesteRandomSelector extends JFrame {
                                        if(!selectedSongsList.isEmpty())
                                        selectedSongsList.clear();
                                selectedSongsList.addAll(specificAttributeList);
-                               LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " +"Songs are selected.We are Ready to go.");
+                               LimitedLog.println(this.getClass() + ":[INFO]: " +"Songs are selected.We are Ready to go.");
                                JOptionPane.showMessageDialog(null, "絞り込み完了!「開始」をクリックすることで選曲できます!");
                        }
                });
@@ -264,21 +282,17 @@ public class DelesteRandomSelector extends JFrame {
                btnStart.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e) {
                                Random random = new Random(System.currentTimeMillis());
-                               String[] tmp = new String[property.getSongLimit()];
+                               String paneString = "";
                                integratorArray = new String[property.getSongLimit()];
                                for(int i = 0; i < property.getSongLimit(); i++) {
                                        int randomInt = random.nextInt(selectedSongsList.size());
-                                       tmp[i] = (i + 1) + "曲目: " + selectedSongsList.get(randomInt).getAttribute() + " [" + selectedSongsList.get(randomInt).getDifficulty() + "]「" + selectedSongsList.get(randomInt).getName() + "」!(Lv:" + selectedSongsList.get(randomInt).getLevel() + ")\n\n";
+                                       paneString = paneString + (i + 1) + "曲目: " + selectedSongsList.get(randomInt).getAttribute() + " [" + selectedSongsList.get(randomInt).getDifficulty() + "]「" + selectedSongsList.get(randomInt).getName() + "」!(Lv:" + selectedSongsList.get(randomInt).getLevel() + ")\n\n";
                                        integratorArray[i] = selectedSongsList.get(randomInt).getName() + "(Lv" + selectedSongsList.get(randomInt).getLevel() + ")\n";
                                }
-                               String paneString = "";
-                               for (int i = 0; i < tmp.length; i++) {
-                                       paneString = paneString + tmp[i];
-                               }
-                               paneString = paneString + "この" + tmp.length + "曲をプレイしましょう!!!";
+                               paneString = paneString + "この" + property.getSongLimit() + "曲をプレイしましょう!!!";
                                textArea.setText(paneString);
                                integratorBool = true;
-                               LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " + "show up completed.");
+                               LimitedLog.println(this.getClass() + ":[INFO]: " + "show up completed.");
                        }
                });
                btnStart.setFont(new Font("UD デジタル 教科書体 NP-B", Font.BOLD, 13));
@@ -288,16 +302,16 @@ public class DelesteRandomSelector extends JFrame {
                                btnTwitterIntegration.setFont(new Font("UD デジタル 教科書体 NP-B", Font.BOLD, 11));
                                btnTwitterIntegration.addActionListener(new ActionListener() {
                                        public void actionPerformed(ActionEvent e) {
-                                               System.out.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " + "Twitter Integration requested.Verify permission status.");
+                                               LimitedLog.println(this.getClass() + ":[INFO]: " + "Twitter Integration requested.Verify permission status.");
                                                boolean authorizationStatus = TwitterIntegration.authorization();
-                                               System.out.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " + "Permission Verifying completed.\nStatus: " + authorizationStatus);
-                                               System.out.print("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " + "Construction status message...");
+                                               LimitedLog.println(this.getClass() + ":[INFO]: " + "Permission Verifying completed.\nStatus: " + authorizationStatus);
+                                               LimitedLog.print(this.getClass() + ":[INFO]: " + "Construction status message...");
                                                String updatedStatus = "デレステ課題曲セレクターで\n";
                                                int lengthLimit = updatedStatus.length();
                                                boolean isBroken = false;
                                                if(!integratorBool) {
                                                        JOptionPane.showMessageDialog(null, "ちひろ「まだプレイを始めていないみたいですね」");
-                                                       System.out.println();
+                                                       LimitedLog.println();
                                                        return;
                                                }
                                                for(int i = 0; i < integratorArray.length; i++) {
@@ -313,28 +327,28 @@ public class DelesteRandomSelector extends JFrame {
                                                } else {
                                                        updatedStatus = updatedStatus + "をプレイしました!\n#DelesteRandomSelector #デレステ ";
                                                }
-                                               System.out.println("completed.\n" + updatedStatus);
+                                               LimitedLog.println("completed.\n" + updatedStatus);
                                                lengthLimit = updatedStatus.length();
                                                if(authorizationStatus) {
                                                        int option = JOptionPane.showConfirmDialog(null, "Twitterへ以下の内容を投稿します。よろしいですか?\n\n" + updatedStatus + "\n\n文字数:" + lengthLimit);
-                                                       System.out.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " + "User selected " + option);
+                                                       LimitedLog.println(this.getClass() + ":[INFO]: " + "User selected " + option);
                                                        switch(option) {
                                                                case JOptionPane.OK_OPTION:
                                                                        TwitterIntegration.PostTwitter(updatedStatus);
-                                                                       System.out.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " + "Success to update the status.");
+                                                                       LimitedLog.println(this.getClass() + ":[INFO]: " + "Success to update the status.");
                                                                        JOptionPane.showMessageDialog(null, "投稿が完了しました。");
                                                                        break;
                                                                case JOptionPane.NO_OPTION:
-                                                                       System.out.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " + "There is no will to post.");
+                                                                       LimitedLog.println(this.getClass() + ":[INFO]: " + "There is no will to post.");
                                                                        break;
                                                                case JOptionPane.CANCEL_OPTION:
-                                                                       System.out.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " + "The Operation was canceled by user.");
+                                                                       LimitedLog.println(this.getClass() + ":[INFO]: " + "The Operation was canceled by user.");
                                                                        break;
                                                                default:
                                                                        break;
                                                        }
                                                } else {
-                                                       System.out.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[WARN]: " + "seems to reject the permission.it should need try again.");
+                                                       LimitedLog.println(this.getClass() + ":[WARN]: " + "seems to reject the permission.it should need try again.");
                                                }
                                        }
                                });
@@ -343,11 +357,11 @@ public class DelesteRandomSelector extends JFrame {
                                                                btnExit = new JButton("終了");
                                                                btnExit.addActionListener(new ActionListener() {
                                                                        public void actionPerformed(ActionEvent e) {
-                                                                               LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " +"Requested Exit by Button");
-                                                                               if(getWholeDataFuture.isDone()) {
+                                                                               if(softwareUpdateFuture.isDone()) {
+                                                                                       LimitedLog.println(this.getClass() + ":[INFO]: " +"Requested Exit by Button");
                                                                                        System.exit(0);
                                                                                } else {
-                                                                                       JOptionPane.showMessageDialog(null, "非同期処理が完了していません。少し時間が経ってからやり直してください。");
+                                                                                       JOptionPane.showMessageDialog(null, "内部更新処理が完了していません。少し待ってからやり直してください。");
                                                                                }
                                                                        }
                                                                });
@@ -364,34 +378,8 @@ public class DelesteRandomSelector extends JFrame {
 
                scrollPane = new JScrollPane(textArea);
                panelCentre.add(scrollPane, BorderLayout.CENTER);
+               if(isFirst || !property.isCheckLibraryUpdates())
+                       setEnabled.run();
        }
 
-
-       /**
-        * アノテーションで記載されているバージョンを取得します
-        * @since v1.0.0
-        * @return アノテーションで定義されているバージョン
-        */
-       public static String getVersion() {
-               String value = "v"
-                               + getMajorVersion() + "."
-                               + getMinorVersion() + "."
-                               + getPatchVersion();
-               return value;
-       }
-
-       public static int getMajorVersion() {
-               Version version = (Version) DelesteRandomSelector.class.getAnnotation(Version.class);
-               return version.major();
-       }
-
-       public static int getMinorVersion() {
-               Version version = (Version) DelesteRandomSelector.class.getAnnotation(Version.class);
-               return version.minor();
-       }
-
-       public static int getPatchVersion() {
-               Version version = (Version) DelesteRandomSelector.class.getAnnotation(Version.class);
-               return version.patch();
-       }
 }