Fix encoding bug, add right click functionality

baiguke2019 · Aug 15, 2014 · 45f402e · 45f402e
1 parent 2b80ddc
commit 45f402e
Show file tree

Hide file tree

Showing 14 changed files with 105 additions and 46 deletions.
diff --git a/frames/movies.html b/frames/movies.html
@@ -10,6 +10,7 @@
         <script type='text/javascript' src="../js/extensions/jquery.min.js"></script>
         <script type='text/javascript' src="../js/extensions/bootstrap.min.js"></script>
         <script src="../js/extensions/jquery.isotope.min.js"></script>
+        <script src="../js/extensions/nwcontextmenu.js"></script>
 
         <!-- Modules -->
         <script>

diff --git a/frames/players/movie-player.html b/frames/players/movie-player.html
@@ -5,6 +5,7 @@
         <title>Movie player</title>
         <!-- Javascripts -->
         <script type='text/javascript' src="/js/extensions/jquery.min.js"></script>
+        <script src="/js/extensions/nwcontextmenu.js"></script>
         <!-- Styles -->
         <!--        <link href="/styles/video-skin.css" rel="stylesheet">-->
         <link href="/styles/bootstrap.min.css" rel="stylesheet">

diff --git a/frames/players/player.html b/frames/players/player.html
@@ -5,6 +5,7 @@
         <title>Player</title>
         <!-- Javascripts -->
         <script type='text/javascript' src="/js/extensions/jquery.min.js"></script>
+        <script src="/js/extensions/nwcontextmenu.js"></script>
 
         <!-- Modules -->
         <script>

diff --git a/frames/players/serie-player.html b/frames/players/serie-player.html
@@ -6,6 +6,7 @@
         <!-- Javascripts -->
         <script type='text/javascript' src="/js/extensions/jquery.min.js"></script>
         <script type='text/javascript' src="/js/extensions/bootstrap.min.js"></script>
+        <script src="/js/extensions/nwcontextmenu.js"></script>
 
         <!-- Styles -->
         <link href="/styles/video-skin.css" rel="stylesheet">

diff --git a/frames/series.html b/frames/series.html
@@ -11,6 +11,7 @@
         <script type='text/javascript' src="../js/extensions/jquery.min.js"></script>
         <script type='text/javascript' src="../js/extensions/bootstrap.min.js"></script>
         <script src="../js/extensions/jquery.isotope.min.js"></script>
+        <script src="../js/extensions/nwcontextmenu.js"></script>
 
         <!-- Modules -->
         <script>

diff --git a/frames/settings.html b/frames/settings.html
@@ -11,6 +11,7 @@
     <script type='text/javascript' src="../js/extensions/jquery.min.js"></script>
     <script type='text/javascript' src="../js/extensions/bootstrap.min.js"></script>
     <script src="../js/extensions/bootstrap-paginator.min.js"></script>
+    <script src="../js/extensions/nwcontextmenu.js"></script>
 
     <!-- Modules -->
     <script>

diff --git a/frames/torrents.html b/frames/torrents.html
@@ -11,6 +11,7 @@
         <script type='text/javascript' src="../js/extensions/jquery.min.js"></script>
         <script type='text/javascript' src="../js/extensions/bootstrap.min.js"></script>
         <script src="../js/extensions/bootstrap-paginator.min.js"></script>
+        <script src="../js/extensions/nwcontextmenu.js"></script>
 
         <!-- Modules -->
         <script>

diff --git a/frames/trailer.html b/frames/trailer.html
@@ -9,6 +9,7 @@
         <!-- Scripts -->
         <script type='text/javascript' src="../js/extensions/jquery.min.js"></script>
         <script type='text/javascript' src="../js/extensions/bootstrap.min.js"></script>
+        <script src="../js/extensions/nwcontextmenu.js"></script>
 
         <!-- Modules -->
         <script>

diff --git a/js/extensions/nwcontextmenu.js b/js/extensions/nwcontextmenu.js
@@ -0,0 +1,47 @@
+var translations = require('../js/translations.js');
+translations.initialize();
+
+var cutLabel = translations.translate('Cut');
+var copyLabel = translations.translate('Copy');
+var pasteLabel = translations.translate('Paste');
+
+$(function() {
+    function Menu(cutLabel, copyLabel, pasteLabel) {
+        var gui = require('nw.gui')
+            , menu = new gui.Menu()
+
+            , cut = new gui.MenuItem({
+                label: cutLabel || "Cut"
+                , click: function() {
+                    document.execCommand("cut");
+                }
+            })
+
+            , copy = new gui.MenuItem({
+                label: copyLabel || "Copy"
+                , click: function() {
+                    document.execCommand("copy");
+                }
+            })
+
+            , paste = new gui.MenuItem({
+                label: pasteLabel || "Paste"
+                , click: function() {
+                    document.execCommand("paste");
+                }
+            })
+            ;
+
+        menu.append(cut);
+        menu.append(copy);
+        menu.append(paste);
+
+        return menu;
+    }
+
+    var menu = new Menu(cutLabel, copyLabel, pasteLabel);
+    $(document).on("contextmenu", function(e) {
+        e.preventDefault();
+        menu.popup(e.originalEvent.x, e.originalEvent.y);
+    });
+});
diff --git a/js/localization.js b/js/localization.js
@@ -3,187 +3,187 @@ var Localization = function() {
     this.languages = {
         "af" : {
             lang : "Afrikaans",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "windows-1252" ]
         },
         "sq" : {
             lang : "Albanian",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "windows-1252" ]
         },
         "ar" : {
             lang : "Arabic",
-            encoding : [ "iso-8859-6", "windows-1256" ]
+            encoding : [ "windows-1256" ]
         },
         "bat" : {
             lang : "Baltic",
-            encoding : [ "iso-8859-4", "iso-8859-13", "windows-1257" ]
+            encoding : [ "windows-1257" ]
         },
         "eu" : {
             lang : "Basque",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "windows-1252" ]
         },
         "pb" : {
             lang : "Brazillian",
             encoding : [ "iso-8859-1" ]
         },
         "bg" : {
             lang : "Bulgarian",
-            encoding : [ "iso-8859-5" ]
+            encoding : [ "Windows-1251" ]
         },
         "be" : {
             lang : "Byelorussian",
-            encoding : [ "iso-8859-6" ]
+            encoding : [ "iso-8859-5" ]
         },
         "ca" : {
             lang : "Catalan",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "windows-1252" ]
         },
         "hr" : {
             lang : "Croatian",
-            encoding : [ "iso-8859-2", "windows-1250" ]
+            encoding : [ "windows-1250" ]
         },
         "cs" : {
             lang : "Czech",
             encoding : [ "iso-8859-2" ]
         },
         "da" : {
             lang : "Danish",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
         },
         "nl" : {
             lang : "Dutch",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
         },
         "en" : {
             lang : "English",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
         },
         "eo" : {
             lang : "Esperanto",
             encoding : [ "iso-8859-3" ]
         },
         "et" : {
             lang : "Estonian",
-            encoding : [ "iso-8859-15" ]
+            encoding : [ "iso-8859-4" ]
         },
         "fo" : {
             lang : "Faroese",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "windows-1252" ]
         },
         "fi" : {
             lang : "Finnish",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
         },
         "fr" : {
             lang : "French",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "windows-1252" ]
         },
         "gl" : {
             lang : "Galician",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-9" ]
         },
         "de" : {
             lang : "German",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "windows-1252" ]
         },
         "el" : {
             lang : "Greek",
-            encoding : [ "iso-8859-7", "windows-1253" ]
+            encoding : [ "windows-1253" ]
         },
         "iw" : {
             lang : "Hebrew",
-            encoding : [ "iso-8859-8", "windows-1255" ]
+            encoding : [ "iso-8859-8" ]
         },
         "hu" : {
             lang : "Hungarian",
             encoding : [ "iso-8859-2" ]
         },
         "is" : {
             lang : "Icelandic",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
         },
         "ga" : {
             lang : "Irish",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
         },
         "it" : {
             lang : "Italian",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
         },
         "ja" : {
             lang : "Japanese",
-            encoding : [ "shift_jis", "iso-2022-jp", "euc-jp" ]
+            encoding : [ "shift_jis" ]
         },
         "ko" : {
             lang : "Korean",
             encoding : [ "euc-kr" ]
         },
         "lv" : {
             lang : "Latvian",
-            encoding : [ "iso-8859-13", "windows-1257" ]
+            encoding : [ "iso-8859-13" ]
         },
         "lt" : {
             lang : "Lithuanian",
-            encoding : [ "iso-8859-13", "windows-1257" ]
+            encoding : [ "iso-8859-13" ]
         },
         "mk" : {
             lang : "Macedonian",
-            encoding : [ "iso-8859-5", "windows-1251" ]
+            encoding : [ "iso-8859-5" ]
         },
         "mt" : {
             lang : "Maltese",
             encoding : [ "iso-8859-3" ]
         },
         "no" : {
             lang : "Norwegian",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
         },
         "pl" : {
             lang : "Polish",
             encoding : [ "iso-8859-2" ]
         },
         "pt" : {
             lang : "Portuguese",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
+        },
+        "pt-br" : {
+            lang : "Portuguese",
+            encoding : [ "iso-8859-1" ]
         },
         "ro" : {
             lang : "Romanian",
             encoding : [ "iso-8859-16" ]
         },
         "ru" : {
             lang : "Russian",
-            encoding : [ "koi8-r", "iso-8859-5" ]
+            encoding : [ "Windows-1251" ]
         },
         "gd" : {
             lang : "Scottish",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
         },
         "sr" : {
             lang : "Serbian cyrillic",
-            encoding : [ "windows-1251", "iso-8859-5" ]
-        },
-        "sr" : {
-            lang : "Serbian latin",
-            encoding : [ "iso-8859-2", "windows-1250" ]
+            encoding : [ "Windows-1250" ]
         },
         "sk" : {
             lang : "Slovak",
             encoding : [ "iso-8859-2" ]
         },
         "sl" : {
             lang : "Slovenian",
-            encoding : [ "iso-8859-2", "windows-1250" ]
+            encoding : [ "windows-1250" ]
         },
         "es" : {
             lang : "Spanish",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
         },
         "sv" : {
             lang : "Swedish",
-            encoding : [ "iso-8859-1", "windows-1252" ]
+            encoding : [ "iso-8859-1" ]
         },
         "tr" : {
             lang : "Turkish",
-            encoding : [ "iso-8859-9", "windows-1254" ]
+            encoding : [ "iso-8859-9" ]
         },
         "uk" : {
             lang : "Ukrainian",

diff --git a/js/subtitle.js b/js/subtitle.js
@@ -119,7 +119,6 @@ var SubManager = function(port)
         var detecdedEncoding = charsetData.encoding;
         var targetEncoding = 'utf8';
 
-        /*
         //Charset is not detecting the good encoding for certain language like pt-br (WTF I get IBM855 when choosing brazillian :O)
         if(detecdedEncoding == 'IBM855' || detecdedEncoding == 'windows-1250' || detecdedEncoding == 'windows-1251' || detecdedEncoding == 'windows-1252' || detecdedEncoding == 'windows-1254' || detecdedEncoding == 'windows-1255') {
             if(iso639) {
@@ -129,7 +128,7 @@ var SubManager = function(port)
                     console.log(detecdedEncoding);
                 }
             }
-        }*/
+        }
 
         //We don't need to convert UTF-8
         if(detecdedEncoding != 'utf-8') {

diff --git a/js/yifysubtitle.js b/js/yifysubtitle.js
@@ -9,6 +9,7 @@ var fs = require('fs');
 var charset = require('jschardet');
 var iconv = require('iconv-lite');
 var AdmZip  = require('adm-zip');
+var localization = require('../js/localization.js');
 
 var manager;
 
@@ -209,17 +210,18 @@ var SubManager = function(port)
         var charsetData = charset.detect(data);
         var detecdedEncoding = charsetData.encoding;
         var targetEncoding = 'utf8';
-        /*
+
         //Charset is not detecting the good encoding for certain language like pt-br (WTF I get IBM855 when choosing brazillian :O)
         if(detecdedEncoding == 'IBM855' || detecdedEncoding == 'windows-1250' || detecdedEncoding == 'windows-1251' || detecdedEncoding == 'windows-1252' || detecdedEncoding == 'windows-1254' || detecdedEncoding == 'windows-1255') {
             if(iso639) {
                 var lang = localization.languages[iso639];
+
                 if(lang) {
                     detecdedEncoding = lang.encoding[0]; //We take the true real encoding now!
                     console.log(detecdedEncoding);
                 }
             }
-        }*/
+        }
 
         //We don't need to convert UTF-8
         if(detecdedEncoding != 'utf-8') {

diff --git a/locales/en.json b/locales/en.json
@@ -111,5 +111,8 @@
 	"All seasons": "All seasons",
 	"Buy": "Buy",
 	"DHT:": "DHT:",
-	"Random": "Random"
+	"Random": "Random",
+	"Cut": "Cut",
+	"Copy": "Copy",
+	"Paste": "Paste"
 }